-
Notifications
You must be signed in to change notification settings - Fork 16
PROD - gamification / skills management consolidation. SSO users option #1123
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
Changes from all commits
23a35e6
35ddc97
433c8c1
c83e21c
e65568b
74b1fd0
75c7fb5
c84f82c
d6b74cc
8d4f168
7860373
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
import { baseDetailPath, createBadgePath } from '~/apps/gamification-admin' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The import statement for |
||
import { AppSubdomain, ToolTitle } from '~/config' | ||
import { | ||
lazyLoad, | ||
|
@@ -9,12 +10,15 @@ import { | |
|
||
import { | ||
billingAccountRouteId, | ||
gamificationAdminRouteId, | ||
manageChallengeRouteId, | ||
manageReviewRouteId, | ||
permissionManagementRouteId, | ||
platformRouteId, | ||
rootRoute, | ||
userManagementRouteId, | ||
} from './config/routes.config' | ||
import { platformSkillRouteId } from './platform/routes.config' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider organizing the imports alphabetically for better readability and consistency. |
||
|
||
const AdminApp: LazyLoadedComponent = lazyLoad(() => import('./AdminApp')) | ||
|
||
|
@@ -107,6 +111,24 @@ const PermissionAddGroupMembersPage: LazyLoadedComponent = lazyLoad( | |
'PermissionAddGroupMembersPage', | ||
) | ||
|
||
const Platform: LazyLoadedComponent = lazyLoad(() => import('./platform/Platform')) | ||
const SkillManagement: LazyLoadedComponent = lazyLoad( | ||
() => import('./platform/skill-management/SkillManagement'), | ||
) | ||
const SkillManagementLandingPage: LazyLoadedComponent = lazyLoad( | ||
() => import('./platform/skill-management/LandingPage'), | ||
'LandingPage', | ||
) | ||
const BadgeDetailPage: LazyLoadedComponent = lazyLoad( | ||
() => import('../../gamification-admin/src/pages/badge-detail/BadgeDetailPage'), | ||
) | ||
const BadgeListingPage: LazyLoadedComponent = lazyLoad( | ||
() => import('../../gamification-admin/src/pages/badge-listing/BadgeListingPage'), | ||
) | ||
const CreateBadgePage: LazyLoadedComponent = lazyLoad( | ||
() => import('../../gamification-admin/src/pages/create-badge/CreateBadgePage'), | ||
) | ||
|
||
export const toolTitle: string = ToolTitle.admin | ||
|
||
export const adminRoutes: ReadonlyArray<PlatformRoute> = [ | ||
|
@@ -256,6 +278,43 @@ export const adminRoutes: ReadonlyArray<PlatformRoute> = [ | |
id: permissionManagementRouteId, | ||
route: permissionManagementRouteId, | ||
}, | ||
|
||
// Platform Management Module | ||
{ | ||
children: [ | ||
{ | ||
children: [ | ||
{ | ||
element: <SkillManagementLandingPage />, | ||
id: 'skills-landing-page', | ||
route: '', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider specifying a more descriptive route path instead of an empty string for better clarity and maintainability. |
||
}, | ||
], | ||
element: <SkillManagement />, | ||
id: platformSkillRouteId, | ||
route: platformSkillRouteId, | ||
}, | ||
{ | ||
element: ( | ||
<BadgeListingPage | ||
rootPage={`${rootRoute}/${platformRouteId}/${gamificationAdminRouteId}`} | ||
/> | ||
), | ||
route: gamificationAdminRouteId, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ensure that the |
||
}, | ||
{ | ||
element: <CreateBadgePage />, | ||
route: `${gamificationAdminRouteId}${createBadgePath}`, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Verify that |
||
}, | ||
{ | ||
element: <BadgeDetailPage />, | ||
route: `${gamificationAdminRouteId}${baseDetailPath}/:id`, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ensure that |
||
}, | ||
], | ||
element: <Platform />, | ||
id: platformRouteId, | ||
route: platformRouteId, | ||
}, | ||
], | ||
domain: AppSubdomain.admin, | ||
element: <AdminApp />, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -67,7 +67,7 @@ export const DialogEditUserEmail: FC<Props> = (props: Props) => { | |
className={classNames(styles.container, props.className)} | ||
onSubmit={handleSubmit(onSubmit)} | ||
> | ||
<div> | ||
<div className={styles.blockForm}> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider verifying if the |
||
<InputText | ||
type='text' | ||
name='id' | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
.modal { | ||
width: 800px !important; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Avoid using |
||
} | ||
|
||
.container { | ||
display: flex; | ||
flex-direction: column; | ||
gap: 20px; | ||
position: relative; | ||
align-items: flex-start; | ||
|
||
th:first-child { | ||
padding-left: 16px !important; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Using |
||
} | ||
} | ||
|
||
.tableCell { | ||
white-space: break-spaces !important; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The use of |
||
text-align: left !important; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider removing |
||
} | ||
|
||
.actionButtons { | ||
display: flex; | ||
justify-content: flex-end; | ||
gap: 6px; | ||
width: 100%; | ||
} | ||
|
||
.btnActions { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
display: flex; | ||
justify-content: flex-end; | ||
gap: 6px; | ||
} | ||
|
||
.blockAction { | ||
width: 120px; | ||
} | ||
|
||
.loadingSpinnerContainer { | ||
position: relative; | ||
height: 100px; | ||
|
||
.spinner { | ||
background: none; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
} | ||
} | ||
|
||
.dialogLoadingSpinnerContainer { | ||
position: absolute; | ||
width: 100%; | ||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
bottom: 0; | ||
height: 64px; | ||
left: 0; | ||
|
||
.spinner { | ||
background: none; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
} | ||
} | ||
|
||
.desktopTable { | ||
td { | ||
vertical-align: middle; | ||
} | ||
} | ||
|
||
.mobileTable { | ||
width: 100%; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider adding error handling for the
useLayout()
hook in case it returns an unexpected value or fails to provide theLayout
component.