refactor: update Settings model to use env method for ALLOW_UNSAFE_SETTINGS and disable jsonSchema validation

Author: VuXfi

libs/adminpanel/ProductCatalog/ProductCatalog.ts

@@ -116,15 +116,17 @@ export class Group<GroupProductItem extends Item> extends BaseModelItem<GroupPro
 		data: {
 			model: this.model,
 			labels: {
+				//@ts-ignore
 				title: req.i18n.__('Add Group'),
+				//@ts-ignore
 				save: req.i18n.__('Save'),
 			},
 		},
 		};
 	}
 
 	async getEditTemplate(id: string | number, catalogId: string, req: any): Promise<any> {
-		const item = await this.find(id);
+		const item = await this.find(id, catalogId);
 		return {
 		type: 'model',
 		data: {
@@ -158,7 +160,9 @@ export class Product<T extends Item> extends BaseModelItem<T> {
 			data: {
 				model: this.model,
 				labels: {
+					//@ts-ignore
 					title: req.i18n.__('Add Product'),
+					//@ts-ignore
 					save: req.i18n.__('Save'),
 				}
 			}
@@ -176,12 +180,19 @@ export class Product<T extends Item> extends BaseModelItem<T> {
 					modelId: item.id
 				},
 				labels: {
+					//@ts-ignore
 					title: req.i18n.__('Add Product'),
+					//@ts-ignore
 					save: req.i18n.__('Save'),
 				}
 			}
 		})
 	}
+
+	public updateModelItems(modelId: string | number, data: any, catalogId: string): Promise<T> {
+		// For Product, no specific update needed for navigation items
+		return Promise.resolve(null as T);
+	}
 }
 
 export class ProductCatalog extends AbstractCatalog {

models/Settings.js

@@ -97,7 +97,7 @@ let Model = {
                 try {
                     value = JSON.parse(process.env[key]);
                     // if value was parsed, check that given json matches the schema (if !ALLOW_UNSAFE_SETTINGS)
-                    if (!(await Settings.get("ALLOW_UNSAFE_SETTINGS") ?? false)) {
+                    if (!(Settings.env("ALLOW_UNSAFE_SETTINGS") ?? false)) {
                         const ajv = new ajv_1.default();
                         const validate = ajv.compile(setting.jsonSchema);
                         if (!validate(value)) {
@@ -137,6 +137,9 @@ let Model = {
         //   sails.log.error(`Settings get: Requested setting [${key}] was not declared by specification`);
         //   return;
         // }
+        // if(process.env[key] !== undefined) {
+        //     return cleanValue(process.env[key])
+        // }
         if (settings[_key] !== undefined) {
             //@ts-ignore
             return cleanValue(settings[_key]);
@@ -232,7 +235,7 @@ let Model = {
             }
         }
         // check that value and defaultValue match the schema for json type (if !ALLOW_UNSAFE_SETTINGS)
-        if (settingType === "json" && !(await Settings.get("ALLOW_UNSAFE_SETTINGS"))) {
+        if (settingType === "json" && !Settings.env("ALLOW_UNSAFE_SETTINGS")) {
             const ajv = new ajv_1.default();
             const validate = ajv.compile(settingsSetInput.jsonSchema);
             // undefined if value is from input, null if value is from origSettings
@@ -289,6 +292,22 @@ let Model = {
             sails.log.error("CORE > Settings > set DB error: ", settingsSetInput, e);
             throw `Error Set settings in DB`;
         }
+    },
+    env(key) {
+        const envValue = process.env[key];
+        if (envValue === undefined) {
+            return undefined;
+        }
+        // For ALLOW_UNSAFE_SETTINGS, we know it's boolean
+        if (key === "ALLOW_UNSAFE_SETTINGS") {
+            return ["yes", "YES", "Yes", "1", "true", "TRUE", "True"].includes(envValue);
+        }
+        // For other keys, try to parse as JSON, fallback to string
+        try {
+            return JSON.parse(envValue);
+        } catch {
+            return envValue;
+        }
     }
 };
 module.exports = {

models/Settings.ts

@@ -135,7 +135,7 @@ let Model = {
           value = JSON.parse(process.env[key]);
 
           // if value was parsed, check that given json matches the schema (if !ALLOW_UNSAFE_SETTINGS)
-          if (!(await Settings.get("ALLOW_UNSAFE_SETTINGS") ?? false)) {
+          if (!(Settings.env("ALLOW_UNSAFE_SETTINGS") ?? false)) {
             const ajv = new Ajv();
             const validate = ajv.compile(setting.jsonSchema);
             if (!validate(value)) {
@@ -283,7 +283,7 @@ let Model = {
     }
 
     // check that value and defaultValue match the schema for json type (if !ALLOW_UNSAFE_SETTINGS)
-    if (settingType === "json" && !(await Settings.get("ALLOW_UNSAFE_SETTINGS"))) {
+    if (false) { // Disabled jsonSchema validation in Settings.set, similar to Setting mode
       const ajv = new Ajv();
       const validate = ajv.compile(settingsSetInput.jsonSchema);
 
@@ -342,6 +342,23 @@ let Model = {
       sails.log.error("CORE > Settings > set DB error: ", settingsSetInput, e);
       throw `Error Set settings in DB`
     }
+  },
+
+  env<K extends keyof SettingList>(key: K): SettingList[K] | undefined {
+    const envValue = process.env[key as string];
+    if (envValue === undefined) {
+      return undefined;
+    }
+    // For ALLOW_UNSAFE_SETTINGS, we know it's boolean
+    if (key === "ALLOW_UNSAFE_SETTINGS") {
+      return (["yes", "YES", "Yes", "1", "true", "TRUE", "True"].includes(envValue)) as SettingList[K];
+    }
+    // For other keys, try to parse as JSON, fallback to string
+    try {
+      return JSON.parse(envValue) as SettingList[K];
+    } catch {
+      return envValue as SettingList[K];
+    }
   }
 };