Răsfoiți Sursa

show group inheritance select modal in all pages

Futa Arai 1 an în urmă
părinte
comite
d4c84f3c9d

+ 4 - 2
apps/app/src/components/GrantedGroupsInheritanceSelectModal.tsx

@@ -7,7 +7,7 @@ import {
 
 import { useGrantedGroupsInheritanceSelectModal } from '~/stores/modal';
 
-export const GrantedGroupsInheritanceSelectModal = (): JSX.Element => {
+const GrantedGroupsInheritanceSelectModal = (): JSX.Element => {
   const { t } = useTranslation();
   const { data: modalData, close: closeModal } = useGrantedGroupsInheritanceSelectModal();
   const [onlyInheritUserRelatedGrantedGroups, setOnlyInheritUserRelatedGrantedGroups] = useState(false);
@@ -23,7 +23,7 @@ export const GrantedGroupsInheritanceSelectModal = (): JSX.Element => {
       isOpen={isOpened}
       toggle={() => closeModal()}
     >
-      <ModalHeader tag="h4" toggle={() => closeModal()} className="text-light">
+      <ModalHeader tag="h4" toggle={() => closeModal()}>
         {t('modal_granted_groups_inheritance_select.select_granted_groups')}
       </ModalHeader>
       <ModalBody>
@@ -65,3 +65,5 @@ export const GrantedGroupsInheritanceSelectModal = (): JSX.Element => {
     </Modal>
   );
 };
+
+export default GrantedGroupsInheritanceSelectModal;

+ 2 - 0
apps/app/src/components/Layout/BasicLayout.tsx

@@ -29,6 +29,7 @@ const PageDeleteModal = dynamic(() => import('../PageDeleteModal'), { ssr: false
 const PageRenameModal = dynamic(() => import('../PageRenameModal'), { ssr: false });
 const PagePresentationModal = dynamic(() => import('../PagePresentationModal'), { ssr: false });
 const PageAccessoriesModal = dynamic(() => import('../PageAccessoriesModal').then(mod => mod.PageAccessoriesModal), { ssr: false });
+const GrantedGroupsInheritanceSelectModal = dynamic(() => import('../GrantedGroupsInheritanceSelectModal'), { ssr: false });
 const DeleteBookmarkFolderModal = dynamic(() => import('../DeleteBookmarkFolderModal').then(mod => mod.DeleteBookmarkFolderModal), { ssr: false });
 const SearchModal = dynamic(() => import('../../features/search/client/components/SearchModal'), { ssr: false });
 
@@ -72,6 +73,7 @@ export const BasicLayout = ({ children, className }: Props): JSX.Element => {
       <HotkeysManager />
 
       <ShortcutsModal />
+      <GrantedGroupsInheritanceSelectModal />
       <SystemVersion showShortcutsButton />
     </RawLayout>
   );

+ 0 - 2
apps/app/src/pages/[[...path]].page.tsx

@@ -21,7 +21,6 @@ import { useRouter } from 'next/router';
 import superjson from 'superjson';
 
 import { useEditorModeClassName } from '~/client/services/layout';
-import { GrantedGroupsInheritanceSelectModal } from '~/components/GrantedGroupsInheritanceSelectModal';
 import { PageView } from '~/components/Page/PageView';
 import { DrawioViewerScript } from '~/components/Script/DrawioViewerScript';
 import { SupportedAction, type SupportedActionType } from '~/interfaces/activity';
@@ -386,7 +385,6 @@ Page.getLayout = function getLayout(page: React.ReactElement<Props>) {
       <LinkEditModal />
       <TagEditModal />
       <ConflictDiffModal />
-      <GrantedGroupsInheritanceSelectModal />
     </>
   );
 };