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

Change name of page visibility boolean

arvid-e 3 месяцев назад
Родитель
Сommit
a591dbe8a6

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

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

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

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

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

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

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

@@ -47,7 +47,7 @@ const validator = {
     body('hideRestrictedByGroup')
       .if((value) => value != null)
       .isBoolean(),
-    body('hideUserPages')
+    body('isHidingUserPages')
       .if(value => value != null).isBoolean(),
     body('isUsersHomepageDeletionEnabled')
       .if((value) => value != null)
@@ -219,7 +219,7 @@ const validator = {
  *          pageCompleteDeletionAuthority:
  *            type: string
  *            description: type of pageDeletionAuthority
- *          hideUserPages:
+ *          isHidingUserPages:
  *            type: boolean
  *            description: hide all user pages from general users
  *          hideRestrictedByOwner:
@@ -510,8 +510,8 @@ module.exports = (crowi) => {
           hideRestrictedByGroup: await configManager.getConfig(
             'security:list-policy:hideRestrictedByGroup',
           ),
-          hideUserPages: await configManager.getConfig(
-            'security:user-pages:areHidden'
+          isHidingUserPages: await configManager.getConfig(
+            'security:isHidingUserPages'
           ),
           isUsersHomepageDeletionEnabled: await configManager.getConfig(
             'security:user-homepage-deletion:isEnabled',
@@ -1003,8 +1003,8 @@ module.exports = (crowi) => {
           req.body.hideRestrictedByOwner,
         'security:list-policy:hideRestrictedByGroup':
           req.body.hideRestrictedByGroup,
-        'security:user-pages:areHidden':
-          req.body.hideUserPages,
+        'security:isHidingUserPages':
+          req.body.isHidingUserPages,
         'security:user-homepage-deletion:isEnabled':
           req.body.isUsersHomepageDeletionEnabled,
         // Validate user-homepage-deletion config
@@ -1077,8 +1077,8 @@ module.exports = (crowi) => {
           hideRestrictedByGroup: await configManager.getConfig(
             'security:list-policy:hideRestrictedByGroup',
           ),
-          hideUserPages: await configManager.getConfig(
-            'security:user-pages:areHidden'
+          isHidingUserPages: await configManager.getConfig(
+            'security:isHidingUserPages'
           ),
           isUsersHomepageDeletionEnabled: await configManager.getConfig(
             '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:pageRecursiveCompleteDeletionAuthority',
   'security:isAllGroupMembershipRequiredForPageCompleteDeletion',
-  'security:user-pages:isHidden',
+  'security:isHidingUserPages',
   'security:user-homepage-deletion:isEnabled',
   'security:user-homepage-deletion:isForceDeleteUserHomepageOnUserDeletion',
   'security:isRomUserAllowedToComment',
@@ -679,7 +679,7 @@ export const CONFIG_DEFINITIONS = {
     defineConfig<boolean>({
       defaultValue: true,
     }),
-  'security:user-pages:areHidden': defineConfig<boolean>({
+  'security:isHidingUserPages': defineConfig<boolean>({
     defaultValue: false,
   }),
   'security:user-homepage-deletion:isEnabled': defineConfig<boolean>({