Просмотр исходного кода

fix: rename isHidingUserPages to disableUserPages across the application

Shun Miyazawa 2 месяцев назад
Родитель
Сommit
9c732360f2
24 измененных файлов с 62 добавлено и 62 удалено
  1. 1 1
      apps/app/src/client/components/Admin/Security/SecuritySetting/UserPageVisibilitySettings.tsx
  2. 2 2
      apps/app/src/client/components/Admin/Security/SecuritySetting/index.tsx
  3. 5 5
      apps/app/src/client/services/AdminGeneralSecurityContainer.js
  4. 4 4
      apps/app/src/features/search/client/components/PrivateLegacyPages.tsx
  5. 4 4
      apps/app/src/features/search/client/components/SearchPage/SearchControl.tsx
  6. 3 3
      apps/app/src/features/search/client/components/SearchPage/SearchOptionModal/SearchOptionModal.tsx
  7. 1 1
      apps/app/src/features/search/client/components/SearchPage/SearchOptionModal/dynamic.tsx
  8. 4 4
      apps/app/src/features/search/client/components/SearchPage/SearchPage.tsx
  9. 3 3
      apps/app/src/pages/[[...path]]/page-data-props.ts
  10. 2 2
      apps/app/src/pages/_search/get-server-side-props/index.ts
  11. 1 1
      apps/app/src/pages/_search/types.ts
  12. 2 2
      apps/app/src/pages/_search/use-hydrate-server-configurations.ts
  13. 2 2
      apps/app/src/pages/general-page/configuration-props.ts
  14. 2 2
      apps/app/src/pages/general-page/hydrate.ts
  15. 1 1
      apps/app/src/pages/general-page/types.ts
  16. 2 2
      apps/app/src/server/models/page.ts
  17. 3 3
      apps/app/src/server/routes/apiv3/bookmarks.ts
  18. 3 3
      apps/app/src/server/routes/apiv3/page-listing.ts
  19. 3 3
      apps/app/src/server/routes/apiv3/page/index.ts
  20. 3 3
      apps/app/src/server/routes/apiv3/pages/index.js
  21. 7 7
      apps/app/src/server/routes/apiv3/security-settings/index.js
  22. 2 2
      apps/app/src/server/service/config-manager/config-definition.ts
  23. 1 1
      apps/app/src/server/service/page/index.ts
  24. 1 1
      apps/app/src/states/server-configurations/server-configurations.ts

+ 1 - 1
apps/app/src/client/components/Admin/Security/SecuritySetting/UserPageVisibilitySettings.tsx

@@ -24,7 +24,7 @@ export const UserPageVisibilitySettings: React.FC<Props> = ({
               type="checkbox"
               type="checkbox"
               className="form-check-input"
               className="form-check-input"
               id="is-user-pages-visible"
               id="is-user-pages-visible"
-              checked={adminGeneralSecurityContainer.state.isHidingUserPages}
+              checked={adminGeneralSecurityContainer.state.disableUserPages}
               onChange={() => {
               onChange={() => {
                 adminGeneralSecurityContainer.changeUserPageVisibility();
                 adminGeneralSecurityContainer.changeUserPageVisibility();
               }}
               }}

+ 2 - 2
apps/app/src/client/components/Admin/Security/SecuritySetting/index.tsx

@@ -64,8 +64,8 @@ const SecuritySettingComponent: React.FC<Props> = ({
           hideRestrictedByOwner:
           hideRestrictedByOwner:
             adminGeneralSecurityContainer.state
             adminGeneralSecurityContainer.state
               .currentOwnerRestrictionDisplayMode === 'Hidden',
               .currentOwnerRestrictionDisplayMode === 'Hidden',
-          isHidingUserPages:
-            adminGeneralSecurityContainer.state.isHidingUserPages,
+          disableUserPages:
+            adminGeneralSecurityContainer.state.disableUserPages,
           isUsersHomepageDeletionEnabled:
           isUsersHomepageDeletionEnabled:
             adminGeneralSecurityContainer.state.isUsersHomepageDeletionEnabled,
             adminGeneralSecurityContainer.state.isUsersHomepageDeletionEnabled,
           isForceDeleteUserHomepageOnUserDeletion:
           isForceDeleteUserHomepageOnUserDeletion:

+ 5 - 5
apps/app/src/client/services/AdminGeneralSecurityContainer.js

@@ -45,7 +45,7 @@ export default class AdminGeneralSecurityContainer extends Container {
       expandOtherOptionsForCompleteDeletion: false,
       expandOtherOptionsForCompleteDeletion: false,
       isShowRestrictedByOwner: false,
       isShowRestrictedByOwner: false,
       isUsersHomepageDeletionEnabled: false,
       isUsersHomepageDeletionEnabled: false,
-      isHidingUserPages: false,
+      disableUserPages: false,
       isForceDeleteUserHomepageOnUserDeletion: false,
       isForceDeleteUserHomepageOnUserDeletion: false,
       isRomUserAllowedToComment: false,
       isRomUserAllowedToComment: false,
       isLocalEnabled: false,
       isLocalEnabled: false,
@@ -107,7 +107,7 @@ export default class AdminGeneralSecurityContainer extends Container {
       isForceDeleteUserHomepageOnUserDeletion:
       isForceDeleteUserHomepageOnUserDeletion:
         generalSetting.isForceDeleteUserHomepageOnUserDeletion,
         generalSetting.isForceDeleteUserHomepageOnUserDeletion,
       isRomUserAllowedToComment: generalSetting.isRomUserAllowedToComment,
       isRomUserAllowedToComment: generalSetting.isRomUserAllowedToComment,
-      isHidingUserPages: generalSetting.isHidingUserPages,
+      disableUserPages: generalSetting.disableUserPages,
       sessionMaxAge: generalSetting.sessionMaxAge,
       sessionMaxAge: generalSetting.sessionMaxAge,
       wikiMode: generalSetting.wikiMode,
       wikiMode: generalSetting.wikiMode,
       disableLinkSharing: shareLinkSetting.disableLinkSharing,
       disableLinkSharing: shareLinkSetting.disableLinkSharing,
@@ -180,7 +180,7 @@ export default class AdminGeneralSecurityContainer extends Container {
   }
   }
 
 
   changeUserPageVisibility() {
   changeUserPageVisibility() {
-    this.setState({ isHidingUserPages: !this.state.isHidingUserPages });
+    this.setState({ disableUserPages: !this.state.disableUserPages });
   }
   }
 
 
   /**
   /**
@@ -291,7 +291,7 @@ export default class AdminGeneralSecurityContainer extends Container {
               formData.isAllGroupMembershipRequiredForPageCompleteDeletion,
               formData.isAllGroupMembershipRequiredForPageCompleteDeletion,
             hideRestrictedByGroup: formData.hideRestrictedByGroup,
             hideRestrictedByGroup: formData.hideRestrictedByGroup,
             hideRestrictedByOwner: formData.hideRestrictedByOwner,
             hideRestrictedByOwner: formData.hideRestrictedByOwner,
-            isHidingUserPages: formData.isHidingUserPages,
+            disableUserPages: formData.disableUserPages,
             isUsersHomepageDeletionEnabled:
             isUsersHomepageDeletionEnabled:
               formData.isUsersHomepageDeletionEnabled,
               formData.isUsersHomepageDeletionEnabled,
             isForceDeleteUserHomepageOnUserDeletion:
             isForceDeleteUserHomepageOnUserDeletion:
@@ -314,7 +314,7 @@ export default class AdminGeneralSecurityContainer extends Container {
               this.state.currentGroupRestrictionDisplayMode === 'Hidden',
               this.state.currentGroupRestrictionDisplayMode === 'Hidden',
             hideRestrictedByOwner:
             hideRestrictedByOwner:
               this.state.currentOwnerRestrictionDisplayMode === 'Hidden',
               this.state.currentOwnerRestrictionDisplayMode === 'Hidden',
-            isHidingUserPages: this.state.isHidingUserPages,
+            disableUserPages: this.state.disableUserPages,
             isUsersHomepageDeletionEnabled:
             isUsersHomepageDeletionEnabled:
               this.state.isUsersHomepageDeletionEnabled,
               this.state.isUsersHomepageDeletionEnabled,
             isForceDeleteUserHomepageOnUserDeletion:
             isForceDeleteUserHomepageOnUserDeletion:

+ 4 - 4
apps/app/src/features/search/client/components/PrivateLegacyPages.tsx

@@ -36,7 +36,7 @@ import type { PageMigrationErrorData } from '~/interfaces/websocket';
 import { SocketEventName } from '~/interfaces/websocket';
 import { SocketEventName } from '~/interfaces/websocket';
 import { useIsAdmin } from '~/states/context';
 import { useIsAdmin } from '~/states/context';
 import { useSearchKeyword, useSetSearchKeyword } from '~/states/search';
 import { useSearchKeyword, useSetSearchKeyword } from '~/states/search';
-import { isHidingUserPagesAtom } from '~/states/server-configurations';
+import { disableUserPagesAtom } from '~/states/server-configurations';
 import { useGlobalSocket } from '~/states/socket-io';
 import { useGlobalSocket } from '~/states/socket-io';
 import type { ILegacyPrivatePage } from '~/states/ui/modal/private-legacy-pages-migration';
 import type { ILegacyPrivatePage } from '~/states/ui/modal/private-legacy-pages-migration';
 import { usePrivateLegacyPagesMigrationModalActions } from '~/states/ui/modal/private-legacy-pages-migration';
 import { usePrivateLegacyPagesMigrationModalActions } from '~/states/ui/modal/private-legacy-pages-migration';
@@ -270,7 +270,7 @@ const PrivateLegacyPages = (): JSX.Element => {
   const keyword = useSearchKeyword();
   const keyword = useSearchKeyword();
   const setSearchKeyword = useSetSearchKeyword('/_private-legacy-pages');
   const setSearchKeyword = useSetSearchKeyword('/_private-legacy-pages');
 
 
-  const isHidingUserPages = useAtomValue(isHidingUserPagesAtom);
+  const disableUserPages = useAtomValue(disableUserPagesAtom);
 
 
   const [offset, setOffset] = useState<number>(0);
   const [offset, setOffset] = useState<number>(0);
   const [limit, setLimit] = useState<number>(INITIAL_PAGING_SIZE);
   const [limit, setLimit] = useState<number>(INITIAL_PAGING_SIZE);
@@ -519,7 +519,7 @@ const PrivateLegacyPages = (): JSX.Element => {
   const searchControl = useMemo(() => {
   const searchControl = useMemo(() => {
     return (
     return (
       <SearchControl
       <SearchControl
-        isHidingUserPages={isHidingUserPages}
+        disableUserPages={disableUserPages}
         isEnableSort={false}
         isEnableSort={false}
         isEnableFilter={false}
         isEnableFilter={false}
         initialSearchConditions={{ keyword: initQ, limit: INITIAL_PAGING_SIZE }}
         initialSearchConditions={{ keyword: initQ, limit: INITIAL_PAGING_SIZE }}
@@ -527,7 +527,7 @@ const PrivateLegacyPages = (): JSX.Element => {
         extraControls={extraControls}
         extraControls={extraControls}
       />
       />
     );
     );
-  }, [searchInvokedHandler, extraControls, isHidingUserPages]);
+  }, [searchInvokedHandler, extraControls, disableUserPages]);
 
 
   const searchResultListHead = useMemo(() => {
   const searchResultListHead = useMemo(() => {
     if (data == null) {
     if (data == null) {

+ 4 - 4
apps/app/src/features/search/client/components/SearchPage/SearchControl.tsx

@@ -12,7 +12,7 @@ import SortControl from './SortControl';
 type Props = {
 type Props = {
   isEnableSort: boolean;
   isEnableSort: boolean;
   isEnableFilter: boolean;
   isEnableFilter: boolean;
-  isHidingUserPages: boolean;
+  disableUserPages: boolean;
   initialSearchConditions: Partial<ISearchConditions>;
   initialSearchConditions: Partial<ISearchConditions>;
 
 
   onSearchInvoked?: (
   onSearchInvoked?: (
@@ -30,7 +30,7 @@ const SearchControl = React.memo((props: Props): JSX.Element => {
   const {
   const {
     isEnableSort,
     isEnableSort,
     isEnableFilter,
     isEnableFilter,
-    isHidingUserPages,
+    disableUserPages,
     initialSearchConditions,
     initialSearchConditions,
     onSearchInvoked,
     onSearchInvoked,
     extraControls,
     extraControls,
@@ -154,7 +154,7 @@ const SearchControl = React.memo((props: Props): JSX.Element => {
               </button>
               </button>
             </div>
             </div>
             <div className="d-none d-lg-flex align-items-center search-control-include-options">
             <div className="d-none d-lg-flex align-items-center search-control-include-options">
-              {isHidingUserPages === false && (
+              {disableUserPages === false && (
                 <div className="px-2 py-1">
                 <div className="px-2 py-1">
                   <div className="form-check form-check-succsess">
                   <div className="form-check form-check-succsess">
                     <input
                     <input
@@ -212,7 +212,7 @@ const SearchControl = React.memo((props: Props): JSX.Element => {
       <SearchOptionModalLazyLoaded
       <SearchOptionModalLazyLoaded
         isOpen={isFileterOptionModalShown || false}
         isOpen={isFileterOptionModalShown || false}
         onClose={() => setIsFileterOptionModalShown(false)}
         onClose={() => setIsFileterOptionModalShown(false)}
-        isHidingUserPages={isHidingUserPages}
+        disableUserPages={disableUserPages}
         includeUserPages={includeUserPages}
         includeUserPages={includeUserPages}
         includeTrashPages={includeTrashPages}
         includeTrashPages={includeTrashPages}
         onIncludeUserPagesSwitched={setIncludeUserPages}
         onIncludeUserPagesSwitched={setIncludeUserPages}

+ 3 - 3
apps/app/src/features/search/client/components/SearchPage/SearchOptionModal/SearchOptionModal.tsx

@@ -6,7 +6,7 @@ type Props = {
   isOpen: boolean;
   isOpen: boolean;
   includeUserPages: boolean;
   includeUserPages: boolean;
   includeTrashPages: boolean;
   includeTrashPages: boolean;
-  isHidingUserPages: boolean;
+  disableUserPages: boolean;
   onClose?: () => void;
   onClose?: () => void;
   onIncludeUserPagesSwitched?: (isChecked: boolean) => void;
   onIncludeUserPagesSwitched?: (isChecked: boolean) => void;
   onIncludeTrashPagesSwitched?: (isChecked: boolean) => void;
   onIncludeTrashPagesSwitched?: (isChecked: boolean) => void;
@@ -19,7 +19,7 @@ export const SearchOptionModal: FC<Props> = (props: Props) => {
     isOpen,
     isOpen,
     includeUserPages,
     includeUserPages,
     includeTrashPages,
     includeTrashPages,
-    isHidingUserPages,
+    disableUserPages,
     onClose,
     onClose,
     onIncludeUserPagesSwitched,
     onIncludeUserPagesSwitched,
     onIncludeTrashPagesSwitched,
     onIncludeTrashPagesSwitched,
@@ -57,7 +57,7 @@ export const SearchOptionModal: FC<Props> = (props: Props) => {
       </ModalHeader>
       </ModalHeader>
       <ModalBody>
       <ModalBody>
         <div className="d-flex p-2">
         <div className="d-flex p-2">
-          {!isHidingUserPages && (
+          {!disableUserPages && (
             <div className="me-3">
             <div className="me-3">
               <label className="form-label px-3 py-2 mb-0 d-flex align-items-center">
               <label className="form-label px-3 py-2 mb-0 d-flex align-items-center">
                 <input
                 <input

+ 1 - 1
apps/app/src/features/search/client/components/SearchPage/SearchOptionModal/dynamic.tsx

@@ -6,7 +6,7 @@ type SearchOptionModalProps = {
   isOpen: boolean;
   isOpen: boolean;
   includeUserPages: boolean;
   includeUserPages: boolean;
   includeTrashPages: boolean;
   includeTrashPages: boolean;
-  isHidingUserPages: boolean;
+  disableUserPages: boolean;
   onClose?: () => void;
   onClose?: () => void;
   onIncludeUserPagesSwitched?: (isChecked: boolean) => void;
   onIncludeUserPagesSwitched?: (isChecked: boolean) => void;
   onIncludeTrashPagesSwitched?: (isChecked: boolean) => void;
   onIncludeTrashPagesSwitched?: (isChecked: boolean) => void;

+ 4 - 4
apps/app/src/features/search/client/components/SearchPage/SearchPage.tsx

@@ -12,7 +12,7 @@ import type {
 import type { IFormattedSearchResult } from '~/interfaces/search';
 import type { IFormattedSearchResult } from '~/interfaces/search';
 import { useSearchKeyword, useSetSearchKeyword } from '~/states/search';
 import { useSearchKeyword, useSetSearchKeyword } from '~/states/search';
 import {
 import {
-  isHidingUserPagesAtom,
+  disableUserPagesAtom,
   showPageLimitationLAtom,
   showPageLimitationLAtom,
 } from '~/states/server-configurations';
 } from '~/states/server-configurations';
 import {
 import {
@@ -109,7 +109,7 @@ export const SearchPage = (): JSX.Element => {
   const keyword = useSearchKeyword();
   const keyword = useSearchKeyword();
   const setSearchKeyword = useSetSearchKeyword();
   const setSearchKeyword = useSetSearchKeyword();
 
 
-  const isHidingUserPages = useAtomValue(isHidingUserPagesAtom);
+  const disableUserPages = useAtomValue(disableUserPagesAtom);
 
 
   const [offset, setOffset] = useState<number>(0);
   const [offset, setOffset] = useState<number>(0);
   const [limit, setLimit] = useState<number>(
   const [limit, setLimit] = useState<number>(
@@ -291,7 +291,7 @@ export const SearchPage = (): JSX.Element => {
       <SearchControl
       <SearchControl
         isEnableSort
         isEnableSort
         isEnableFilter
         isEnableFilter
-        isHidingUserPages={isHidingUserPages}
+        disableUserPages={disableUserPages}
         initialSearchConditions={initialSearchConditions}
         initialSearchConditions={initialSearchConditions}
         onSearchInvoked={searchInvokedHandler}
         onSearchInvoked={searchInvokedHandler}
         extraControls={extraControls}
         extraControls={extraControls}
@@ -304,7 +304,7 @@ export const SearchPage = (): JSX.Element => {
     collapseContents,
     collapseContents,
     initialSearchConditions,
     initialSearchConditions,
     isCollapsed,
     isCollapsed,
-    isHidingUserPages,
+    disableUserPages,
     searchInvokedHandler,
     searchInvokedHandler,
   ]);
   ]);
 
 

+ 3 - 3
apps/app/src/pages/[[...path]]/page-data-props.ts

@@ -164,11 +164,11 @@ export async function getPageDataForInitial(
     { pageId, path: resolvedPagePath, user },
     { pageId, path: resolvedPagePath, user },
   );
   );
 
 
-  const isHidingUserPages = configManager.getConfig(
-    'security:isHidingUserPages',
+  const disableUserPages = configManager.getConfig(
+    'security:disable-user-pages',
   );
   );
 
 
-  if (isHidingUserPages && pageWithMeta.data != null) {
+  if (disableUserPages && pageWithMeta.data != null) {
     const pagePath = pageWithMeta.data.path;
     const pagePath = pageWithMeta.data.path;
     const isTargetUserPage = isUserPage(pagePath) || isUsersTopPage(pagePath);
     const isTargetUserPage = isUserPage(pagePath) || isUsersTopPage(pagePath);
 
 

+ 2 - 2
apps/app/src/pages/_search/get-server-side-props/index.ts

@@ -31,8 +31,8 @@ const getServerSideConfigurationProps: GetServerSideProps<
         showPageLimitationL: configManager.getConfig(
         showPageLimitationL: configManager.getConfig(
           'customize:showPageLimitationL',
           'customize:showPageLimitationL',
         ),
         ),
-        isHidingUserPages: configManager.getConfig(
-          'security:isHidingUserPages',
+        disableUserPages: configManager.getConfig(
+          'security:disable-user-pages',
         ),
         ),
       },
       },
     },
     },

+ 1 - 1
apps/app/src/pages/_search/types.ts

@@ -2,6 +2,6 @@ export type ServerConfigurationProps = {
   serverConfig: {
   serverConfig: {
     isContainerFluid: boolean;
     isContainerFluid: boolean;
     showPageLimitationL: number;
     showPageLimitationL: number;
-    isHidingUserPages: boolean;
+    disableUserPages: boolean;
   };
   };
 };
 };

+ 2 - 2
apps/app/src/pages/_search/use-hydrate-server-configurations.ts

@@ -2,8 +2,8 @@ import { useHydrateAtoms } from 'jotai/utils';
 
 
 import type { RendererConfig } from '~/interfaces/services/renderer';
 import type { RendererConfig } from '~/interfaces/services/renderer';
 import {
 import {
+  disableUserPagesAtom,
   isContainerFluidAtom,
   isContainerFluidAtom,
-  isHidingUserPagesAtom,
   rendererConfigAtom,
   rendererConfigAtom,
   showPageLimitationLAtom,
   showPageLimitationLAtom,
 } from '~/states/server-configurations';
 } from '~/states/server-configurations';
@@ -26,7 +26,7 @@ export const useHydrateServerConfigurationAtoms = (
           [isContainerFluidAtom, serverConfig.isContainerFluid],
           [isContainerFluidAtom, serverConfig.isContainerFluid],
           [showPageLimitationLAtom, serverConfig.showPageLimitationL],
           [showPageLimitationLAtom, serverConfig.showPageLimitationL],
           [rendererConfigAtom, rendererConfigs],
           [rendererConfigAtom, rendererConfigs],
-          [isHidingUserPagesAtom, serverConfig.isHidingUserPages],
+          [disableUserPagesAtom, serverConfig.disableUserPages],
         ],
         ],
   );
   );
 };
 };

+ 2 - 2
apps/app/src/pages/general-page/configuration-props.ts

@@ -120,8 +120,8 @@ export const getServerSideGeneralPageProps: GetServerSideProps<
         isEnabledAttachTitleHeader: configManager.getConfig(
         isEnabledAttachTitleHeader: configManager.getConfig(
           'customize:isEnabledAttachTitleHeader',
           'customize:isEnabledAttachTitleHeader',
         ),
         ),
-        isHidingUserPages: configManager.getConfig(
-          'security:isHidingUserPages',
+        disableUserPages: configManager.getConfig(
+          'security:disable-user-pages',
         ),
         ),
       },
       },
     },
     },

+ 2 - 2
apps/app/src/pages/general-page/hydrate.ts

@@ -5,6 +5,7 @@ import {
   aiEnabledAtom,
   aiEnabledAtom,
   defaultIndentSizeAtom,
   defaultIndentSizeAtom,
   disableLinkSharingAtom,
   disableLinkSharingAtom,
+  disableUserPagesAtom,
   drawioUriAtom,
   drawioUriAtom,
   elasticsearchMaxBodyLengthToIndexAtom,
   elasticsearchMaxBodyLengthToIndexAtom,
   isAclEnabledAtom,
   isAclEnabledAtom,
@@ -13,7 +14,6 @@ import {
   isContainerFluidAtom,
   isContainerFluidAtom,
   isEnabledAttachTitleHeaderAtom,
   isEnabledAttachTitleHeaderAtom,
   isEnabledStaleNotificationAtom,
   isEnabledStaleNotificationAtom,
-  isHidingUserPagesAtom,
   isIndentSizeForcedAtom,
   isIndentSizeForcedAtom,
   isLocalAccountRegistrationEnabledAtom,
   isLocalAccountRegistrationEnabledAtom,
   isPdfBulkExportEnabledAtom,
   isPdfBulkExportEnabledAtom,
@@ -85,7 +85,7 @@ export const useHydrateGeneralPageConfigurationAtoms = (
             serverConfig.isLocalAccountRegistrationEnabled,
             serverConfig.isLocalAccountRegistrationEnabled,
           ],
           ],
           [rendererConfigAtom, rendererConfigs],
           [rendererConfigAtom, rendererConfigs],
-          [isHidingUserPagesAtom, serverConfig.isHidingUserPages],
+          [disableUserPagesAtom, serverConfig.disableUserPages],
         ],
         ],
   );
   );
 };
 };

+ 1 - 1
apps/app/src/pages/general-page/types.ts

@@ -32,7 +32,7 @@ export type ServerConfigurationProps = {
     isEnabledStaleNotification: boolean;
     isEnabledStaleNotification: boolean;
     disableLinkSharing: boolean;
     disableLinkSharing: boolean;
     isIndentSizeForced: boolean;
     isIndentSizeForced: boolean;
-    isHidingUserPages: boolean;
+    disableUserPages: boolean;
     isEnabledAttachTitleHeader: boolean;
     isEnabledAttachTitleHeader: boolean;
     isSlackConfigured: boolean;
     isSlackConfigured: boolean;
     isAclEnabled: boolean;
     isAclEnabled: boolean;

+ 2 - 2
apps/app/src/server/models/page.ts

@@ -89,7 +89,7 @@ export type FindRecentUpdatedPagesOption = {
   desc: number;
   desc: number;
   hideRestrictedByOwner: boolean;
   hideRestrictedByOwner: boolean;
   hideRestrictedByGroup: boolean;
   hideRestrictedByGroup: boolean;
-  hideUserPages: boolean;
+  disableUserPages: boolean;
 };
 };
 
 
 export type CreateMethod = (
 export type CreateMethod = (
@@ -937,7 +937,7 @@ schema.statics.findRecentUpdatedPages = async function (
   const baseQuery = this.find({});
   const baseQuery = this.find({});
   const queryBuilder = new PageQueryBuilder(baseQuery, includeEmpty);
   const queryBuilder = new PageQueryBuilder(baseQuery, includeEmpty);
 
 
-  if (options.hideUserPages) {
+  if (options.disableUserPages) {
     queryBuilder.addConditionToListByNotMatchPathAndChildren('/user');
     queryBuilder.addConditionToListByNotMatchPathAndChildren('/user');
   }
   }
 
 

+ 3 - 3
apps/app/src/server/routes/apiv3/bookmarks.ts

@@ -257,11 +257,11 @@ module.exports = (crowi) => {
           })
           })
           .exec();
           .exec();
 
 
-        const isHidingUserPages = configManager.getConfig(
-          'security:isHidingUserPages',
+        const disabledUserPage = configManager.getConfig(
+          'security:disable-user-pages',
         );
         );
 
 
-        const filteredBookmarks = isHidingUserPages
+        const filteredBookmarks = disabledUserPage
           ? userRootBookmarks.filter(
           ? userRootBookmarks.filter(
               (bookmark) =>
               (bookmark) =>
                 bookmark.page != null &&
                 bookmark.page != null &&

+ 3 - 3
apps/app/src/server/routes/apiv3/page-listing.ts

@@ -159,8 +159,8 @@ const routerFactory = (crowi: Crowi): Router => {
       const hideRestrictedByGroup = await configManager.getConfig(
       const hideRestrictedByGroup = await configManager.getConfig(
         'security:list-policy:hideRestrictedByGroup',
         'security:list-policy:hideRestrictedByGroup',
       );
       );
-      const hideUserPages = await configManager.getConfig(
-        'security:isHidingUserPages',
+      const disableUserPages = await configManager.getConfig(
+        'security:disable-user-pages',
       );
       );
 
 
       try {
       try {
@@ -172,7 +172,7 @@ const routerFactory = (crowi: Crowi): Router => {
             !hideRestrictedByGroup,
             !hideRestrictedByGroup,
           );
           );
 
 
-        if (hideUserPages === true) {
+        if (disableUserPages) {
           pages = pages.filter(
           pages = pages.filter(
             (page) => !isUserPage(page.path) && !isUsersTopPage(page.path),
             (page) => !isUserPage(page.path) && !isUsersTopPage(page.path),
           );
           );

+ 3 - 3
apps/app/src/server/routes/apiv3/page/index.ts

@@ -197,8 +197,8 @@ module.exports = (crowi: Crowi) => {
       const { pageId, path, findAll, revisionId, shareLinkId, includeEmpty } =
       const { pageId, path, findAll, revisionId, shareLinkId, includeEmpty } =
         req.query;
         req.query;
 
 
-      const isHidingUserPages = crowi.configManager.getConfig(
-        'security:isHidingUserPages',
+      const disableUserPages = crowi.configManager.getConfig(
+        'security:disable-user-pages',
       );
       );
 
 
       const respondWithSinglePage = async (
       const respondWithSinglePage = async (
@@ -227,7 +227,7 @@ module.exports = (crowi: Crowi) => {
           );
           );
         }
         }
 
 
-        if (isHidingUserPages && page != null) {
+        if (disableUserPages && page != null) {
           const isTargetUserPage =
           const isTargetUserPage =
             isUserPage(page.path) || isUsersTopPage(page.path);
             isUserPage(page.path) || isUsersTopPage(page.path);
 
 

+ 3 - 3
apps/app/src/server/routes/apiv3/pages/index.js

@@ -193,8 +193,8 @@ module.exports = (crowi) => {
       const hideRestrictedByGroup = configManager.getConfig(
       const hideRestrictedByGroup = configManager.getConfig(
         'security:list-policy:hideRestrictedByGroup',
         'security:list-policy:hideRestrictedByGroup',
       );
       );
-      const hideUserPages = configManager.getConfig(
-        'security:isHidingUserPages',
+      const disableUserPages = configManager.getConfig(
+        'security:disable-user-pages',
       );
       );
 
 
       /**
       /**
@@ -210,7 +210,7 @@ module.exports = (crowi) => {
         desc: -1,
         desc: -1,
         hideRestrictedByOwner,
         hideRestrictedByOwner,
         hideRestrictedByGroup,
         hideRestrictedByGroup,
-        hideUserPages,
+        disableUserPages,
       };
       };
 
 
       try {
       try {

+ 7 - 7
apps/app/src/server/routes/apiv3/security-settings/index.js

@@ -47,7 +47,7 @@ const validator = {
     body('hideRestrictedByGroup')
     body('hideRestrictedByGroup')
       .if((value) => value != null)
       .if((value) => value != null)
       .isBoolean(),
       .isBoolean(),
-    body('isHidingUserPages')
+    body('disableUserPages')
       .if((value) => value != null)
       .if((value) => value != null)
       .isBoolean(),
       .isBoolean(),
     body('isUsersHomepageDeletionEnabled')
     body('isUsersHomepageDeletionEnabled')
@@ -220,7 +220,7 @@ const validator = {
  *          pageCompleteDeletionAuthority:
  *          pageCompleteDeletionAuthority:
  *            type: string
  *            type: string
  *            description: type of pageDeletionAuthority
  *            description: type of pageDeletionAuthority
- *          isHidingUserPages:
+ *          disableUserPages:
  *            type: boolean
  *            type: boolean
  *            description: hide all user pages from general users
  *            description: hide all user pages from general users
  *          hideRestrictedByOwner:
  *          hideRestrictedByOwner:
@@ -511,8 +511,8 @@ module.exports = (crowi) => {
           hideRestrictedByGroup: await configManager.getConfig(
           hideRestrictedByGroup: await configManager.getConfig(
             'security:list-policy:hideRestrictedByGroup',
             'security:list-policy:hideRestrictedByGroup',
           ),
           ),
-          isHidingUserPages: await configManager.getConfig(
-            'security:isHidingUserPages',
+          disableUserPages: await configManager.getConfig(
+            'security:disable-user-pages',
           ),
           ),
           isUsersHomepageDeletionEnabled: await configManager.getConfig(
           isUsersHomepageDeletionEnabled: await configManager.getConfig(
             'security:user-homepage-deletion:isEnabled',
             'security:user-homepage-deletion:isEnabled',
@@ -1004,7 +1004,7 @@ module.exports = (crowi) => {
           req.body.hideRestrictedByOwner,
           req.body.hideRestrictedByOwner,
         'security:list-policy:hideRestrictedByGroup':
         'security:list-policy:hideRestrictedByGroup':
           req.body.hideRestrictedByGroup,
           req.body.hideRestrictedByGroup,
-        'security:isHidingUserPages': req.body.isHidingUserPages,
+        'security:disable-user-pages': req.body.disableUserPages,
         'security:user-homepage-deletion:isEnabled':
         'security:user-homepage-deletion:isEnabled':
           req.body.isUsersHomepageDeletionEnabled,
           req.body.isUsersHomepageDeletionEnabled,
         // Validate user-homepage-deletion config
         // Validate user-homepage-deletion config
@@ -1077,8 +1077,8 @@ module.exports = (crowi) => {
           hideRestrictedByGroup: await configManager.getConfig(
           hideRestrictedByGroup: await configManager.getConfig(
             'security:list-policy:hideRestrictedByGroup',
             'security:list-policy:hideRestrictedByGroup',
           ),
           ),
-          isHidingUserPages: await configManager.getConfig(
-            'security:isHidingUserPages',
+          disableUserPages: await configManager.getConfig(
+            'security:disable-user-pages',
           ),
           ),
           isUsersHomepageDeletionEnabled: await configManager.getConfig(
           isUsersHomepageDeletionEnabled: await configManager.getConfig(
             'security:user-homepage-deletion:isEnabled',
             'security:user-homepage-deletion:isEnabled',

+ 2 - 2
apps/app/src/server/service/config-manager/config-definition.ts

@@ -115,7 +115,7 @@ export const CONFIG_KEYS = [
   'security:pageRecursiveDeletionAuthority',
   'security:pageRecursiveDeletionAuthority',
   'security:pageRecursiveCompleteDeletionAuthority',
   'security:pageRecursiveCompleteDeletionAuthority',
   'security:isAllGroupMembershipRequiredForPageCompleteDeletion',
   'security:isAllGroupMembershipRequiredForPageCompleteDeletion',
-  'security:isHidingUserPages',
+  'security:disable-user-pages',
   'security:user-homepage-deletion:isEnabled',
   'security:user-homepage-deletion:isEnabled',
   'security:user-homepage-deletion:isForceDeleteUserHomepageOnUserDeletion',
   'security:user-homepage-deletion:isForceDeleteUserHomepageOnUserDeletion',
   'security:isRomUserAllowedToComment',
   'security:isRomUserAllowedToComment',
@@ -679,7 +679,7 @@ export const CONFIG_DEFINITIONS = {
     defineConfig<boolean>({
     defineConfig<boolean>({
       defaultValue: true,
       defaultValue: true,
     }),
     }),
-  'security:isHidingUserPages': defineConfig<boolean>({
+  'security:disable-user-pages': defineConfig<boolean>({
     defaultValue: false,
     defaultValue: false,
   }),
   }),
   'security:user-homepage-deletion:isEnabled': defineConfig<boolean>({
   'security:user-homepage-deletion:isEnabled': defineConfig<boolean>({

+ 1 - 1
apps/app/src/server/service/page/index.ts

@@ -799,7 +799,7 @@ class PageService implements IPageService {
   getExcludedPathsBySystem(): string[] {
   getExcludedPathsBySystem(): string[] {
     const excludedPaths: string[] = [];
     const excludedPaths: string[] = [];
 
 
-    if (configManager.getConfig('security:isHidingUserPages')) {
+    if (configManager.getConfig('security:disable-user-pages')) {
       excludedPaths.push('/user');
       excludedPaths.push('/user');
     }
     }
 
 

+ 1 - 1
apps/app/src/states/server-configurations/server-configurations.ts

@@ -146,7 +146,7 @@ export const isPdfBulkExportEnabledAtom = atom<boolean>(false);
 /**
 /**
  * Atom for hiding user pages setting enabled
  * Atom for hiding user pages setting enabled
  */
  */
-export const isHidingUserPagesAtom = atom<boolean>(false);
+export const disableUserPagesAtom = atom<boolean>(false);
 
 
 /**
 /**
  * Atom for local account registration enabled
  * Atom for local account registration enabled