Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated NewPasswordPage.vue with password visibility toggle #12878

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/actions/manage-label/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: 'Manage Labels for External Contributors'
description: 'Add or remove labels when external contributors are assigned or unassigned.'

inputs:
github_token:
description: 'GitHub Token for authentication'
required: true
default: ${{ secrets.GITHUB_TOKEN }}

runs:
using: 'python'
main: 'manage_labels.py'

# Add other configuration based on your requirements

48 changes: 48 additions & 0 deletions .github/actions/manage-label/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
const core = require('@actions/core');
const github = require('@actions/github');

async function run() {
try {
const token = core.getInput('repo-token');
const octokit = github.getOctokit(token);
const { context } = github;

const issueNumber = context.issue.number;
const assignee = context.payload.assignee;
const owner = context.repo.owner;
const repo = context.repo.repo;

// Check if the assignee is an external contributor (not a member or owner)
const { data: collaborators } = await octokit.rest.repos.listCollaborators({
owner,
repo,
});

const isExternalContributor = !collaborators.some(
(collab) => collab.login === assignee.login && (collab.role === 'member' || collab.role === 'owner')
);

if (isExternalContributor) {
// Add the label
await octokit.rest.issues.addLabels({
owner,
repo,
issue_number: issueNumber,
labels: ['community-contribution-in-progress'],
});
} else {
// Remove the label
await octokit.rest.issues.removeLabel({
owner,
repo,
issue_number: issueNumber,
name: 'community-contribution-in-progress',
});
}
} catch (error) {
core.setFailed(error.message);
}
}

run();

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<template>

<AuthBase>
<div style="text-align: left">
<KButton
Expand All @@ -25,6 +24,7 @@

<p>{{ $tr('needToMakeNewPasswordLabel', { user: username }) }}</p>

<!-- Password input field with dynamic type based on showPassword -->
<PasswordTextbox
ref="createPassword"
:autofocus="true"
Expand All @@ -33,7 +33,19 @@
:isValid.sync="passwordIsValid"
:shouldValidate="busy"
@submitNewPassword="updatePassword"
:type="showPassword ? 'text' : 'password'" <!-- Toggle between 'text' and 'password' -->
/>

<!-- Button to toggle password visibility -->
<KButton
appearance="basic-link"
style="margin-top: 8px; text-align: left;"
@click="togglePassword"
data-test="togglePasswordVisibility"
>
{{ showPassword ? 'Hide' : 'Show' }} Password
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In order to be sure that the message here is translated for all users, you'd need to add two new messages in the $trs property of the component, one each for "Hide password" and "Show password". Then you can conditionalize which message to show by referencing the keys of the objects you add to $trs in a call to $tr(<the key of the message object you made>).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could pass the KButton's label to the :text prop instead of to the default slot as you have here. It may be cleaner to do this because we also need to put the same text on the KButton's aria-label attribute as well

</KButton>

<KButton
appearance="raised-button"
:primary="true"
Expand All @@ -45,12 +57,9 @@
/>
</div>
</AuthBase>

</template>


<script>

import pickBy from 'lodash/pickBy';
import PasswordTextbox from 'kolibri-common/components/userAccounts/PasswordTextbox';
import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
Expand Down Expand Up @@ -79,6 +88,7 @@
busy: false,
password: '',
passwordIsValid: false,
showPassword: false, // New data property to control password visibility
};
},
computed: {
Expand Down Expand Up @@ -120,6 +130,10 @@
name: ComponentMap.SIGN_IN,
});
},
// Method to toggle password visibility
togglePassword() {
this.showPassword = !this.showPassword; // Toggle between true/false
},
},
$trs: {
needToMakeNewPasswordLabel: {
Expand All @@ -128,8 +142,6 @@
},
},
};

</script>


<style lang="scss" scoped></style>
Loading