@unchainedshop/api 4.0.0-rc.15 → 4.0.0-rc.16

package/src/resolvers/queries/shopInfo.ts

@@ -1,3 +1,4 @@
+import { readFile } from 'fs/promises';
 import { Context } from '../../context.js';
 import { log } from '@unchainedshop/logger';
 
@@ -10,14 +11,23 @@ export default function shopInfo(
   adminUiConfig?: Record<string, any>;
   vapidPublicKey?: string;
 } {
-  const { adminUiConfig } = context;
+  const { adminUiConfig, modules } = context;
   log('query shopInfo', { userId: context.userId });
 
   return {
     version: context.version,
     adminUiConfig: {
-      customProperties: adminUiConfig?.customProperties ?? [],
-      singleSignOnURL: adminUiConfig?.singleSignOnURL,
+      customProperties: async () => {
+        try {
+          const raw = await readFile(process.env.UNCHAINED_ADMIN_UI_CUSTOM_PROPERTIES, 'utf-8');
+          const parsed = JSON.parse(raw);
+          return parsed;
+        } catch {
+          return adminUiConfig?.customProperties ?? [];
+        }
+      },
+      singleSignOnURL:
+        process.env.UNCHAINED_ADMIN_UI_SINGLE_SIGN_ON_URL || adminUiConfig?.singleSignOnURL,
       externalLinks: () => {
         try {
           const parsed = JSON.parse(process.env.EXTERNAL_LINKS);
@@ -26,6 +36,42 @@ export default function shopInfo(
           return [];
         }
       },
+      productTags: async () => {
+        const existingProductTags = await modules.products.existingTags();
+        const envTags = (process.env.UNCHAINED_ADMIN_UI_DEFAULT_PRODUCT_TAGS || '')
+          .split(',')
+          .map((t) => t.trim())
+          .filter(Boolean);
+        const normalizedDefaultTags = envTags?.length
+          ? envTags
+          : (adminUiConfig?.defaultProductTags || []).filter(Boolean);
+        const normalizedTags = Array.from(new Set(normalizedDefaultTags.concat(existingProductTags)));
+        return normalizedTags;
+      },
+      assortmentTags: async () => {
+        const existingAssortmentTags = await modules.assortments.existingTags();
+        const envTags = (process.env.UNCHAINED_ADMIN_UI_DEFAULT_ASSORTMENT_TAGS || '')
+          .split(',')
+          .map((t) => t.trim())
+          .filter(Boolean);
+        const normalizedDefaultTags = envTags?.length
+          ? envTags
+          : (adminUiConfig?.defaultAssortmentTags || []).filter(Boolean);
+        const normalizedTags = Array.from(new Set(normalizedDefaultTags.concat(existingAssortmentTags)));
+        return normalizedTags;
+      },
+      userTags: async () => {
+        const existingUserTags = await modules.users.existingTags();
+        const envTags = (process.env.UNCHAINED_ADMIN_UI_DEFAULT_USER_TAGS || '')
+          .split(',')
+          .map((t) => t.trim())
+          .filter(Boolean);
+        const normalizedDefaultTags = envTags?.length
+          ? envTags
+          : (adminUiConfig?.defaultUserTags || []).filter(Boolean);
+        const normalizedTags = Array.from(new Set(normalizedDefaultTags.concat(existingUserTags)));
+        return normalizedTags;
+      },
     },
     vapidPublicKey: process.env?.PUSH_NOTIFICATION_PUBLIC_KEY,
   };

package/src/resolvers/type/media-types.ts

@@ -2,6 +2,9 @@ import { File as FileType, getFileAdapter } from '@unchainedshop/core-files';
 import { Context } from '../../context.js';
 import { checkAction } from '../../acl.js';
 import { actions } from '../../roles/index.js';
+import { createLogger } from '@unchainedshop/logger';
+
+const logger = createLogger('unchained:api');
 export interface MediaHelperTypes {
   url: (language: FileType, params: Record<string, any>, context: Context) => Promise<string>;
 }
@@ -16,7 +19,7 @@ export const Media: MediaHelperTypes = {
       const url = await fileUploadAdapter.createDownloadURL(file, params?.expires);
       return modules.files.normalizeUrl(url, params);
     } catch (e) {
-      console.error(e);
+      logger.error(e);
       return null;
     }
   },

package/src/resolvers/type/price-types.ts

@@ -1,5 +1,3 @@
-import accounting from 'accounting';
-
 export interface PriceType {
   isTaxable?: boolean;
   isNetPrice?: boolean;
@@ -21,7 +19,11 @@ export const Price = {
   },
   amount(obj: PriceType) {
     if (obj.amount) {
-      return accounting.toFixed(obj.amount, 0);
+      return Number(obj.amount).toLocaleString(undefined, {
+        minimumFractionDigits: 0,
+        maximumFractionDigits: 0,
+        useGrouping: false,
+      });
     }
     return 0;
   },

package/src/resolvers/type/shop-types.ts

@@ -5,7 +5,6 @@ import { checkAction } from '../../acl.js';
 import { allRoles, actions } from '../../roles/index.js';
 
 type HelperType<T> = (root: never, params: never, context: Context) => Promise<T>;
-
 export interface ShopHelperTypes {
   _id: () => string;
   country: HelperType<Country>;

package/src/schema/query.ts

@@ -22,6 +22,7 @@ export default [
         sort: [SortOptionInput!]
         emailVerified: Boolean
         lastLogin: DateFilterInput
+        tags: [LowerCaseString!]
       ): [User!]!
 
       """
@@ -32,6 +33,7 @@ export default [
         queryString: String
         emailVerified: Boolean
         lastLogin: DateFilterInput
+        tags: [LowerCaseString!]
       ): Int!
 
       """

package/src/schema/types/shop.ts

@@ -25,6 +25,9 @@ export default [
       customProperties: [AdminUiConfigCustomEntityInterface!]!
       externalLinks: [AdminUiLink!]!
       singleSignOnURL: String
+      productTags: [String!]!
+      assortmentTags: [String!]!
+      userTags: [String!]!
     }
 
     type Shop @cacheControl(maxAge: 180) {