delete default prefix

packages/app/src/components/Me/InAppNotificationSettings.tsx

@@ -16,7 +16,7 @@ type SubscribeRule = {
   isEnabled: boolean,
 }
 
-const defaultSubscribeRulesMenuItems = [
+const subscribeRulesMenuItems = [
   {
     name: 'PAGE_CREATE',
     description: 'in_app_notification_settings.default_subscribe_rules.page_create',
@@ -27,14 +27,14 @@ const defaultSubscribeRulesMenuItems = [
 const InAppNotificationSettings: FC<Props> = (props: Props) => {
   const { appContainer } = props;
   const { t } = useTranslation();
-  const [defaultSubscribeRules, setDefaultSubscribeRules] = useState<SubscribeRule[]>([]);
+  const [subscribeRules, setSubscribeRules] = useState<SubscribeRule[]>([]);
 
   const initializeInAppNotificationSettings = useCallback(async() => {
     const { data } = await appContainer.apiv3Get('/personal-setting/in-app-notification-settings');
-    const retrievedRules: SubscribeRule[] = data?.defaultSubscribeRules;
+    const retrievedRules: SubscribeRule[] = data?.subscribeRules;
 
     if (retrievedRules != null && retrievedRules.length > 0) {
-      setDefaultSubscribeRules(retrievedRules);
+      setSubscribeRules(retrievedRules);
     }
     else {
       const createRulesFormList = (rule: {name: string}) => (
@@ -43,28 +43,28 @@ const InAppNotificationSettings: FC<Props> = (props: Props) => {
           isEnabled: false,
         }
       );
-      const initializedSubscribeRules = defaultSubscribeRulesMenuItems.map(rule => createRulesFormList(rule));
-      setDefaultSubscribeRules(initializedSubscribeRules);
+      const initializedSubscribeRules = subscribeRulesMenuItems.map(rule => createRulesFormList(rule));
+      setSubscribeRules(initializedSubscribeRules);
     }
 
   }, [appContainer]);
 
   const isCheckedRule = (ruleName: string) => (
-    defaultSubscribeRules.find(stateRule => (
+    subscribeRules.find(stateRule => (
       stateRule.name === ruleName
     ))?.isEnabled || false
   );
 
   const ruleCheckboxHandler = (isChecked: boolean, ruleName: string) => {
-    setDefaultSubscribeRules(prevState => (
+    setSubscribeRules(prevState => (
       prevState.filter(rule => rule.name !== ruleName).concat({ name: ruleName, isEnabled: isChecked })
     ));
   };
 
   const updateSettingsHandler = async() => {
     try {
-      const { data } = await appContainer.apiv3Put('/personal-setting/in-app-notification-settings', { defaultSubscribeRules });
-      setDefaultSubscribeRules(data.defaultSubscribeRules);
+      const { data } = await appContainer.apiv3Put('/personal-setting/in-app-notification-settings', { subscribeRules });
+      setSubscribeRules(data.subscribeRules);
       toastSuccess(t('toaster.update_successed', { target: 'InAppNotification Settings' }));
     }
     catch (err) {
@@ -82,7 +82,7 @@ const InAppNotificationSettings: FC<Props> = (props: Props) => {
 
       <div className="form-group row">
         <div className="offset-md-3 col-md-6 text-left">
-          {defaultSubscribeRulesMenuItems.map(rule => (
+          {subscribeRulesMenuItems.map(rule => (
             <div
               key={rule.name}
               className="custom-control custom-switch custom-checkbox-success"

packages/app/src/interfaces/in-app-notification-settings.ts

@@ -3,11 +3,11 @@ import { Schema } from 'mongoose';
 export enum subscribeRules {
   PAGE_CREATE = 'PAGE_CREATE'
 }
-export interface IDefaultSubscribeRule {
+export interface ISubscribeRule {
   name: subscribeRules;
   isEnabled: boolean;
 }
 export interface IInAppNotificationSettings {
   userId: Schema.Types.ObjectId;
-  defaultSubscribeRules: IDefaultSubscribeRule[];
+  subscribeRules: ISubscribeRule[];
 }

packages/app/src/server/models/in-app-notification-settings.ts

@@ -8,7 +8,7 @@ export type InAppNotificationSettingsModel = Model<InAppNotificationSettingsDocu
 
 const inAppNotificationSettingsSchema = new Schema<IInAppNotificationSettings>({
   userId: { type: String },
-  defaultSubscribeRules: [
+  subscribeRules: [
     {
       name: { type: String, require: true, enum: subscribeRules },
       isEnabled: { type: Boolean },

packages/app/src/server/routes/apiv3/personal-setting.js

@@ -577,15 +577,15 @@ module.exports = (crowi) => {
   // eslint-disable-next-line max-len
   router.put('/in-app-notification-settings', accessTokenParser, loginRequiredStrictly, csrf, validator.inAppNotificationSettings, apiV3FormValidator, async(req, res) => {
     const query = { userId: req.user.id };
-    const defaultSubscribeRules = req.body.defaultSubscribeRules;
+    const subscribeRules = req.body.subscribeRules;
 
-    if (defaultSubscribeRules == null) {
+    if (subscribeRules == null) {
       return res.apiv3Err('no-rules-found');
     }
 
     const options = { upsert: true, new: true, runValidators: true };
     try {
-      const response = await InAppNotificationSettings.findOneAndUpdate(query, { defaultSubscribeRules }, options);
+      const response = await InAppNotificationSettings.findOneAndUpdate(query, { subscribeRules }, options);
       return res.apiv3(response);
     }
     catch (err) {