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.

Sign up for GitHub

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

Jump to bottom

Add support for inviting users from parent organization to sub-organization #4286

Merged
merged 17 commits into from
Oct 25, 2023
Merged

Add support for inviting users from parent organization to sub-organization #4286

merged 17 commits into from
Oct 25, 2023

Conversation

Shenali-SJ
Copy link
Contributor

@Shenali-SJ Shenali-SJ commented Oct 23, 2023 •
edited
Loading

Purpose

This introduces the functionality of inviting users from the parent organization to the sub-organization.

Related Issues

Checklist

  • e2e cypress tests locally verified.
  • Manual test round performed and verified.
  • UX/UI review done on the final implementation.
  • Documentation provided. (Add links if there are any)
  • Unit tests provided. (Add links if there are any)
  • Integration tests provided. (Add links if there are any)

Security checks

@pavinduLakshan
Copy link
Contributor

Shall we use a more descriptive PR title?

Eg:

-Parent user invitation
+Add support for inviting users from parent organization to sub-organization

@pavinduLakshan
Copy link
Contributor

Please resolve the conflicts as well :)

DonOmalVindula
DonOmalVindula requested changes Oct 23, 2023
View reviewed changes
apps/console/src/features/users/components/guests/api/invite.ts Outdated Show resolved Hide resolved
apps/console/src/features/users/components/guests/api/invite.ts Outdated Show resolved Hide resolved
apps/console/src/features/users/components/guests/api/invite.ts Outdated Show resolved Hide resolved
apps/console/src/features/users/components/guests/pages/guest-users-list.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/components/guests/pages/guest-users-list.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/pages/users.tsx Show resolved Hide resolved
apps/console/src/features/users/pages/users.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/pages/users.tsx Outdated Show resolved Hide resolved
@Shenali-SJ Shenali-SJ changed the title Parent user invitation Add support for inviting users from parent organization to sub-organization Oct 23, 2023
Achintha444
Achintha444 reviewed Oct 24, 2023
View reviewed changes
apps/console/src/features/applications/components/wizard/wizard-summary.tsx Show resolved Hide resolved
apps/console/src/features/users/api/index.ts Outdated Show resolved Hide resolved
apps/console/src/features/users/components/guests/api/invite.ts Outdated Show resolved Hide resolved
apps/console/src/features/users/components/guests/api/invite.ts Outdated Show resolved Hide resolved
apps/console/src/features/users/components/guests/api/invite.ts Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated Show resolved Hide resolved
DonOmalVindula
DonOmalVindula requested changes Oct 24, 2023
View reviewed changes
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/components/wizard/wizard-summary.tsx Show resolved Hide resolved
apps/console/src/features/users/pages/users.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/pages/users.tsx Show resolved Hide resolved
apps/console/src/features/users/pages/users.tsx Outdated Show resolved Hide resolved
DonOmalVindula
DonOmalVindula reviewed Oct 25, 2023
View reviewed changes
apps/console/src/features/users/components/guests/pages/guest-users-list.tsx Show resolved Hide resolved
apps/console/src/features/users/components/guests/pages/guest-users-list.tsx Show resolved Hide resolved
apps/console/src/features/users/components/guests/pages/guest-users-list.tsx Outdated
[ userTypeSelection === UserAccountTypesMain.EXTERNAL
? t("console:manage.features.parentOrgInvitations." +
"emptyPlaceholder.noExpiredInvitations")
: "There are no collaborator users with expired invitations at the moment."
Copy link
Contributor

Choose a reason for hiding this comment

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

Reminder on this

apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated
@@ -136,13 +186,59 @@ export const AddUserWizard: FunctionComponent<AddUserWizardPropsInterface> = (

const [ alert, setAlert, alertComponent ] = useWizardAlert();

const [ wizardSteps, setWizardSteps ] = useState<WizardStepInterface[]>([]);

const [ selectedUserStore, setSelectedUserStore ] = useState<string>("PRIMARY"); //TODO change
Copy link
Contributor

Choose a reason for hiding this comment

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

Reminder on this

apps/console/src/features/users/components/wizard/add-user-wizard.tsx Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Outdated Show resolved Hide resolved
apps/console/src/features/users/components/wizard/add-user-wizard.tsx Show resolved Hide resolved
apps/console/src/features/users/pages/users.tsx Outdated Show resolved Hide resolved
DonOmalVindula
DonOmalVindula previously approved these changes Oct 25, 2023
View reviewed changes
dasuni-30
dasuni-30 reviewed Oct 25, 2023
View reviewed changes
apps/console/src/extensions/components/users/wizard/steps/wizard-summary.tsx
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2021-2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2022, WSO2 LLC. (https://www.wso2.com).
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's avoid changing this

@DonOmalVindula DonOmalVindula merged commit 06f7e7e into wso2:master Oct 25, 2023
4 checks passed
@wso2-jenkins-bot wso2-jenkins-bot mentioned this pull request Oct 25, 2023
Merged
This was referenced Oct 26, 2023
Merged
Closed
@dasuni-30 dasuni-30 mentioned this pull request Nov 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dasuni-30 dasuni-30 dasuni-30 approved these changes

@DonOmalVindula DonOmalVindula DonOmalVindula approved these changes

@Achintha444 Achintha444 Awaiting requested review from Achintha444

@brionmario brionmario Awaiting requested review from brionmario

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Shenali-SJ @pavinduLakshan @brionmario @dasuni-30 @DonOmalVindula @Achintha444