@databiosphere/findable-ui 19.0.0 → 21.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.release-please-manifest.json +1 -1
- package/CHANGELOG.md +22 -0
- package/lib/components/Authentication/components/SessionController/components/GoogleSessionController/SessionController.d.ts +2 -0
- package/lib/components/Authentication/components/SessionController/components/GoogleSessionController/SessionController.js +29 -0
- package/lib/components/Authentication/components/SessionController/components/GoogleSessionController/types.d.ts +6 -0
- package/lib/components/Authentication/components/SessionController/components/GoogleSessionController/types.js +1 -0
- package/lib/components/Authentication/components/SessionController/components/NextSessionController/SessionController.d.ts +2 -0
- package/lib/components/Authentication/components/SessionController/components/NextSessionController/SessionController.js +17 -0
- package/lib/components/Authentication/components/SessionController/components/NextSessionController/constants.d.ts +5 -0
- package/lib/components/Authentication/components/SessionController/components/NextSessionController/constants.js +12 -0
- package/lib/components/Authentication/components/SessionController/components/NextSessionController/types.d.ts +4 -0
- package/lib/components/Authentication/components/SessionController/components/NextSessionController/types.js +1 -0
- package/lib/components/Authentication/components/SessionController/components/NextSessionController/utils.d.ts +15 -0
- package/lib/components/Authentication/components/SessionController/components/NextSessionController/utils.js +53 -0
- package/lib/components/ComponentCreator/ComponentCreator.js +2 -3
- package/lib/components/Export/components/ExportToTerra/components/TerraSetUpForm/components/FormStep/components/AcceptTerraTOS/acceptTerraTOS.js +2 -2
- package/lib/components/Export/components/ExportToTerra/components/TerraSetUpForm/components/NIHAccountExpiryWarning/nihAccountExpiryWarning.js +1 -1
- package/lib/components/Export/components/ExportToTerra/components/TerraSetUpForm/terraSetUpForm.js +8 -3
- package/lib/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/authentication.d.ts +2 -1
- package/lib/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/authentication.js +17 -14
- package/lib/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/AuthenticationMenu/authenticationMenu.d.ts +3 -4
- package/lib/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/AuthenticationMenu/authenticationMenu.js +15 -24
- package/lib/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/AuthenticationMenu/authenticationMenu.styles.d.ts +1 -1
- package/lib/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/AuthenticationMenu/authenticationMenu.styles.js +2 -2
- package/lib/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/AuthenticationMenu/constants.d.ts +2 -0
- package/lib/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/AuthenticationMenu/constants.js +14 -0
- package/lib/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/Button/button.styles.js +3 -2
- package/lib/components/Layout/components/Header/header.js +1 -1
- package/lib/components/Login/components/Button/button.d.ts +2 -0
- package/lib/components/Login/components/Button/button.js +6 -0
- package/lib/components/Login/components/Button/button.styles.d.ts +5 -0
- package/lib/components/Login/components/Button/button.styles.js +11 -0
- package/lib/components/Login/components/Button/constants.d.ts +2 -0
- package/lib/components/Login/components/Button/constants.js +6 -0
- package/lib/components/Login/components/Button/types.d.ts +3 -0
- package/lib/components/Login/components/Button/types.js +1 -0
- package/lib/components/Login/login.d.ts +2 -9
- package/lib/components/Login/login.js +9 -10
- package/lib/components/Login/types.d.ts +10 -0
- package/lib/components/Login/types.js +1 -0
- package/lib/components/Table/common/columnDef.js +18 -2
- package/lib/components/Table/common/columnIdentifier.d.ts +4 -0
- package/lib/components/Table/common/columnIdentifier.js +4 -0
- package/lib/components/Table/common/typeGuards.d.ts +11 -0
- package/lib/components/Table/common/typeGuards.js +8 -0
- package/lib/components/Table/common/utils.d.ts +1 -28
- package/lib/components/Table/common/utils.js +5 -88
- package/lib/components/Table/components/TableCell/common/utils.js +3 -3
- package/lib/components/Table/components/TableCell/components/RowSelectionCell/rowSelectionCell.d.ts +2 -5
- package/lib/components/Table/components/TableFeatures/ColumnVisibility/utils.d.ts +7 -18
- package/lib/components/Table/components/TableFeatures/ColumnVisibility/utils.js +20 -31
- package/lib/components/Table/components/TableHead/components/HeadSelectionCell/headSelectionCell.d.ts +2 -5
- package/lib/components/Table/components/TableHead/components/HeadSelectionCell/headSelectionCell.js +2 -2
- package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/columnGrouping.js +5 -17
- package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/components/MenuItems/constants.d.ts +3 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/components/MenuItems/constants.js +10 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/components/MenuItems/menuItems.d.ts +1 -1
- package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/components/MenuItems/menuItems.js +22 -10
- package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/components/MenuItems/types.d.ts +1 -2
- package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/components/MenuItems/utils.d.ts +27 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/components/MenuItems/utils.js +45 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/constants.d.ts +1 -3
- package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/constants.js +0 -10
- package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/utils.d.ts +3 -13
- package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/utils.js +22 -27
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/columnVisibility.d.ts +3 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/columnVisibility.js +13 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/columnVisibility.styles.d.ts +3 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/columnVisibility.styles.js +11 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/constants.d.ts +2 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/constants.js +7 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/menuItems.d.ts +3 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/menuItems.js +22 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/menuItems.styles.d.ts +2 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/menuItems.styles.js +16 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/types.d.ts +4 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/types.js +1 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/utils.d.ts +26 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/utils.js +32 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/constants.d.ts +2 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/constants.js +3 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/types.d.ts +4 -0
- package/lib/components/Table/components/TableToolbar/components/ColumnVisibility/types.js +1 -0
- package/lib/components/Table/components/TableToolbar/tableToolbar.js +5 -12
- package/lib/components/Table/features/RowPosition/constants.js +5 -3
- package/lib/components/Table/features/RowPosition/types.d.ts +3 -0
- package/lib/components/Table/features/RowPosition/utils.d.ts +1 -7
- package/lib/components/Table/features/RowPosition/utils.js +0 -20
- package/lib/components/Table/features/RowPreview/constants.js +1 -1
- package/lib/components/Table/features/entities.d.ts +2 -2
- package/lib/components/Table/table.d.ts +2 -4
- package/lib/components/Table/table.js +9 -31
- package/lib/components/TableCreator/common/utils.js +1 -4
- package/lib/components/TableCreator/options/columnTrackSizing/typeGuards.d.ts +7 -0
- package/lib/components/TableCreator/options/columnTrackSizing/typeGuards.js +8 -0
- package/lib/components/TableCreator/options/columnTrackSizing/utils.d.ts +30 -0
- package/lib/components/TableCreator/options/columnTrackSizing/utils.js +83 -0
- package/lib/components/TableCreator/options/hook.js +8 -7
- package/lib/components/TableCreator/options/initialState/columnVisibility.d.ts +7 -0
- package/lib/components/TableCreator/options/initialState/columnVisibility.js +16 -0
- package/lib/components/TableCreator/options/initialState/hook.d.ts +2 -0
- package/lib/components/TableCreator/options/initialState/hook.js +10 -0
- package/lib/components/TableCreator/options/visibility/constants.d.ts +2 -0
- package/lib/components/TableCreator/options/visibility/constants.js +3 -0
- package/lib/components/TableCreator/options/visibility/hook.d.ts +2 -0
- package/lib/components/TableCreator/options/visibility/hook.js +11 -0
- package/lib/components/TableCreator/tableCreator.js +4 -18
- package/lib/components/common/Banner/components/SessionTimeout/sessionTimeout.js +1 -1
- package/lib/components/common/CustomIcon/common/entities.d.ts +1 -4
- package/lib/components/common/CustomIcon/components/GoogleIcon/googleIcon.d.ts +2 -2
- package/lib/components/common/CustomIcon/components/GoogleIcon/googleIcon.js +1 -1
- package/lib/config/entities.d.ts +22 -27
- package/lib/hooks/authentication/auth/useAuthReducer.d.ts +2 -0
- package/lib/hooks/authentication/auth/useAuthReducer.js +8 -0
- package/lib/hooks/authentication/authentication/useAuthenticationReducer.d.ts +2 -0
- package/lib/hooks/authentication/authentication/useAuthenticationReducer.js +8 -0
- package/lib/hooks/authentication/config/useAuthenticationConfig.d.ts +6 -0
- package/lib/hooks/authentication/config/useAuthenticationConfig.js +9 -0
- package/lib/hooks/authentication/credentials/useCredentialsReducer.d.ts +2 -0
- package/lib/hooks/authentication/credentials/useCredentialsReducer.js +7 -0
- package/lib/hooks/authentication/profile/types.d.ts +5 -0
- package/lib/hooks/authentication/profile/types.js +1 -0
- package/lib/hooks/authentication/profile/useProfile.d.ts +6 -0
- package/lib/hooks/authentication/profile/useProfile.js +15 -0
- package/lib/hooks/authentication/providers/types.d.ts +6 -0
- package/lib/hooks/authentication/providers/types.js +1 -0
- package/lib/hooks/authentication/providers/useProviders.d.ts +6 -0
- package/lib/hooks/authentication/providers/useProviders.js +14 -0
- package/lib/hooks/authentication/session/useSessionActive.d.ts +12 -0
- package/lib/hooks/authentication/session/useSessionActive.js +36 -0
- package/lib/hooks/authentication/session/useSessionCallbackUrl.d.ts +4 -0
- package/lib/hooks/authentication/session/useSessionCallbackUrl.js +20 -0
- package/lib/hooks/authentication/session/useSessionIdleTimer.d.ts +6 -0
- package/lib/hooks/authentication/session/useSessionIdleTimer.js +8 -0
- package/lib/hooks/{useSessionTimeout.js → authentication/session/useSessionTimeout.js} +2 -2
- package/lib/hooks/{useAuthentication → authentication/terra}/useAuthenticationForm.d.ts +0 -1
- package/lib/hooks/{useAuthentication → authentication/terra}/useAuthenticationForm.js +6 -9
- package/lib/hooks/{useAuthentication → authentication/terra}/useAuthenticationNIHExpiry.js +3 -4
- package/lib/hooks/authentication/token/types.d.ts +4 -0
- package/lib/hooks/authentication/token/types.js +1 -0
- package/lib/hooks/authentication/token/useToken.d.ts +2 -0
- package/lib/hooks/authentication/token/useToken.js +5 -0
- package/lib/hooks/authentication/token/useTokenReducer.d.ts +7 -0
- package/lib/hooks/authentication/token/useTokenReducer.js +12 -0
- package/lib/hooks/useEntityList.js +2 -2
- package/lib/hooks/useFetchEntity.js +4 -3
- package/lib/hooks/useFileManifest/useFetchFilesFacets.js +2 -3
- package/lib/hooks/useFileManifest/useFetchSummary.js +2 -3
- package/lib/hooks/useRequestFileLocation.js +2 -3
- package/lib/hooks/useRouteHistory.d.ts +14 -0
- package/lib/hooks/useRouteHistory.js +40 -0
- package/lib/hooks/useRouteRoot.d.ts +1 -0
- package/lib/hooks/useRouteRoot.js +8 -0
- package/lib/hooks/useSummary.js +3 -3
- package/lib/providers/authentication/auth/actions.d.ts +8 -0
- package/lib/providers/authentication/auth/actions.js +12 -0
- package/lib/providers/authentication/auth/constants.d.ts +2 -0
- package/lib/providers/authentication/auth/constants.js +5 -0
- package/lib/providers/authentication/auth/context.d.ts +2 -0
- package/lib/providers/authentication/auth/context.js +7 -0
- package/lib/providers/authentication/auth/dispatch.d.ts +23 -0
- package/lib/providers/authentication/auth/dispatch.js +43 -0
- package/lib/providers/authentication/auth/hook.d.ts +6 -0
- package/lib/providers/authentication/auth/hook.js +9 -0
- package/lib/providers/authentication/auth/reducer.d.ts +8 -0
- package/lib/providers/authentication/auth/reducer.js +24 -0
- package/lib/providers/authentication/auth/types.d.ts +48 -0
- package/lib/providers/authentication/auth/types.js +11 -0
- package/lib/providers/authentication/authentication/actions.d.ts +8 -0
- package/lib/providers/authentication/authentication/actions.js +12 -0
- package/lib/providers/authentication/authentication/constants.d.ts +2 -0
- package/lib/providers/authentication/authentication/constants.js +5 -0
- package/lib/providers/authentication/authentication/context.d.ts +2 -0
- package/lib/providers/authentication/authentication/context.js +6 -0
- package/lib/providers/authentication/authentication/dispatch.d.ts +22 -0
- package/lib/providers/authentication/authentication/dispatch.js +42 -0
- package/lib/providers/authentication/authentication/hook.d.ts +6 -0
- package/lib/providers/authentication/authentication/hook.js +9 -0
- package/lib/providers/authentication/authentication/reducer.d.ts +9 -0
- package/lib/providers/authentication/authentication/reducer.js +25 -0
- package/lib/providers/authentication/authentication/types.d.ts +47 -0
- package/lib/providers/authentication/authentication/types.js +11 -0
- package/lib/providers/authentication/authentication/utils.d.ts +12 -0
- package/lib/providers/authentication/authentication/utils.js +18 -0
- package/lib/providers/authentication/common/types.d.ts +1 -0
- package/lib/providers/authentication/common/types.js +1 -0
- package/lib/providers/authentication/common/utils.d.ts +6 -0
- package/lib/providers/authentication/common/utils.js +11 -0
- package/lib/providers/authentication/credentials/actions.d.ts +8 -0
- package/lib/providers/authentication/credentials/actions.js +12 -0
- package/lib/providers/authentication/credentials/constants.d.ts +2 -0
- package/lib/providers/authentication/credentials/constants.js +3 -0
- package/lib/providers/authentication/credentials/context.d.ts +2 -0
- package/lib/providers/authentication/credentials/context.js +6 -0
- package/lib/providers/authentication/credentials/dispatch.d.ts +12 -0
- package/lib/providers/authentication/credentials/dispatch.js +22 -0
- package/lib/providers/authentication/credentials/hook.d.ts +6 -0
- package/lib/providers/authentication/credentials/hook.js +9 -0
- package/lib/providers/authentication/credentials/reducer.d.ts +8 -0
- package/lib/providers/authentication/credentials/reducer.js +22 -0
- package/lib/providers/authentication/credentials/types.d.ts +24 -0
- package/lib/providers/authentication/credentials/types.js +5 -0
- package/lib/providers/authentication/terra/context.d.ts +2 -0
- package/lib/providers/authentication/terra/context.js +7 -0
- package/lib/providers/authentication/terra/hook.d.ts +6 -0
- package/lib/providers/authentication/terra/hook.js +9 -0
- package/lib/{hooks/useAuthentication → providers/authentication/terra/hooks}/common/constants.d.ts +2 -0
- package/lib/{hooks/useAuthentication → providers/authentication/terra/hooks}/common/constants.js +7 -0
- package/lib/{hooks/useAuthentication → providers/authentication/terra/hooks}/common/entities.d.ts +3 -7
- package/lib/{hooks/useAuthentication → providers/authentication/terra/hooks}/common/entities.js +1 -5
- package/lib/providers/authentication/terra/hooks/useFetchProfiles.d.ts +13 -0
- package/lib/providers/authentication/terra/hooks/useFetchProfiles.js +31 -0
- package/lib/{hooks/useAuthentication → providers/authentication/terra/hooks}/useFetchTerraNIHProfile.js +11 -6
- package/lib/{hooks/useAuthentication → providers/authentication/terra/hooks}/useFetchTerraProfile.js +11 -6
- package/lib/{hooks/useAuthentication → providers/authentication/terra/hooks}/useFetchTerraTermsOfService.js +11 -6
- package/lib/providers/authentication/terra/hooks/utils.d.ts +16 -0
- package/lib/providers/authentication/terra/hooks/utils.js +19 -0
- package/lib/providers/authentication/terra/provider.d.ts +2 -0
- package/lib/providers/authentication/terra/provider.js +42 -0
- package/lib/providers/authentication/terra/types.d.ts +20 -0
- package/lib/providers/authentication/terra/types.js +6 -0
- package/lib/providers/authentication/terra/utils.d.ts +19 -0
- package/lib/providers/authentication/terra/utils.js +36 -0
- package/lib/providers/authentication/token/constants.d.ts +2 -0
- package/lib/providers/authentication/token/constants.js +4 -0
- package/lib/providers/authentication/token/dispatch.d.ts +12 -0
- package/lib/providers/authentication/token/dispatch.js +22 -0
- package/lib/providers/authentication/token/reducer.d.ts +8 -0
- package/lib/providers/authentication/token/reducer.js +22 -0
- package/lib/providers/authentication/token/types.d.ts +28 -0
- package/lib/providers/authentication/token/types.js +5 -0
- package/lib/providers/exploreState/actions/updateVisibility/action.d.ts +10 -0
- package/lib/providers/exploreState/actions/updateVisibility/action.js +16 -0
- package/lib/providers/exploreState/actions/updateVisibility/dispatch.d.ts +7 -0
- package/lib/providers/exploreState/actions/updateVisibility/dispatch.js +12 -0
- package/lib/providers/exploreState/actions/updateVisibility/types.d.ts +9 -0
- package/lib/providers/exploreState/actions/updateVisibility/types.js +1 -0
- package/lib/providers/exploreState/actions/updateVisibility/utils.d.ts +10 -0
- package/lib/providers/exploreState/actions/updateVisibility/utils.js +21 -0
- package/lib/providers/exploreState/entities.d.ts +1 -1
- package/lib/providers/exploreState/initializer/utils.js +5 -13
- package/lib/providers/exploreState/payloads/entities.d.ts +1 -5
- package/lib/providers/exploreState/utils.d.ts +1 -1
- package/lib/providers/exploreState/utils.js +5 -5
- package/lib/providers/exploreState.d.ts +2 -8
- package/lib/providers/exploreState.js +5 -10
- package/lib/providers/googleSignInAuthentication/common/types.d.ts +17 -0
- package/lib/providers/googleSignInAuthentication/common/types.js +1 -0
- package/lib/providers/googleSignInAuthentication/constants.d.ts +4 -0
- package/lib/providers/googleSignInAuthentication/constants.js +12 -0
- package/lib/providers/googleSignInAuthentication/hooks/useGoogleSignInService.d.ts +3 -0
- package/lib/providers/googleSignInAuthentication/hooks/useGoogleSignInService.js +36 -0
- package/lib/providers/googleSignInAuthentication/profile/types.d.ts +14 -0
- package/lib/providers/googleSignInAuthentication/profile/types.js +1 -0
- package/lib/providers/googleSignInAuthentication/profile/utils.d.ts +8 -0
- package/lib/providers/googleSignInAuthentication/profile/utils.js +25 -0
- package/lib/providers/googleSignInAuthentication/provider.d.ts +2 -0
- package/lib/providers/googleSignInAuthentication/provider.js +40 -0
- package/lib/providers/googleSignInAuthentication/service/constants.d.ts +4 -0
- package/lib/providers/googleSignInAuthentication/service/constants.js +9 -0
- package/lib/providers/googleSignInAuthentication/service/service.d.ts +6 -0
- package/lib/providers/googleSignInAuthentication/service/service.js +43 -0
- package/lib/providers/googleSignInAuthentication/types.d.ts +6 -0
- package/lib/providers/googleSignInAuthentication/types.js +1 -0
- package/lib/providers/nextAuthAuthentication/hooks/useNextAuthService.d.ts +2 -0
- package/lib/providers/nextAuthAuthentication/hooks/useNextAuthService.js +14 -0
- package/lib/providers/nextAuthAuthentication/provider.d.ts +2 -0
- package/lib/providers/nextAuthAuthentication/provider.js +30 -0
- package/lib/providers/nextAuthAuthentication/service/service.d.ts +6 -0
- package/lib/providers/nextAuthAuthentication/service/service.js +12 -0
- package/lib/providers/nextAuthAuthentication/types.d.ts +8 -0
- package/lib/providers/nextAuthAuthentication/types.js +1 -0
- package/lib/routes/constants.d.ts +3 -0
- package/lib/routes/constants.js +3 -0
- package/lib/styles/common/mui/button.d.ts +3 -0
- package/lib/styles/common/mui/button.js +17 -0
- package/lib/styles/common/mui/paper.d.ts +2 -0
- package/lib/styles/common/mui/paper.js +9 -0
- package/lib/styles/common/mui/popover.d.ts +3 -0
- package/lib/styles/common/mui/popover.js +10 -0
- package/lib/theme/common/entities.d.ts +6 -0
- package/lib/theme/common/entities.js +1 -0
- package/lib/views/LoginView/loginView.d.ts +5 -1
- package/lib/views/LoginView/loginView.js +6 -4
- package/package.json +3 -2
- package/src/components/Authentication/components/SessionController/components/GoogleSessionController/SessionController.tsx +38 -0
- package/src/components/Authentication/components/SessionController/components/GoogleSessionController/types.ts +7 -0
- package/src/components/Authentication/components/SessionController/components/NextSessionController/SessionController.tsx +23 -0
- package/src/components/Authentication/components/SessionController/components/NextSessionController/constants.ts +21 -0
- package/src/components/Authentication/components/SessionController/components/NextSessionController/types.ts +5 -0
- package/src/components/Authentication/components/SessionController/components/NextSessionController/utils.ts +74 -0
- package/src/components/ComponentCreator/ComponentCreator.tsx +4 -3
- package/src/components/Export/components/ExportToTerra/components/TerraSetUpForm/components/FormStep/components/AcceptTerraTOS/acceptTerraTOS.tsx +4 -4
- package/src/components/Export/components/ExportToTerra/components/TerraSetUpForm/components/NIHAccountExpiryWarning/nihAccountExpiryWarning.tsx +1 -1
- package/src/components/Export/components/ExportToTerra/components/TerraSetUpForm/terraSetUpForm.tsx +9 -6
- package/src/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/authentication.tsx +27 -25
- package/src/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/AuthenticationMenu/authenticationMenu.styles.ts +2 -2
- package/src/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/AuthenticationMenu/authenticationMenu.tsx +18 -42
- package/src/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/AuthenticationMenu/constants.ts +19 -0
- package/src/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/Button/button.styles.ts +3 -2
- package/src/components/Layout/components/Header/header.tsx +1 -1
- package/src/components/Login/components/Button/button.styles.ts +12 -0
- package/src/components/Login/components/Button/button.tsx +8 -0
- package/src/components/Login/components/Button/constants.ts +8 -0
- package/src/components/Login/components/Button/types.ts +4 -0
- package/src/components/Login/login.tsx +28 -28
- package/src/components/Login/types.ts +11 -0
- package/src/components/Table/common/columnDef.ts +18 -2
- package/src/components/Table/common/columnIdentifier.ts +4 -0
- package/src/components/Table/common/typeGuards.ts +12 -0
- package/src/components/Table/common/utils.ts +5 -115
- package/src/components/Table/components/TableCell/common/utils.ts +3 -3
- package/src/components/Table/components/TableCell/components/RowSelectionCell/rowSelectionCell.tsx +3 -7
- package/src/components/Table/components/TableFeatures/ColumnVisibility/utils.ts +25 -44
- package/src/components/Table/components/TableHead/components/HeadSelectionCell/headSelectionCell.tsx +5 -9
- package/src/components/Table/components/TableToolbar/components/ColumnGrouping/columnGrouping.tsx +4 -22
- package/src/components/Table/components/TableToolbar/components/ColumnGrouping/components/MenuItems/constants.ts +13 -0
- package/src/components/Table/components/TableToolbar/components/ColumnGrouping/components/MenuItems/menuItems.tsx +47 -20
- package/src/components/Table/components/TableToolbar/components/ColumnGrouping/components/MenuItems/types.ts +1 -2
- package/src/components/Table/components/TableToolbar/components/ColumnGrouping/components/MenuItems/utils.ts +58 -0
- package/src/components/Table/components/TableToolbar/components/ColumnGrouping/constants.ts +1 -13
- package/src/components/Table/components/TableToolbar/components/ColumnGrouping/utils.ts +26 -33
- package/src/components/Table/components/TableToolbar/components/ColumnVisibility/columnVisibility.styles.ts +12 -0
- package/src/components/Table/components/TableToolbar/components/ColumnVisibility/columnVisibility.tsx +28 -0
- package/src/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/constants.ts +9 -0
- package/src/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/menuItems.styles.ts +17 -0
- package/src/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/menuItems.tsx +53 -0
- package/src/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/types.ts +5 -0
- package/src/components/Table/components/TableToolbar/components/ColumnVisibility/components/MenuItems/utils.ts +44 -0
- package/src/components/Table/components/TableToolbar/components/ColumnVisibility/constants.ts +5 -0
- package/src/components/Table/components/TableToolbar/components/ColumnVisibility/types.ts +5 -0
- package/src/components/Table/components/TableToolbar/tableToolbar.tsx +5 -19
- package/src/components/Table/features/RowPosition/constants.ts +8 -5
- package/src/components/Table/features/RowPosition/types.ts +4 -0
- package/src/components/Table/features/RowPosition/utils.ts +1 -30
- package/src/components/Table/features/RowPreview/constants.ts +1 -1
- package/src/components/Table/features/entities.ts +2 -2
- package/src/components/Table/table.tsx +8 -46
- package/src/components/TableCreator/common/utils.ts +0 -4
- package/src/components/TableCreator/options/columnTrackSizing/typeGuards.ts +12 -0
- package/src/components/TableCreator/options/columnTrackSizing/utils.ts +99 -0
- package/src/components/TableCreator/options/hook.ts +8 -11
- package/src/components/TableCreator/options/initialState/columnVisibility.ts +22 -0
- package/src/components/TableCreator/options/initialState/hook.ts +24 -0
- package/src/components/TableCreator/options/visibility/constants.ts +5 -0
- package/src/components/TableCreator/options/visibility/hook.ts +22 -0
- package/src/components/TableCreator/tableCreator.tsx +3 -27
- package/src/components/common/Banner/components/SessionTimeout/sessionTimeout.tsx +1 -1
- package/src/components/common/CustomIcon/common/entities.ts +1 -4
- package/src/components/common/CustomIcon/components/GoogleIcon/googleIcon.tsx +3 -4
- package/src/config/entities.ts +22 -29
- package/src/hooks/authentication/auth/useAuthReducer.ts +16 -0
- package/src/hooks/authentication/authentication/useAuthenticationReducer.ts +16 -0
- package/src/hooks/authentication/config/useAuthenticationConfig.ts +13 -0
- package/src/hooks/authentication/credentials/useCredentialsReducer.ts +13 -0
- package/src/hooks/authentication/profile/types.ts +9 -0
- package/src/hooks/authentication/profile/useProfile.ts +21 -0
- package/src/hooks/authentication/providers/types.ts +7 -0
- package/src/hooks/authentication/providers/useProviders.ts +23 -0
- package/src/hooks/authentication/session/useSessionActive.ts +51 -0
- package/src/hooks/authentication/session/useSessionCallbackUrl.ts +25 -0
- package/src/hooks/authentication/session/useSessionIdleTimer.ts +10 -0
- package/src/hooks/{useSessionTimeout.ts → authentication/session/useSessionTimeout.ts} +2 -2
- package/src/hooks/{useAuthentication → authentication/terra}/useAuthenticationForm.ts +8 -13
- package/src/hooks/{useAuthentication → authentication/terra}/useAuthenticationNIHExpiry.ts +3 -4
- package/src/hooks/authentication/token/types.ts +5 -0
- package/src/hooks/authentication/token/useToken.ts +9 -0
- package/src/hooks/authentication/token/useTokenReducer.ts +19 -0
- package/src/hooks/useEntityList.ts +2 -2
- package/src/hooks/useFetchEntity.tsx +3 -3
- package/src/hooks/useFileManifest/useFetchFilesFacets.ts +2 -3
- package/src/hooks/useFileManifest/useFetchSummary.ts +2 -3
- package/src/hooks/useRequestFileLocation.ts +2 -3
- package/src/hooks/useRouteHistory.ts +65 -0
- package/src/hooks/useRouteRoot.ts +11 -0
- package/src/hooks/useSummary.ts +3 -3
- package/src/providers/authentication/auth/actions.ts +17 -0
- package/src/providers/authentication/auth/constants.ts +6 -0
- package/src/providers/authentication/auth/context.ts +9 -0
- package/src/providers/authentication/auth/dispatch.ts +58 -0
- package/src/providers/authentication/auth/hook.ts +11 -0
- package/src/providers/authentication/auth/reducer.ts +25 -0
- package/src/providers/authentication/auth/types.ts +63 -0
- package/src/providers/authentication/authentication/actions.ts +17 -0
- package/src/providers/authentication/authentication/constants.ts +6 -0
- package/src/providers/authentication/authentication/context.ts +8 -0
- package/src/providers/authentication/authentication/dispatch.ts +55 -0
- package/src/providers/authentication/authentication/hook.ts +11 -0
- package/src/providers/authentication/authentication/reducer.ts +34 -0
- package/src/providers/authentication/authentication/types.ts +64 -0
- package/src/providers/authentication/authentication/utils.ts +25 -0
- package/src/providers/authentication/common/types.ts +1 -0
- package/src/providers/authentication/common/utils.ts +11 -0
- package/src/providers/authentication/credentials/actions.ts +17 -0
- package/src/providers/authentication/credentials/constants.ts +5 -0
- package/src/providers/authentication/credentials/context.ts +8 -0
- package/src/providers/authentication/credentials/dispatch.ts +31 -0
- package/src/providers/authentication/credentials/hook.ts +11 -0
- package/src/providers/authentication/credentials/reducer.ts +30 -0
- package/src/providers/authentication/credentials/types.ts +33 -0
- package/src/providers/authentication/terra/context.ts +16 -0
- package/src/providers/authentication/terra/hook.ts +11 -0
- package/src/{hooks/useAuthentication → providers/authentication/terra/hooks}/common/constants.ts +9 -0
- package/src/{hooks/useAuthentication → providers/authentication/terra/hooks}/common/entities.ts +1 -7
- package/src/providers/authentication/terra/hooks/useFetchProfiles.ts +61 -0
- package/src/{hooks/useAuthentication → providers/authentication/terra/hooks}/useFetchTerraNIHProfile.ts +18 -7
- package/src/{hooks/useAuthentication → providers/authentication/terra/hooks}/useFetchTerraProfile.ts +18 -7
- package/src/{hooks/useAuthentication → providers/authentication/terra/hooks}/useFetchTerraTermsOfService.ts +18 -7
- package/src/providers/authentication/terra/hooks/utils.ts +29 -0
- package/src/providers/authentication/terra/provider.tsx +60 -0
- package/src/providers/authentication/terra/types.ts +23 -0
- package/src/providers/authentication/terra/utils.ts +49 -0
- package/src/providers/authentication/token/constants.ts +6 -0
- package/src/providers/authentication/token/dispatch.ts +29 -0
- package/src/providers/authentication/token/reducer.ts +26 -0
- package/src/providers/authentication/token/types.ts +36 -0
- package/src/providers/exploreState/actions/updateVisibility/action.ts +29 -0
- package/src/providers/exploreState/actions/updateVisibility/dispatch.ts +19 -0
- package/src/providers/exploreState/actions/updateVisibility/types.ts +11 -0
- package/src/providers/exploreState/actions/updateVisibility/utils.ts +28 -0
- package/src/providers/exploreState/entities.ts +1 -1
- package/src/providers/exploreState/initializer/utils.ts +5 -21
- package/src/providers/exploreState/payloads/entities.ts +0 -6
- package/src/providers/exploreState/utils.ts +5 -5
- package/src/providers/exploreState.tsx +6 -22
- package/src/providers/googleSignInAuthentication/common/types.ts +28 -0
- package/src/providers/googleSignInAuthentication/constants.ts +17 -0
- package/src/providers/googleSignInAuthentication/hooks/useGoogleSignInService.ts +53 -0
- package/src/providers/googleSignInAuthentication/profile/types.ts +15 -0
- package/src/providers/googleSignInAuthentication/profile/utils.ts +29 -0
- package/src/providers/googleSignInAuthentication/provider.tsx +53 -0
- package/src/providers/googleSignInAuthentication/service/constants.ts +16 -0
- package/src/providers/googleSignInAuthentication/service/service.ts +68 -0
- package/src/providers/googleSignInAuthentication/types.ts +7 -0
- package/src/providers/nextAuthAuthentication/hooks/useNextAuthService.ts +26 -0
- package/src/providers/nextAuthAuthentication/provider.tsx +42 -0
- package/src/providers/nextAuthAuthentication/service/service.ts +14 -0
- package/src/providers/nextAuthAuthentication/types.ts +9 -0
- package/src/routes/constants.ts +3 -0
- package/src/styles/common/mui/button.ts +20 -0
- package/src/styles/common/mui/paper.ts +11 -0
- package/src/styles/common/mui/popover.ts +19 -0
- package/src/theme/common/entities.ts +7 -0
- package/src/views/LoginView/loginView.tsx +15 -9
- package/tests/getProfileStatus.test.ts +290 -0
- package/tests/terraProfileProvider.test.tsx +121 -0
- package/tests/transformRoute.test.ts +21 -0
- package/tests/useRouteHistory.test.ts +97 -0
- package/tests/useSessionActive.test.ts +107 -0
- package/lib/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/AuthenticationMenu/authenticationMenu.stories.d.ts +0 -5
- package/lib/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/AuthenticationMenu/authenticationMenu.stories.js +0 -29
- package/lib/components/Login/login.stories.d.ts +0 -6
- package/lib/components/Login/login.stories.js +0 -31
- package/lib/components/Table/components/CheckboxMenu/checkboxMenu.d.ts +0 -16
- package/lib/components/Table/components/CheckboxMenu/checkboxMenu.js +0 -28
- package/lib/components/Table/components/CheckboxMenu/checkboxMenu.stories.d.ts +0 -5
- package/lib/components/Table/components/CheckboxMenu/checkboxMenu.stories.js +0 -46
- package/lib/components/Table/components/CheckboxMenu/checkboxMenu.styles.d.ts +0 -3
- package/lib/components/Table/components/CheckboxMenu/checkboxMenu.styles.js +0 -21
- package/lib/components/Table/features/constants.d.ts +0 -6
- package/lib/components/Table/features/constants.js +0 -8
- package/lib/components/TableCreator/common/constants.d.ts +0 -7
- package/lib/components/TableCreator/common/constants.js +0 -21
- package/lib/components/common/Button/components/LoginButton/loginButton.d.ts +0 -3
- package/lib/components/common/Button/components/LoginButton/loginButton.js +0 -6
- package/lib/components/common/Button/components/LoginButton/loginButton.styles.d.ts +0 -7
- package/lib/components/common/Button/components/LoginButton/loginButton.styles.js +0 -11
- package/lib/hooks/useAuthentication/useAuthentication.d.ts +0 -6
- package/lib/hooks/useAuthentication/useAuthentication.js +0 -9
- package/lib/hooks/useAuthentication/useAuthenticationComplete.d.ts +0 -6
- package/lib/hooks/useAuthentication/useAuthenticationComplete.js +0 -55
- package/lib/hooks/useAuthentication/useAuthenticationStatus.d.ts +0 -20
- package/lib/hooks/useAuthentication/useAuthenticationStatus.js +0 -32
- package/lib/hooks/useAuthentication/useFetchGoogleProfile.d.ts +0 -21
- package/lib/hooks/useAuthentication/useFetchGoogleProfile.js +0 -41
- package/lib/hooks/useAuthentication/useTokenClient.d.ts +0 -11
- package/lib/hooks/useAuthentication/useTokenClient.js +0 -29
- package/lib/hooks/useAuthenticationConfig.d.ts +0 -6
- package/lib/hooks/useAuthenticationConfig.js +0 -14
- package/lib/providers/authentication.d.ts +0 -51
- package/lib/providers/authentication.js +0 -110
- package/src/components/Layout/components/Header/components/Content/components/Actions/components/Authentication/components/AuthenticationMenu/authenticationMenu.stories.tsx +0 -35
- package/src/components/Login/login.stories.tsx +0 -43
- package/src/components/Table/components/CheckboxMenu/checkboxMenu.stories.tsx +0 -54
- package/src/components/Table/components/CheckboxMenu/checkboxMenu.styles.ts +0 -22
- package/src/components/Table/components/CheckboxMenu/checkboxMenu.tsx +0 -87
- package/src/components/Table/features/constants.ts +0 -10
- package/src/components/TableCreator/common/constants.ts +0 -25
- package/src/components/common/Button/components/LoginButton/loginButton.styles.ts +0 -13
- package/src/components/common/Button/components/LoginButton/loginButton.tsx +0 -16
- package/src/hooks/useAuthentication/useAuthentication.tsx +0 -10
- package/src/hooks/useAuthentication/useAuthenticationComplete.ts +0 -66
- package/src/hooks/useAuthentication/useAuthenticationStatus.ts +0 -49
- package/src/hooks/useAuthentication/useFetchGoogleProfile.ts +0 -68
- package/src/hooks/useAuthentication/useTokenClient.ts +0 -54
- package/src/hooks/useAuthenticationConfig.ts +0 -18
- package/src/providers/authentication.tsx +0 -181
- package/tests/authentication.test.ts +0 -142
- package/tests/useAuthenticationStatus.test.ts +0 -155
- /package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/{columnGrouping.styles.d.ts → components/MenuItems/menuItems.styles.d.ts} +0 -0
- /package/lib/components/Table/components/TableToolbar/components/ColumnGrouping/{columnGrouping.styles.js → components/MenuItems/menuItems.styles.js} +0 -0
- /package/lib/hooks/{useSessionTimeout.d.ts → authentication/session/useSessionTimeout.d.ts} +0 -0
- /package/lib/hooks/{useAuthentication → authentication/terra}/useAuthenticationNIHExpiry.d.ts +0 -0
- /package/lib/{hooks/useAuthentication → providers/authentication/terra/hooks}/common/utils.d.ts +0 -0
- /package/lib/{hooks/useAuthentication → providers/authentication/terra/hooks}/common/utils.js +0 -0
- /package/lib/{hooks/useAuthentication → providers/authentication/terra/hooks}/useFetchTerraNIHProfile.d.ts +0 -0
- /package/lib/{hooks/useAuthentication → providers/authentication/terra/hooks}/useFetchTerraProfile.d.ts +0 -0
- /package/lib/{hooks/useAuthentication → providers/authentication/terra/hooks}/useFetchTerraTermsOfService.d.ts +0 -0
- /package/src/components/Table/components/TableToolbar/components/ColumnGrouping/{columnGrouping.styles.ts → components/MenuItems/menuItems.styles.ts} +0 -0
- /package/src/{hooks/useAuthentication → providers/authentication/terra/hooks}/common/utils.ts +0 -0
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { useRouter } from "next/router";
|
|
2
|
+
import { useCallback } from "react";
|
|
3
|
+
import { useProviders } from "../../../hooks/authentication/providers/useProviders";
|
|
4
|
+
import { service } from "../service/service";
|
|
5
|
+
export const useGoogleSignInService = (reducer) => {
|
|
6
|
+
const { findProvider } = useProviders();
|
|
7
|
+
const { basePath } = useRouter();
|
|
8
|
+
const { authenticationReducer: { authenticationDispatch }, authReducer: { authDispatch }, credentialsReducer: { credentialsDispatch }, tokenReducer: { tokenDispatch }, } = reducer;
|
|
9
|
+
const onLogin = useCallback((providerId) => {
|
|
10
|
+
const provider = findProvider(providerId);
|
|
11
|
+
if (!provider)
|
|
12
|
+
return;
|
|
13
|
+
service.login(provider, {
|
|
14
|
+
authDispatch,
|
|
15
|
+
authenticationDispatch,
|
|
16
|
+
tokenDispatch,
|
|
17
|
+
});
|
|
18
|
+
}, [authDispatch, authenticationDispatch, findProvider, tokenDispatch]);
|
|
19
|
+
const onLogout = useCallback((options) => {
|
|
20
|
+
service.logout({
|
|
21
|
+
authDispatch,
|
|
22
|
+
authenticationDispatch,
|
|
23
|
+
credentialsDispatch,
|
|
24
|
+
tokenDispatch,
|
|
25
|
+
});
|
|
26
|
+
// Request page reload, ensuring that the entity detail page is re-initialized with the correct state and associated data.
|
|
27
|
+
location.href = options?.callbackUrl || basePath;
|
|
28
|
+
}, [
|
|
29
|
+
authDispatch,
|
|
30
|
+
authenticationDispatch,
|
|
31
|
+
basePath,
|
|
32
|
+
credentialsDispatch,
|
|
33
|
+
tokenDispatch,
|
|
34
|
+
]);
|
|
35
|
+
return { requestLogin: onLogin, requestLogout: onLogout };
|
|
36
|
+
};
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export interface GoogleProfile {
|
|
2
|
+
email: string;
|
|
3
|
+
email_verified: boolean;
|
|
4
|
+
family_name: string;
|
|
5
|
+
given_name: string;
|
|
6
|
+
hd: string;
|
|
7
|
+
locale: string;
|
|
8
|
+
name: string;
|
|
9
|
+
picture: string;
|
|
10
|
+
sub: string;
|
|
11
|
+
}
|
|
12
|
+
export interface TokenSetParameters {
|
|
13
|
+
access_token: string;
|
|
14
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { UserProfile } from "../../authentication/authentication/types";
|
|
2
|
+
import { GoogleProfile } from "./types";
|
|
3
|
+
/**
|
|
4
|
+
* Returns user profile from google response.
|
|
5
|
+
* @param profile - Google response.
|
|
6
|
+
* @returns user profile.
|
|
7
|
+
*/
|
|
8
|
+
export declare function mapProfile(profile: GoogleProfile): UserProfile;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { GOOGLE_SIGN_IN_PROVIDER_ID } from "../service/constants";
|
|
2
|
+
/**
|
|
3
|
+
* Returns full name, from given and family name.
|
|
4
|
+
* @param profile - Google response.
|
|
5
|
+
* @returns full name.
|
|
6
|
+
*/
|
|
7
|
+
function getFullName(profile) {
|
|
8
|
+
const { family_name: lastName = "", given_name: firstName = "" } = profile;
|
|
9
|
+
return `${firstName} ${lastName}`.trim();
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Returns user profile from google response.
|
|
13
|
+
* @param profile - Google response.
|
|
14
|
+
* @returns user profile.
|
|
15
|
+
*/
|
|
16
|
+
export function mapProfile(profile) {
|
|
17
|
+
const { email, picture: image } = profile;
|
|
18
|
+
const name = getFullName(profile);
|
|
19
|
+
return {
|
|
20
|
+
email,
|
|
21
|
+
id: GOOGLE_SIGN_IN_PROVIDER_ID,
|
|
22
|
+
image,
|
|
23
|
+
name,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import React from "react";
|
|
2
|
+
import { SessionController as DefaultSessionController } from "../../components/Authentication/components/SessionController/components/GoogleSessionController/SessionController";
|
|
3
|
+
import { useAuthReducer } from "../../hooks/authentication/auth/useAuthReducer";
|
|
4
|
+
import { useAuthenticationReducer } from "../../hooks/authentication/authentication/useAuthenticationReducer";
|
|
5
|
+
import { useCredentialsReducer } from "../../hooks/authentication/credentials/useCredentialsReducer";
|
|
6
|
+
import { useSessionActive } from "../../hooks/authentication/session/useSessionActive";
|
|
7
|
+
import { useSessionCallbackUrl } from "../../hooks/authentication/session/useSessionCallbackUrl";
|
|
8
|
+
import { useSessionIdleTimer } from "../../hooks/authentication/session/useSessionIdleTimer";
|
|
9
|
+
import { useTokenReducer } from "../../hooks/authentication/token/useTokenReducer";
|
|
10
|
+
import { AuthContext } from "../authentication/auth/context";
|
|
11
|
+
import { AuthenticationContext } from "../authentication/authentication/context";
|
|
12
|
+
import { CredentialsContext } from "../authentication/credentials/context";
|
|
13
|
+
import { AUTH_STATE, AUTHENTICATION_STATE } from "./constants";
|
|
14
|
+
import { useGoogleSignInService } from "./hooks/useGoogleSignInService";
|
|
15
|
+
export function GoogleSignInAuthenticationProvider({ children, SessionController = DefaultSessionController, timeout, }) {
|
|
16
|
+
const authReducer = useAuthReducer(AUTH_STATE);
|
|
17
|
+
const authenticationReducer = useAuthenticationReducer(AUTHENTICATION_STATE);
|
|
18
|
+
const credentialsReducer = useCredentialsReducer();
|
|
19
|
+
const tokenReducer = useTokenReducer(); // Reducer, local to Google Sign-In process only.
|
|
20
|
+
const service = useGoogleSignInService({
|
|
21
|
+
authReducer,
|
|
22
|
+
authenticationReducer,
|
|
23
|
+
credentialsReducer,
|
|
24
|
+
tokenReducer,
|
|
25
|
+
});
|
|
26
|
+
const { callbackUrl } = useSessionCallbackUrl();
|
|
27
|
+
const { authDispatch, authState } = authReducer;
|
|
28
|
+
const { isAuthenticated } = authState;
|
|
29
|
+
const { authenticationState } = authenticationReducer;
|
|
30
|
+
useSessionActive(authState, authenticationState);
|
|
31
|
+
useSessionIdleTimer({
|
|
32
|
+
disabled: !isAuthenticated,
|
|
33
|
+
onIdle: () => service.requestLogout({ callbackUrl }),
|
|
34
|
+
timeout,
|
|
35
|
+
});
|
|
36
|
+
return (React.createElement(CredentialsContext.Provider, { value: credentialsReducer },
|
|
37
|
+
React.createElement(AuthenticationContext.Provider, { value: authenticationReducer },
|
|
38
|
+
React.createElement(AuthContext.Provider, { value: { authDispatch, authState, service } },
|
|
39
|
+
React.createElement(SessionController, { token: tokenReducer.tokenState.token }, children)))));
|
|
40
|
+
}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { OAuthProvider } from "../../../config/entities";
|
|
2
|
+
import { GoogleProfile } from "../profile/types";
|
|
3
|
+
export declare const GOOGLE_SIGN_IN_PROVIDER_ID = "google";
|
|
4
|
+
export declare const GOOGLE_SIGN_IN_PROVIDER: Pick<OAuthProvider<GoogleProfile>, "icon" | "id" | "name" | "profile">;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { GoogleIcon } from "../../../components/common/CustomIcon/components/GoogleIcon/googleIcon";
|
|
2
|
+
import { mapProfile } from "../profile/utils";
|
|
3
|
+
export const GOOGLE_SIGN_IN_PROVIDER_ID = "google";
|
|
4
|
+
export const GOOGLE_SIGN_IN_PROVIDER = {
|
|
5
|
+
icon: GoogleIcon({}),
|
|
6
|
+
id: GOOGLE_SIGN_IN_PROVIDER_ID,
|
|
7
|
+
name: "Google",
|
|
8
|
+
profile: mapProfile,
|
|
9
|
+
};
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { OAuthProvider } from "../../../config/entities";
|
|
2
|
+
import { SessionDispatch } from "../common/types";
|
|
3
|
+
export declare const service: {
|
|
4
|
+
login: (provider: OAuthProvider, dispatch: Pick<SessionDispatch, "authDispatch" | "authenticationDispatch" | "tokenDispatch">) => void;
|
|
5
|
+
logout: (dispatch: SessionDispatch) => void;
|
|
6
|
+
};
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { requestAuth, resetState } from "../../authentication/auth/dispatch";
|
|
2
|
+
import { requestAuthentication, resetState as resetAuthenticationState, updateAuthentication, } from "../../authentication/authentication/dispatch";
|
|
3
|
+
import { AUTHENTICATION_STATUS } from "../../authentication/authentication/types";
|
|
4
|
+
import { fetchProfile } from "../../authentication/authentication/utils";
|
|
5
|
+
import { resetState as resetCredentialsState } from "../../authentication/credentials/dispatch";
|
|
6
|
+
import { getAuthenticationRequestOptions } from "../../authentication/terra/hooks/common/utils";
|
|
7
|
+
import { resetState as resetTokenState, updateToken, } from "../../authentication/token/dispatch";
|
|
8
|
+
export const service = {
|
|
9
|
+
login: (provider, dispatch) => {
|
|
10
|
+
const client = google.accounts.oauth2.initTokenClient({
|
|
11
|
+
callback: (response) => {
|
|
12
|
+
const { id, profile, userinfo } = provider;
|
|
13
|
+
const { access_token: token } = response;
|
|
14
|
+
dispatch.authDispatch?.(requestAuth());
|
|
15
|
+
dispatch.authenticationDispatch?.(requestAuthentication());
|
|
16
|
+
dispatch.tokenDispatch?.(updateToken({ providerId: id, token }));
|
|
17
|
+
fetchProfile(userinfo, getAuthenticationRequestOptions(token), {
|
|
18
|
+
onError: () => {
|
|
19
|
+
dispatch.authDispatch?.(resetState());
|
|
20
|
+
dispatch.authenticationDispatch?.(updateAuthentication({
|
|
21
|
+
profile: undefined,
|
|
22
|
+
status: AUTHENTICATION_STATUS.SETTLED,
|
|
23
|
+
}));
|
|
24
|
+
dispatch.tokenDispatch?.(resetTokenState());
|
|
25
|
+
},
|
|
26
|
+
onSuccess: (r) => dispatch.authenticationDispatch?.(updateAuthentication({
|
|
27
|
+
profile: profile(r),
|
|
28
|
+
status: AUTHENTICATION_STATUS.PENDING, // Authentication is pending until session controller is resolved.
|
|
29
|
+
})),
|
|
30
|
+
});
|
|
31
|
+
},
|
|
32
|
+
client_id: provider.clientId,
|
|
33
|
+
scope: provider.authorization.params.scope,
|
|
34
|
+
});
|
|
35
|
+
client.requestAccessToken();
|
|
36
|
+
},
|
|
37
|
+
logout: (dispatch) => {
|
|
38
|
+
dispatch.authDispatch?.(resetState());
|
|
39
|
+
dispatch.authenticationDispatch?.(resetAuthenticationState());
|
|
40
|
+
dispatch.credentialsDispatch?.(resetCredentialsState());
|
|
41
|
+
dispatch.tokenDispatch?.(resetTokenState());
|
|
42
|
+
},
|
|
43
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { useCallback } from "react";
|
|
2
|
+
import { transformRoute } from "../../../hooks/authentication/session/useSessionActive";
|
|
3
|
+
import { useRouteHistory } from "../../../hooks/useRouteHistory";
|
|
4
|
+
import { service } from "../service/service";
|
|
5
|
+
export const useNextAuthService = () => {
|
|
6
|
+
const { callbackUrl } = useRouteHistory(2);
|
|
7
|
+
const onLogin = useCallback((providerId) => {
|
|
8
|
+
service.login(providerId, { callbackUrl: callbackUrl(transformRoute) });
|
|
9
|
+
}, [callbackUrl]);
|
|
10
|
+
const onLogout = useCallback((options) => {
|
|
11
|
+
service.logout(options);
|
|
12
|
+
}, []);
|
|
13
|
+
return { requestLogin: onLogin, requestLogout: onLogout };
|
|
14
|
+
};
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { SessionProvider } from "next-auth/react";
|
|
2
|
+
import React from "react";
|
|
3
|
+
import { SessionController } from "../../components/Authentication/components/SessionController/components/NextSessionController/SessionController";
|
|
4
|
+
import { useAuthReducer } from "../../hooks/authentication/auth/useAuthReducer";
|
|
5
|
+
import { useAuthenticationReducer } from "../../hooks/authentication/authentication/useAuthenticationReducer";
|
|
6
|
+
import { useSessionCallbackUrl } from "../../hooks/authentication/session/useSessionCallbackUrl";
|
|
7
|
+
import { useSessionIdleTimer } from "../../hooks/authentication/session/useSessionIdleTimer";
|
|
8
|
+
import { AuthContext } from "../authentication/auth/context";
|
|
9
|
+
import { AuthenticationContext } from "../authentication/authentication/context";
|
|
10
|
+
import { useNextAuthService } from "./hooks/useNextAuthService";
|
|
11
|
+
export function NextAuthAuthenticationProvider({ children, refetchInterval = 0, session, timeout, }) {
|
|
12
|
+
const authReducer = useAuthReducer();
|
|
13
|
+
const authenticationReducer = useAuthenticationReducer();
|
|
14
|
+
const service = useNextAuthService();
|
|
15
|
+
const { authDispatch, authState } = authReducer;
|
|
16
|
+
const { isAuthenticated } = authState;
|
|
17
|
+
const { callbackUrl } = useSessionCallbackUrl();
|
|
18
|
+
useSessionIdleTimer({
|
|
19
|
+
crossTab: true,
|
|
20
|
+
disabled: !isAuthenticated,
|
|
21
|
+
onIdle: () => {
|
|
22
|
+
service.requestLogout({ callbackUrl, redirect: true });
|
|
23
|
+
},
|
|
24
|
+
timeout,
|
|
25
|
+
});
|
|
26
|
+
return (React.createElement(SessionProvider, { session: session, refetchInterval: refetchInterval / 1000 },
|
|
27
|
+
React.createElement(AuthenticationContext.Provider, { value: authenticationReducer },
|
|
28
|
+
React.createElement(AuthContext.Provider, { value: { authDispatch, authState, service } },
|
|
29
|
+
React.createElement(SessionController, null, children)))));
|
|
30
|
+
}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { SignInOptions, SignOutParams } from "next-auth/react";
|
|
2
|
+
import { ProviderId } from "../../authentication/common/types";
|
|
3
|
+
export declare const service: {
|
|
4
|
+
login: (providerId: ProviderId, options?: SignInOptions) => void;
|
|
5
|
+
logout: (options?: SignOutParams<boolean>) => void;
|
|
6
|
+
};
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { signIn, signOut } from "next-auth/react";
|
|
2
|
+
export const service = {
|
|
3
|
+
login: (providerId, options) => {
|
|
4
|
+
signIn(providerId, options).catch((e) => console.error(e));
|
|
5
|
+
},
|
|
6
|
+
logout: (options) => {
|
|
7
|
+
signOut({
|
|
8
|
+
callbackUrl: options?.callbackUrl,
|
|
9
|
+
redirect: options?.redirect || false,
|
|
10
|
+
}).catch((e) => console.error(e));
|
|
11
|
+
},
|
|
12
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export const COLOR = {
|
|
2
|
+
ERROR: "error",
|
|
3
|
+
INFO: "info",
|
|
4
|
+
INHERIT: "inherit",
|
|
5
|
+
PRIMARY: "primary",
|
|
6
|
+
SECONDARY: "secondary",
|
|
7
|
+
SUCCESS: "success",
|
|
8
|
+
WARNING: "warning",
|
|
9
|
+
};
|
|
10
|
+
export const VARIANT = {
|
|
11
|
+
ACTIVE_NAV: "activeNav",
|
|
12
|
+
BACK_NAV: "backNav",
|
|
13
|
+
CONTAINED: "contained",
|
|
14
|
+
NAV: "nav",
|
|
15
|
+
OUTLINED: "outlined",
|
|
16
|
+
TEXT: "text",
|
|
17
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -1 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
import { ClientSafeProvider } from "next-auth/react";
|
|
2
|
+
export interface LoginViewProps {
|
|
3
|
+
providers?: ClientSafeProvider[];
|
|
4
|
+
}
|
|
5
|
+
export declare const LoginView: ({ providers, }: LoginViewProps) => JSX.Element | null;
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { Login } from "../../components/Login/login";
|
|
3
|
-
import { useAuthenticationConfig } from "../../hooks/useAuthenticationConfig";
|
|
4
|
-
export const LoginView = () => {
|
|
5
|
-
const
|
|
6
|
-
|
|
3
|
+
import { useAuthenticationConfig } from "../../hooks/authentication/config/useAuthenticationConfig";
|
|
4
|
+
export const LoginView = ({ providers, }) => {
|
|
5
|
+
const authConfig = useAuthenticationConfig();
|
|
6
|
+
if (!authConfig)
|
|
7
|
+
return null;
|
|
8
|
+
return (React.createElement(Login, { providers: providers || authConfig.providers, termsOfService: authConfig.termsOfService, text: authConfig.text, title: authConfig.title, warning: authConfig.warning }));
|
|
7
9
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@databiosphere/findable-ui",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "21.0.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
|
|
@@ -75,11 +75,12 @@
|
|
|
75
75
|
"isomorphic-dompurify": "0.24.0",
|
|
76
76
|
"ky": "^1.7.2",
|
|
77
77
|
"next": "^14.1.0",
|
|
78
|
+
"next-auth": "^4.24.7",
|
|
78
79
|
"react": "^18.3.1",
|
|
79
80
|
"react-dom": "^18.3.1",
|
|
80
81
|
"react-dropzone": "^14.2.3",
|
|
81
82
|
"react-gtm-module": "2.0.11",
|
|
82
|
-
"react-idle-timer": "^5.
|
|
83
|
+
"react-idle-timer": "^5.7.2",
|
|
83
84
|
"react-window": "1.8.9",
|
|
84
85
|
"uuid": "8.3.2",
|
|
85
86
|
"validate.js": "^0.13.1"
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import React, { Fragment, useEffect } from "react";
|
|
2
|
+
import { authComplete } from "../../../../../../providers/authentication/auth/dispatch";
|
|
3
|
+
import { useAuth } from "../../../../../../providers/authentication/auth/hook";
|
|
4
|
+
import { authenticationComplete } from "../../../../../../providers/authentication/authentication/dispatch";
|
|
5
|
+
import { useAuthentication } from "../../../../../../providers/authentication/authentication/hook";
|
|
6
|
+
import { updateCredentials } from "../../../../../../providers/authentication/credentials/dispatch";
|
|
7
|
+
import { useCredentials } from "../../../../../../providers/authentication/credentials/hook";
|
|
8
|
+
import { SessionControllerProps } from "./types";
|
|
9
|
+
|
|
10
|
+
export function SessionController({
|
|
11
|
+
children,
|
|
12
|
+
token,
|
|
13
|
+
}: SessionControllerProps): JSX.Element {
|
|
14
|
+
const { authDispatch } = useAuth();
|
|
15
|
+
const {
|
|
16
|
+
authenticationDispatch,
|
|
17
|
+
authenticationState: { profile },
|
|
18
|
+
} = useAuthentication();
|
|
19
|
+
const { credentialsDispatch } = useCredentials();
|
|
20
|
+
|
|
21
|
+
useEffect(() => {
|
|
22
|
+
// Dispatch only when profile is available:
|
|
23
|
+
// - Login errors are managed by the login service.
|
|
24
|
+
// - Logout operations handle resetting credentials, authentication and auth state.
|
|
25
|
+
if (!profile) return;
|
|
26
|
+
credentialsDispatch?.(updateCredentials(token)); // Release credentials.
|
|
27
|
+
authenticationDispatch?.(authenticationComplete()); // Authentication `status` is "SETTLED".
|
|
28
|
+
authDispatch?.(authComplete({ isAuthenticated: true })); // Auth `status` is "SETTLED", and `isAuthenticated` is "true".
|
|
29
|
+
}, [
|
|
30
|
+
authDispatch,
|
|
31
|
+
authenticationDispatch,
|
|
32
|
+
credentialsDispatch,
|
|
33
|
+
profile,
|
|
34
|
+
token,
|
|
35
|
+
]);
|
|
36
|
+
|
|
37
|
+
return <Fragment>{children}</Fragment>;
|
|
38
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { useSession } from "next-auth/react";
|
|
2
|
+
import React, { Fragment, useEffect } from "react";
|
|
3
|
+
import { updateAuthState } from "../../../../../../providers/authentication/auth/dispatch";
|
|
4
|
+
import { useAuth } from "../../../../../../providers/authentication/auth/hook";
|
|
5
|
+
import { updateAuthentication } from "../../../../../../providers/authentication/authentication/dispatch";
|
|
6
|
+
import { useAuthentication } from "../../../../../../providers/authentication/authentication/hook";
|
|
7
|
+
import { SessionControllerProps } from "./types";
|
|
8
|
+
import { mapAuth, mapAuthentication } from "./utils";
|
|
9
|
+
|
|
10
|
+
export function SessionController({
|
|
11
|
+
children,
|
|
12
|
+
}: SessionControllerProps): JSX.Element {
|
|
13
|
+
const { authDispatch } = useAuth();
|
|
14
|
+
const { authenticationDispatch } = useAuthentication();
|
|
15
|
+
const session = useSession();
|
|
16
|
+
|
|
17
|
+
useEffect(() => {
|
|
18
|
+
authDispatch?.(updateAuthState(mapAuth(session)));
|
|
19
|
+
authenticationDispatch?.(updateAuthentication(mapAuthentication(session)));
|
|
20
|
+
}, [authDispatch, authenticationDispatch, session]);
|
|
21
|
+
|
|
22
|
+
return <Fragment>{children}</Fragment>;
|
|
23
|
+
}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { SessionContextValue } from "next-auth/react";
|
|
2
|
+
import { AUTH_STATUS } from "../../../../../../providers/authentication/auth/types";
|
|
3
|
+
import { AUTHENTICATION_STATUS } from "../../../../../../providers/authentication/authentication/types";
|
|
4
|
+
|
|
5
|
+
export const AUTH_STATUS_MAP: Record<
|
|
6
|
+
SessionContextValue["status"],
|
|
7
|
+
AUTH_STATUS
|
|
8
|
+
> = {
|
|
9
|
+
authenticated: AUTH_STATUS.SETTLED,
|
|
10
|
+
loading: AUTH_STATUS.PENDING,
|
|
11
|
+
unauthenticated: AUTH_STATUS.SETTLED,
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
export const AUTHENTICATION_STATUS_MAP: Record<
|
|
15
|
+
SessionContextValue["status"],
|
|
16
|
+
AUTHENTICATION_STATUS
|
|
17
|
+
> = {
|
|
18
|
+
authenticated: AUTHENTICATION_STATUS.SETTLED,
|
|
19
|
+
loading: AUTHENTICATION_STATUS.PENDING,
|
|
20
|
+
unauthenticated: AUTHENTICATION_STATUS.SETTLED,
|
|
21
|
+
};
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { Session } from "next-auth";
|
|
2
|
+
import { SessionContextValue } from "next-auth/react";
|
|
3
|
+
import {
|
|
4
|
+
AUTH_STATUS,
|
|
5
|
+
UpdateAuthStatePayload,
|
|
6
|
+
} from "../../../../../../providers/authentication/auth/types";
|
|
7
|
+
import {
|
|
8
|
+
AUTHENTICATION_STATUS,
|
|
9
|
+
UpdateAuthenticationPayload,
|
|
10
|
+
UserProfile,
|
|
11
|
+
} from "../../../../../../providers/authentication/authentication/types";
|
|
12
|
+
import { AUTH_STATUS_MAP, AUTHENTICATION_STATUS_MAP } from "./constants";
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Returns the auth state from the session context.
|
|
16
|
+
* @param session - Session context value.
|
|
17
|
+
* @returns auth state.
|
|
18
|
+
*/
|
|
19
|
+
export function mapAuth(session: SessionContextValue): UpdateAuthStatePayload {
|
|
20
|
+
return {
|
|
21
|
+
isAuthenticated: session.status === "authenticated",
|
|
22
|
+
status: mapStatus(session.status, AUTH_STATUS_MAP, AUTH_STATUS.SETTLED),
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Returns the authentication profile and status from the session context.
|
|
28
|
+
* @param session - Session context value.
|
|
29
|
+
* @returns authentication profile and status.
|
|
30
|
+
*/
|
|
31
|
+
export function mapAuthentication(
|
|
32
|
+
session: SessionContextValue
|
|
33
|
+
): UpdateAuthenticationPayload {
|
|
34
|
+
return {
|
|
35
|
+
profile: mapProfile(session.data),
|
|
36
|
+
status: mapStatus(
|
|
37
|
+
session.status,
|
|
38
|
+
AUTHENTICATION_STATUS_MAP,
|
|
39
|
+
AUTHENTICATION_STATUS.SETTLED
|
|
40
|
+
),
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* Maps the session data to a user profile.
|
|
46
|
+
* @param sessionData - Session data.
|
|
47
|
+
* @returns user profile.
|
|
48
|
+
*/
|
|
49
|
+
function mapProfile(sessionData: Session | null): UserProfile | undefined {
|
|
50
|
+
if (!sessionData) return;
|
|
51
|
+
const { user } = sessionData;
|
|
52
|
+
if (!user) return;
|
|
53
|
+
const { email, image, name } = user;
|
|
54
|
+
return {
|
|
55
|
+
email: email || "",
|
|
56
|
+
image: image || "",
|
|
57
|
+
name: name || "",
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/**
|
|
62
|
+
* Returns the auth or authentication status <S> based on the session status.
|
|
63
|
+
* @param status - Session status.
|
|
64
|
+
* @param statusBySessionStatus - Map of session status to auth or authentication status.
|
|
65
|
+
* @param defaultStatus - Default auth or authentication status.
|
|
66
|
+
* @returns auth or authentication status.
|
|
67
|
+
*/
|
|
68
|
+
function mapStatus<S>(
|
|
69
|
+
status: SessionContextValue["status"],
|
|
70
|
+
statusBySessionStatus: Record<SessionContextValue["status"], S>,
|
|
71
|
+
defaultStatus: S
|
|
72
|
+
): S {
|
|
73
|
+
return statusBySessionStatus[status] || defaultStatus;
|
|
74
|
+
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { ComponentsConfig, ViewContext } from "../../config/entities";
|
|
3
|
-
import { useAuthentication } from "../../hooks/useAuthentication/useAuthentication";
|
|
4
3
|
import { useConfig } from "../../hooks/useConfig";
|
|
5
4
|
import { useExploreState } from "../../hooks/useExploreState";
|
|
6
5
|
import { useFileManifestState } from "../../hooks/useFileManifestState";
|
|
7
6
|
import { useSystemStatus } from "../../hooks/useSystemStatus";
|
|
7
|
+
import { useAuth } from "../../providers/authentication/auth/hook";
|
|
8
8
|
|
|
9
9
|
export interface ComponentCreatorProps<T> {
|
|
10
10
|
components: ComponentsConfig;
|
|
@@ -27,7 +27,9 @@ export const ComponentCreator = <T,>({
|
|
|
27
27
|
response,
|
|
28
28
|
viewContext,
|
|
29
29
|
}: ComponentCreatorProps<T>): JSX.Element => {
|
|
30
|
-
const {
|
|
30
|
+
const {
|
|
31
|
+
authState: { isAuthenticated },
|
|
32
|
+
} = useAuth();
|
|
31
33
|
const { config, entityConfig } = useConfig();
|
|
32
34
|
const { exploreState } = useExploreState();
|
|
33
35
|
const { fileManifestState } = useFileManifestState();
|
|
@@ -53,7 +55,6 @@ export const ComponentCreator = <T,>({
|
|
|
53
55
|
? c.viewBuilder(response, {
|
|
54
56
|
...viewContext,
|
|
55
57
|
authState: {
|
|
56
|
-
authenticationStatus,
|
|
57
58
|
isAuthenticated,
|
|
58
59
|
},
|
|
59
60
|
entityConfig,
|