-
-
Notifications
You must be signed in to change notification settings - Fork 423
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(console): m2m pages in organizations
- Loading branch information
Showing
34 changed files
with
449 additions
and
80 deletions.
There are no files selected for viewing
33 changes: 33 additions & 0 deletions
33
packages/console/src/components/ItemPreview/ApplicationPreview.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import { type Application } from '@logto/schemas'; | ||
| import { useTranslation } from 'react-i18next'; | ||
|
|
||
| import ApplicationIcon from '@/components/ApplicationIcon'; | ||
| import { applicationTypeI18nKey } from '@/types/applications'; | ||
|
|
||
| import ItemPreview from '.'; | ||
| import * as styles from './index.module.scss'; | ||
|
|
||
| const applicationsPathname = '/applications'; | ||
| const buildDetailsPathname = (id: string) => `${applicationsPathname}/${id}`; | ||
|
|
||
| type Props = { | ||
| readonly data: Pick<Application, 'id' | 'name' | 'isThirdParty' | 'type'>; | ||
| }; | ||
|
|
||
| function ApplicationPreview({ data: { id, name, isThirdParty, type } }: Props) { | ||
| const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' }); | ||
|
|
||
| return ( | ||
| <ItemPreview | ||
| title={name} | ||
| subtitle={ | ||
| isThirdParty | ||
| ? t(`${applicationTypeI18nKey.thirdParty}.title`) | ||
| : t(`${applicationTypeI18nKey[type]}.title`) | ||
| } | ||
| icon={<ApplicationIcon className={styles.icon} type={type} isThirdParty={isThirdParty} />} | ||
| to={buildDetailsPathname(id)} | ||
| /> | ||
| ); | ||
| } | ||
| export default ApplicationPreview; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -62,3 +62,7 @@ | |
| } | ||
| } | ||
| } | ||
|
|
||
| .icon { | ||
| flex-shrink: 0; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
148 changes: 148 additions & 0 deletions
148
packages/console/src/pages/OrganizationDetails/MachineToMachine/AddAppsToOrganization.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| import { type Organization, type Application, ApplicationType, RoleType } from '@logto/schemas'; | ||
| import { useEffect, useState } from 'react'; | ||
| import { Controller, useForm } from 'react-hook-form'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import ReactModal from 'react-modal'; | ||
|
|
||
| import EntitiesTransfer from '@/components/EntitiesTransfer'; | ||
| import { ApplicationItem } from '@/components/EntitiesTransfer/components/EntityItem'; | ||
| import OrganizationRolesSelect from '@/components/OrganizationRolesSelect'; | ||
| import Button from '@/ds-components/Button'; | ||
| import DangerousRaw from '@/ds-components/DangerousRaw'; | ||
| import FormField from '@/ds-components/FormField'; | ||
| import ModalLayout from '@/ds-components/ModalLayout'; | ||
| import { type Option } from '@/ds-components/Select/MultiSelect'; | ||
| import useActionTranslation from '@/hooks/use-action-translation'; | ||
| import useApi from '@/hooks/use-api'; | ||
| import * as modalStyles from '@/scss/modal.module.scss'; | ||
| import { trySubmitSafe } from '@/utils/form'; | ||
|
|
||
| type Props = { | ||
| readonly organization: Organization; | ||
| readonly isOpen: boolean; | ||
| readonly onClose: () => void; | ||
| }; | ||
|
|
||
| function AddAppsToOrganization({ organization, isOpen, onClose }: Props) { | ||
| const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' }); | ||
| const tAction = useActionTranslation(); | ||
| const api = useApi(); | ||
| const { | ||
| reset, | ||
| control, | ||
| handleSubmit, | ||
| formState: { isSubmitting }, | ||
| } = useForm<{ | ||
| applications: Application[]; | ||
| roles: Array<Option<string>>; | ||
| }>({ | ||
| defaultValues: { applications: [], roles: [] }, | ||
| }); | ||
| const [keyword, setKeyword] = useState(''); | ||
|
|
||
| const onSubmit = handleSubmit( | ||
| trySubmitSafe(async ({ applications, roles }) => { | ||
| await api.post(`api/organizations/${organization.id}/applications`, { | ||
| json: { | ||
| applicationIds: applications.map(({ id }) => id), | ||
| }, | ||
| }); | ||
|
|
||
| if (roles.length > 0) { | ||
| await api.post(`api/organizations/${organization.id}/applications/roles`, { | ||
| json: { | ||
| applicationIds: applications.map(({ id }) => id), | ||
| organizationRoleIds: roles.map(({ value }) => value), | ||
| }, | ||
| }); | ||
| } | ||
| onClose(); | ||
| }) | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| if (isOpen) { | ||
| reset(); | ||
| setKeyword(''); | ||
| } | ||
| }, [isOpen, reset]); | ||
|
|
||
| return ( | ||
| <ReactModal | ||
| isOpen={isOpen} | ||
| className={modalStyles.content} | ||
| overlayClassName={modalStyles.overlay} | ||
| onRequestClose={onClose} | ||
| > | ||
| <ModalLayout | ||
| size="large" | ||
| title={ | ||
| <DangerousRaw> | ||
| {t('organization_details.add_applications_to_organization', { | ||
| name: organization.name, | ||
| })} | ||
| </DangerousRaw> | ||
| } | ||
| subtitle="organization_details.add_applications_to_organization_description" | ||
| footer={ | ||
| <Button | ||
| isLoading={isSubmitting} | ||
| size="large" | ||
| type="primary" | ||
| title={<>{tAction('add', 'organization_details.application_other')}</>} | ||
| onClick={onSubmit} | ||
| /> | ||
| } | ||
| onClose={onClose} | ||
| > | ||
| <FormField title="organization_details.application_other"> | ||
| <Controller | ||
| name="applications" | ||
| control={control} | ||
| rules={{ | ||
| validate: (value) => { | ||
| if (value.length === 0) { | ||
| return t('organization_details.at_least_one_application'); | ||
| } | ||
| return true; | ||
| }, | ||
| }} | ||
| render={({ field: { onChange, value }, fieldState: { error } }) => ( | ||
| <EntitiesTransfer | ||
| errorMessage={error?.message} | ||
| searchProps={{ | ||
| pathname: 'api/applications', | ||
| parameters: { | ||
| excludeOrganizationId: organization.id, | ||
| types: ApplicationType.MachineToMachine, | ||
| }, | ||
| }} | ||
| selectedEntities={value} | ||
| emptyPlaceholder="errors.empty" | ||
| renderEntity={(entity) => <ApplicationItem entity={entity} />} | ||
| onChange={onChange} | ||
| /> | ||
| )} | ||
| /> | ||
| </FormField> | ||
| <FormField title="organization_details.add_with_organization_role"> | ||
| <Controller | ||
| name="roles" | ||
| control={control} | ||
| render={({ field: { onChange, value } }) => ( | ||
| <OrganizationRolesSelect | ||
| keyword={keyword} | ||
| setKeyword={setKeyword} | ||
| value={value} | ||
| roleType={RoleType.MachineToMachine} | ||
| onChange={onChange} | ||
| /> | ||
| )} | ||
| /> | ||
| </FormField> | ||
| </ModalLayout> | ||
| </ReactModal> | ||
| ); | ||
| } | ||
|
|
||
| export default AddAppsToOrganization; |
14 changes: 14 additions & 0 deletions
14
packages/console/src/pages/OrganizationDetails/MachineToMachine/index.module.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| @use '@/scss/underscore' as _; | ||
|
|
||
| .roles { | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| gap: _.unit(2); | ||
| } | ||
|
|
||
| .filter { | ||
| display: flex; | ||
| gap: _.unit(2); | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| } |
Oops, something went wrong.