From 18dfbfa17a4ec315846ebf846d0da47d20d2986e Mon Sep 17 00:00:00 2001 From: RohitKini <57343193+RohitKini@users.noreply.github.com> Date: Wed, 23 Apr 2025 11:31:02 +0530 Subject: [PATCH 01/16] workflow check --- .github/workflows/repo-sync.yml | 2 +- api/src/services/contentful.service.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 923a2dc7f..06d30bed8 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -100,7 +100,6 @@ jobs: # echo "Installing ESLint dependencies..." npm install --save-dev eslint @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser - if [ ! -f "eslint.config.cjs" ]; then echo "Creating default ESLint config..." cat < eslint.config.cjs @@ -128,6 +127,7 @@ jobs: "@typescript-eslint/no-explicit-any": "off", "no-constant-condition": "off", "no-constant-binary-expression": "off", + "import/no-unresolved": 'error', } } ]; diff --git a/api/src/services/contentful.service.ts b/api/src/services/contentful.service.ts index fb220820b..62cf4e5b2 100644 --- a/api/src/services/contentful.service.ts +++ b/api/src/services/contentful.service.ts @@ -14,6 +14,7 @@ import jsonRTE from "./contentful/jsonRTE.js"; import { getAllLocales, getLogMessage } from "../utils/index.js"; import customLogger from "../utils/custom-logger.utils.js"; + const { DATA, // DIR From 528461a1e9a707ca73aeab838ee9fea063116639 Mon Sep 17 00:00:00 2001 From: RohitKini <57343193+RohitKini@users.noreply.github.com> Date: Wed, 23 Apr 2025 11:42:59 +0530 Subject: [PATCH 02/16] workflow check --- .github/workflows/repo-sync.yml | 1 + api/src/services/contentful.service.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 06d30bed8..d2f5bfe27 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -118,6 +118,7 @@ jobs: }, plugins: { "@typescript-eslint": tsPlugin, + "import": require("eslint-plugin-import"), }, rules: { "no-unused-vars": "warn", diff --git a/api/src/services/contentful.service.ts b/api/src/services/contentful.service.ts index 62cf4e5b2..3e8bc410e 100644 --- a/api/src/services/contentful.service.ts +++ b/api/src/services/contentful.service.ts @@ -15,6 +15,7 @@ import { getAllLocales, getLogMessage } from "../utils/index.js"; import customLogger from "../utils/custom-logger.utils.js"; + const { DATA, // DIR From b871c7f325941e0ec82e113c04391049f4b3f466 Mon Sep 17 00:00:00 2001 From: RohitKini <57343193+RohitKini@users.noreply.github.com> Date: Wed, 23 Apr 2025 11:47:37 +0530 Subject: [PATCH 03/16] workflow check --- .github/workflows/repo-sync.yml | 3 +-- api/src/services/contentful.service.ts | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index d2f5bfe27..5e438e82a 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -118,7 +118,6 @@ jobs: }, plugins: { "@typescript-eslint": tsPlugin, - "import": require("eslint-plugin-import"), }, rules: { "no-unused-vars": "warn", @@ -128,7 +127,7 @@ jobs: "@typescript-eslint/no-explicit-any": "off", "no-constant-condition": "off", "no-constant-binary-expression": "off", - "import/no-unresolved": 'error', + "import/no-unresolved": 'off', } } ]; diff --git a/api/src/services/contentful.service.ts b/api/src/services/contentful.service.ts index 3e8bc410e..2d9f80d06 100644 --- a/api/src/services/contentful.service.ts +++ b/api/src/services/contentful.service.ts @@ -16,6 +16,7 @@ import customLogger from "../utils/custom-logger.utils.js"; + const { DATA, // DIR From 7e9c82b9535da436e0ed30261392d94235feb6de Mon Sep 17 00:00:00 2001 From: RohitKini <57343193+RohitKini@users.noreply.github.com> Date: Wed, 23 Apr 2025 11:53:42 +0530 Subject: [PATCH 04/16] workflow check --- .github/workflows/repo-sync.yml | 4 ++-- api/src/services/contentful.service.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 5e438e82a..b46311422 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -98,7 +98,7 @@ jobs: git gc --prune=now # Garbage collect and prune unreachable objects # echo "Installing ESLint dependencies..." - npm install --save-dev eslint @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser + npm install --save-dev eslint eslint-plugin-import @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser if [ ! -f "eslint.config.cjs" ]; then echo "Creating default ESLint config..." @@ -127,7 +127,7 @@ jobs: "@typescript-eslint/no-explicit-any": "off", "no-constant-condition": "off", "no-constant-binary-expression": "off", - "import/no-unresolved": 'off', + "import/no-unresolved": 'error', } } ]; diff --git a/api/src/services/contentful.service.ts b/api/src/services/contentful.service.ts index 2d9f80d06..a85f18493 100644 --- a/api/src/services/contentful.service.ts +++ b/api/src/services/contentful.service.ts @@ -17,6 +17,7 @@ import customLogger from "../utils/custom-logger.utils.js"; + const { DATA, // DIR From 9aa6815c531fa966af7fcdf7b0fe1c02bcc35f6d Mon Sep 17 00:00:00 2001 From: RohitKini <57343193+RohitKini@users.noreply.github.com> Date: Wed, 23 Apr 2025 12:01:04 +0530 Subject: [PATCH 05/16] workflow check --- .github/workflows/repo-sync.yml | 12 ++++++++---- api/src/services/contentful.service.ts | 2 -- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index b46311422..1a0651583 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -106,6 +106,7 @@ jobs: const js = require("@eslint/js"); const globals = require("globals"); const tsPlugin = require("@typescript-eslint/eslint-plugin"); + const importPlugin = require("eslint-plugin-import"); module.exports = [ js.configs.recommended, @@ -118,6 +119,7 @@ jobs: }, plugins: { "@typescript-eslint": tsPlugin, + import: importPlugin, }, rules: { "no-unused-vars": "warn", @@ -234,14 +236,15 @@ jobs: git gc --prune=now # Garbage collect and prune unreachable objects echo "Installing ESLint dependencies..." - npm install --save-dev eslint @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser + npm install --save-dev eslint eslint-plugin-import @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser + if [ ! -f "eslint.config.cjs" ]; then echo "Creating default ESLint config..." cat < eslint.config.cjs const js = require("@eslint/js"); const globals = require("globals"); - + const importPlugin = require("eslint-plugin-import"); module.exports = [ js.configs.recommended, { @@ -332,14 +335,15 @@ jobs: git gc --prune=now # Garbage collect and prune unreachable objects echo "Installing ESLint dependencies..." - npm install --save-dev eslint @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser + npm install --save-dev eslint eslint-plugin-import @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser + if [ ! -f "eslint.config.cjs" ]; then echo "Creating default ESLint config..." cat < eslint.config.cjs const js = require("@eslint/js"); const globals = require("globals"); - + const importPlugin = require("eslint-plugin-import"); module.exports = [ js.configs.recommended, { diff --git a/api/src/services/contentful.service.ts b/api/src/services/contentful.service.ts index a85f18493..3e8bc410e 100644 --- a/api/src/services/contentful.service.ts +++ b/api/src/services/contentful.service.ts @@ -16,8 +16,6 @@ import customLogger from "../utils/custom-logger.utils.js"; - - const { DATA, // DIR From f6caba224cb82a4754553f5e49af5fe1a99d72df Mon Sep 17 00:00:00 2001 From: RohitKini <57343193+RohitKini@users.noreply.github.com> Date: Wed, 23 Apr 2025 12:03:55 +0530 Subject: [PATCH 06/16] workflow check --- .github/workflows/repo-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 1a0651583..3d187ae76 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -129,7 +129,7 @@ jobs: "@typescript-eslint/no-explicit-any": "off", "no-constant-condition": "off", "no-constant-binary-expression": "off", - "import/no-unresolved": 'error', + "import/no-unresolved": 'off', } } ]; From 61a900f63d7e85a2b838d67d281c6bd2eb26f947 Mon Sep 17 00:00:00 2001 From: RohitKini <57343193+RohitKini@users.noreply.github.com> Date: Wed, 23 Apr 2025 12:05:44 +0530 Subject: [PATCH 07/16] workflow check --- api/src/services/contentful.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/api/src/services/contentful.service.ts b/api/src/services/contentful.service.ts index 3e8bc410e..2d9f80d06 100644 --- a/api/src/services/contentful.service.ts +++ b/api/src/services/contentful.service.ts @@ -16,6 +16,7 @@ import customLogger from "../utils/custom-logger.utils.js"; + const { DATA, // DIR From f761b3877c872355b4123bc3176b078d2970c5f5 Mon Sep 17 00:00:00 2001 From: RohitKini <57343193+RohitKini@users.noreply.github.com> Date: Wed, 23 Apr 2025 12:09:28 +0530 Subject: [PATCH 08/16] workflow check --- .github/workflows/repo-sync.yml | 6 +++--- api/src/services/contentful.service.ts | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 3d187ae76..d58f2a95b 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -150,7 +150,7 @@ jobs: # ts-prune | awk '{print $1}' | xargs rm -f rsync -av --delete ${{ env.RSYNC_SITECORE_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/ - rsync -av --delete ../cli/ ./cli/ + # rsync -av --delete ../cli/ ./cli/ rsync -av --delete ../ui/ ./ui/ rsync -av --delete ${{ env.RSYNC_SITECORE_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/ rsync -av --delete ../upload-api/migration-sitecore/ ./upload-api/migration-sitecore/ @@ -282,7 +282,7 @@ jobs: ts-prune | awk '{print $1}' | xargs rm -f rsync -av --delete ${{ env.RSYNC_CONTENTFUL_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/ - rsync -av --delete ../cli/ ./cli/ + # rsync -av --delete ../cli/ ./cli/ rsync -av --delete ../ui/ ./ui/ rsync -av --delete ${{ env.RSYNC_CONTENTFUL_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/ rsync -av --delete ../upload-api/migration-contentful/ ./upload-api/migration-contentful/ @@ -381,7 +381,7 @@ jobs: ts-prune | awk '{print $1}' | xargs rm -f rsync -av --delete ${{ env.RSYNC_WORDPRESS_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/ - rsync -av --delete ../cli/ ./cli/ + # rsync -av --delete ../cli/ ./cli/ rsync -av --delete ../ui/ ./ui/ rsync -av --delete ${{ env.RSYNC_WORDPRESS_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/ rsync -av --delete ../upload-api/migration-wordpress/ ./upload-api/migration-wordpress/ diff --git a/api/src/services/contentful.service.ts b/api/src/services/contentful.service.ts index 2d9f80d06..a85f18493 100644 --- a/api/src/services/contentful.service.ts +++ b/api/src/services/contentful.service.ts @@ -17,6 +17,7 @@ import customLogger from "../utils/custom-logger.utils.js"; + const { DATA, // DIR From 17ea080b965b0fb0df3dc0f3bcd7ad2bc22c957d Mon Sep 17 00:00:00 2001 From: RohitKini <57343193+RohitKini@users.noreply.github.com> Date: Wed, 23 Apr 2025 12:20:06 +0530 Subject: [PATCH 09/16] workflow for all --- .github/workflows/repo-sync.yml | 25 ++++++++++++++++++------- api/src/services/contentful.service.ts | 1 + api/src/services/wordpress.service.ts | 5 +++++ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index d58f2a95b..fc4057e64 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -150,7 +150,6 @@ jobs: # ts-prune | awk '{print $1}' | xargs rm -f rsync -av --delete ${{ env.RSYNC_SITECORE_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/ - # rsync -av --delete ../cli/ ./cli/ rsync -av --delete ../ui/ ./ui/ rsync -av --delete ${{ env.RSYNC_SITECORE_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/ rsync -av --delete ../upload-api/migration-sitecore/ ./upload-api/migration-sitecore/ @@ -244,6 +243,7 @@ jobs: cat < eslint.config.cjs const js = require("@eslint/js"); const globals = require("globals"); + const tsPlugin = require("@typescript-eslint/eslint-plugin"); const importPlugin = require("eslint-plugin-import"); module.exports = [ js.configs.recommended, @@ -252,15 +252,21 @@ jobs: ecmaVersion: "latest", sourceType: "module", globals: globals.node, + parser: require("@typescript-eslint/parser"), + }, + plugins: { + "@typescript-eslint": tsPlugin, + import: importPlugin, }, rules: { "no-unused-vars": "warn", "no-console": "off", - "@typescript-eslint/no-var-requires": 'off', "@typescript-eslint/no-var-requires": "off", "no-prototype-builtins": "off", "@typescript-eslint/no-explicit-any": "off", - "no-constant-condition": "off" + "no-constant-condition": "off", + "no-constant-binary-expression": "off", + "import/no-unresolved": 'off', } } ]; @@ -282,7 +288,6 @@ jobs: ts-prune | awk '{print $1}' | xargs rm -f rsync -av --delete ${{ env.RSYNC_CONTENTFUL_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/ - # rsync -av --delete ../cli/ ./cli/ rsync -av --delete ../ui/ ./ui/ rsync -av --delete ${{ env.RSYNC_CONTENTFUL_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/ rsync -av --delete ../upload-api/migration-contentful/ ./upload-api/migration-contentful/ @@ -343,6 +348,7 @@ jobs: cat < eslint.config.cjs const js = require("@eslint/js"); const globals = require("globals"); + const tsPlugin = require("@typescript-eslint/eslint-plugin"); const importPlugin = require("eslint-plugin-import"); module.exports = [ js.configs.recommended, @@ -351,15 +357,21 @@ jobs: ecmaVersion: "latest", sourceType: "module", globals: globals.node, + parser: require("@typescript-eslint/parser"), + }, + plugins: { + "@typescript-eslint": tsPlugin, + import: importPlugin, }, rules: { "no-unused-vars": "warn", "no-console": "off", - "@typescript-eslint/no-var-requires": 'off', "@typescript-eslint/no-var-requires": "off", "no-prototype-builtins": "off", "@typescript-eslint/no-explicit-any": "off", - "no-constant-condition": "off" + "no-constant-condition": "off", + "no-constant-binary-expression": "off", + "import/no-unresolved": 'off', } } ]; @@ -381,7 +393,6 @@ jobs: ts-prune | awk '{print $1}' | xargs rm -f rsync -av --delete ${{ env.RSYNC_WORDPRESS_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/ - # rsync -av --delete ../cli/ ./cli/ rsync -av --delete ../ui/ ./ui/ rsync -av --delete ${{ env.RSYNC_WORDPRESS_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/ rsync -av --delete ../upload-api/migration-wordpress/ ./upload-api/migration-wordpress/ diff --git a/api/src/services/contentful.service.ts b/api/src/services/contentful.service.ts index a85f18493..ab47335e4 100644 --- a/api/src/services/contentful.service.ts +++ b/api/src/services/contentful.service.ts @@ -18,6 +18,7 @@ import customLogger from "../utils/custom-logger.utils.js"; + const { DATA, // DIR diff --git a/api/src/services/wordpress.service.ts b/api/src/services/wordpress.service.ts index 72b517c6e..b7b60c901 100644 --- a/api/src/services/wordpress.service.ts +++ b/api/src/services/wordpress.service.ts @@ -10,6 +10,11 @@ import { getLogMessage } from "../utils/index.js"; import { v4 as uuidv4 } from "uuid"; import { orgService } from "./org.service.js"; + + + + + const { JSDOM } = jsdom; const virtualConsole = new jsdom.VirtualConsole(); // Get the current file's path From 05c59b3197eb557f0f951917538acadbf6a4d410 Mon Sep 17 00:00:00 2001 From: RohitKini <57343193+RohitKini@users.noreply.github.com> Date: Wed, 23 Apr 2025 12:37:55 +0530 Subject: [PATCH 10/16] test --- api/src/services/contentful.service.ts | 1 + api/src/services/sitecore.service.ts | 2 ++ api/src/services/wordpress.service.ts | 1 + 3 files changed, 4 insertions(+) diff --git a/api/src/services/contentful.service.ts b/api/src/services/contentful.service.ts index ab47335e4..5b44d605b 100644 --- a/api/src/services/contentful.service.ts +++ b/api/src/services/contentful.service.ts @@ -19,6 +19,7 @@ import customLogger from "../utils/custom-logger.utils.js"; + const { DATA, // DIR diff --git a/api/src/services/sitecore.service.ts b/api/src/services/sitecore.service.ts index 539291442..40f8a0e9e 100644 --- a/api/src/services/sitecore.service.ts +++ b/api/src/services/sitecore.service.ts @@ -13,6 +13,8 @@ import { getLogMessage } from '../utils/index.js'; import customLogger from '../utils/custom-logger.utils.js'; import { getSafePath } from '../utils/sanitize-path.utils.js'; + + const append = 'a'; const baseDirName = MIGRATION_DATA_CONFIG.DATA; const { diff --git a/api/src/services/wordpress.service.ts b/api/src/services/wordpress.service.ts index b7b60c901..3b280199a 100644 --- a/api/src/services/wordpress.service.ts +++ b/api/src/services/wordpress.service.ts @@ -15,6 +15,7 @@ import { orgService } from "./org.service.js"; + const { JSDOM } = jsdom; const virtualConsole = new jsdom.VirtualConsole(); // Get the current file's path From 45d3e83c520f9189dd66d4c344f717c0c9610aa0 Mon Sep 17 00:00:00 2001 From: RohitKini <57343193+RohitKini@users.noreply.github.com> Date: Wed, 23 Apr 2025 12:45:37 +0530 Subject: [PATCH 11/16] test 123 --- api/src/services/contentful.service.ts | 2 -- api/src/services/sitecore.service.ts | 1 + api/src/services/wordpress.service.ts | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/api/src/services/contentful.service.ts b/api/src/services/contentful.service.ts index 5b44d605b..a85f18493 100644 --- a/api/src/services/contentful.service.ts +++ b/api/src/services/contentful.service.ts @@ -18,8 +18,6 @@ import customLogger from "../utils/custom-logger.utils.js"; - - const { DATA, // DIR diff --git a/api/src/services/sitecore.service.ts b/api/src/services/sitecore.service.ts index 40f8a0e9e..b8698d13c 100644 --- a/api/src/services/sitecore.service.ts +++ b/api/src/services/sitecore.service.ts @@ -15,6 +15,7 @@ import { getSafePath } from '../utils/sanitize-path.utils.js'; + const append = 'a'; const baseDirName = MIGRATION_DATA_CONFIG.DATA; const { diff --git a/api/src/services/wordpress.service.ts b/api/src/services/wordpress.service.ts index 3b280199a..329c9cf0c 100644 --- a/api/src/services/wordpress.service.ts +++ b/api/src/services/wordpress.service.ts @@ -14,8 +14,6 @@ import { orgService } from "./org.service.js"; - - const { JSDOM } = jsdom; const virtualConsole = new jsdom.VirtualConsole(); // Get the current file's path From 5f2d302ced4536218a125f38231093d1237c82d5 Mon Sep 17 00:00:00 2001 From: AishDani Date: Wed, 23 Apr 2025 14:05:36 +0530 Subject: [PATCH 12/16] fix:removed mapping for custom and modular block for existing stack case --- ui/src/components/ContentMapper/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx index ff957e343..c83ac3a94 100644 --- a/ui/src/components/ContentMapper/index.tsx +++ b/ui/src/components/ContentMapper/index.tsx @@ -169,7 +169,7 @@ const Fields: MappingFields = { options: { 'Reference':'reference' }, - type: 'reference', + type: '', }, 'dropdown': { label:'Dropdown', @@ -1240,7 +1240,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R //utility function to map the source cms field type to content type field type function checkConditions(fieldTypeToMatch: string | string[], value: ContentTypesSchema, data: FieldMapType) { - const fieldTypes = new Set(['number', 'isodate', 'file', 'reference', 'boolean', 'group', 'link','global_field']); + const fieldTypes = new Set(['number', 'isodate', 'file', 'reference', 'boolean', 'group', 'link','global_field','json','blocks']); switch (fieldTypeToMatch) { case 'text': return ( @@ -1266,7 +1266,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R case 'isodate': return value?.data_type === 'isodate'; case 'json': - return value?.data_type === 'json'; + return value?.data_type === 'json' && value?.field_metadata?.allow_json_rte; // case 'enum': // return 'enum' in value; case 'radio': From 7135818eba6734f6e887c48bb95155ef6b31c7ed Mon Sep 17 00:00:00 2001 From: AishDani Date: Wed, 23 Apr 2025 15:55:07 +0530 Subject: [PATCH 13/16] fix:added await in reset function and removed type for app and extension field --- api/src/services/contentMapper.service.ts | 2 +- ui/src/components/ContentMapper/index.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/services/contentMapper.service.ts b/api/src/services/contentMapper.service.ts index d3bc822bb..283358308 100644 --- a/api/src/services/contentMapper.service.ts +++ b/api/src/services/contentMapper.service.ts @@ -1200,7 +1200,7 @@ const updateContentMapper = async (req: Request) => { )) as number; try { - ProjectModelLowdb.update((data: any) => { + await ProjectModelLowdb.update((data: any) => { data.projects[projectIndex].mapperKeys = content_mapper; data.projects[projectIndex].updated_at = new Date().toISOString(); }); diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx index c83ac3a94..ef6157cc0 100644 --- a/ui/src/components/ContentMapper/index.tsx +++ b/ui/src/components/ContentMapper/index.tsx @@ -205,12 +205,12 @@ const Fields: MappingFields = { 'app':{ label: 'Marketplace app', options: {'Marketplace app':'app'}, - type:'app' + type:'' }, 'extension':{ label: 'Extension', options: {'Extension':'extension'}, - type:'extension' + type:'' } } From 4a3764c7215d11644d2ef661a02a715ba0ab79e2 Mon Sep 17 00:00:00 2001 From: Sayali Joshi Date: Wed, 23 Apr 2025 17:36:17 +0530 Subject: [PATCH 14/16] Added icon for marketplace app and updated icons with v2 in schema modal --- ui/src/components/SchemaModal/index.scss | 3 - ui/src/components/SchemaModal/index.tsx | 71 +++++++++++-------- .../SchemaModal/schemaModal.interface.ts | 1 + 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/ui/src/components/SchemaModal/index.scss b/ui/src/components/SchemaModal/index.scss index 996280089..0cc017a9d 100644 --- a/ui/src/components/SchemaModal/index.scss +++ b/ui/src/components/SchemaModal/index.scss @@ -88,9 +88,6 @@ padding: 0.625rem 0; svg { margin-right: 0.375rem; - &.field-icon { - max-width: 12px; - } } } .chevron { diff --git a/ui/src/components/SchemaModal/index.tsx b/ui/src/components/SchemaModal/index.tsx index 0ddc07573..975abdc30 100644 --- a/ui/src/components/SchemaModal/index.tsx +++ b/ui/src/components/SchemaModal/index.tsx @@ -12,33 +12,38 @@ import './index.scss'; // Function for get icons const getTopLevelIcons = (field: FieldMapType) => { const icons: Icons = { - title: 'StarSmall', - text: 'SingleLineTextSmall', - multitext: 'MultiLineTextSmall', - rte: 'RichTextEditorSmall', - jsonRte: 'SuperchargedRte', - markdown: 'MarkdownSmall', - select: 'SelectSmall', - number: 'NumberSmall', - boolean: 'BooleanSmall', - isodate: 'DateSmall', - file: 'FileSmall', - reference: 'ReferenceSmall', - group: 'GroupSmall', - global_field: 'GlobalSmall', - blocks: 'ModularBlocksSmall', - link: 'LinkSmall', + title: 'Title', + text: 'SingleLineText', + multitext: 'MultiLineText', + rte: 'RichTextEditor', + jsonRte: 'JsonRichTextEditor', + markdown: 'Markdown', + select: 'Select', + number: 'Number', + boolean: 'Boolean', + isodate: 'Date', + file: 'File', + reference: 'Reference', + group: 'Group', + global_field: 'Global', + blocks: 'ModularBlocks', + link: 'Link', bullet: 'Bullet', - custom: 'CustomSmall', - tag: 'TagSmall', - experience_container: 'PersonalizationLogoGreySmall' + custom: 'Custom', + tag: 'Tag', + extension: 'Extension' }; - if (field?.contentstackFieldType === 'Single Line Textbox' || field?.contentstackFieldType === 'single_line_text') { + if ( + field?.contentstackFieldType === 'text' + ) { return icons['title']; } - if (field?.contentstackFieldType === 'URL' || field?.contentstackFieldType === 'url') { + if (field?.contentstackFieldType === 'url') { + return icons['text']; + } + if (field?.contentstackFieldType === 'single_line_text') { return icons['text']; } @@ -50,11 +55,11 @@ const getTopLevelIcons = (field: FieldMapType) => { return icons['select']; } - if (field?.contentstackFieldType === 'Date') { + if (field?.contentstackFieldType === 'isodate') { return icons['isodate']; } - if (field?.contentstackFieldType === 'Multi Line Textbox' || field?.contentstackFieldType === 'multi_line_text') { + if (field?.contentstackFieldType === 'multi_line_text') { return icons['multitext']; } @@ -62,12 +67,12 @@ const getTopLevelIcons = (field: FieldMapType) => { return icons['rte']; } - if ( - field?.contentstackFieldType === 'JSON Rich Text Editor' || - field?.contentstackFieldType === 'json' - ) { + if (field?.contentstackFieldType === 'json') { return icons['jsonRte']; } + if (field?.contentstackFieldType === 'file') { + return icons['file']; + } if (field?.contentstackFieldType === 'Link') { return icons['link']; @@ -85,6 +90,14 @@ const getTopLevelIcons = (field: FieldMapType) => { return icons['blocks']; } + if (field?.contentstackFieldType === 'app') { + return icons['custom']; + } + + if (field?.contentstackFieldType === 'extension') { + return icons['extension']; + } + return icons[field?.contentstackFieldType as keyof Icons]; }; @@ -166,7 +179,7 @@ const TreeView = ({ schema = [] }: schemaType) => { {hasNestedValue(field) && ( )} - + {getChildFieldName(field?.otherCmsField, item?.otherCmsField)} @@ -208,7 +221,7 @@ const TreeView = ({ schema = [] }: schemaType) => { > {hasNested && } - + {item?.otherCmsField} diff --git a/ui/src/components/SchemaModal/schemaModal.interface.ts b/ui/src/components/SchemaModal/schemaModal.interface.ts index 69bebfdd5..0475f3c89 100644 --- a/ui/src/components/SchemaModal/schemaModal.interface.ts +++ b/ui/src/components/SchemaModal/schemaModal.interface.ts @@ -21,6 +21,7 @@ export interface Icons { custom?: string; tag?: string; experience_container?: string; + extension?: string; } export interface SchemaProps { contentType?: string; From 2c808866450db8612bb8514e4e4816190ee4372f Mon Sep 17 00:00:00 2001 From: AishDani Date: Wed, 23 Apr 2025 17:54:18 +0530 Subject: [PATCH 15/16] fix:refactored the key for disabling the Advanced properties for title and url in existing case --- ui/src/components/ContentMapper/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx index ef6157cc0..0ffa4c062 100644 --- a/ui/src/components/ContentMapper/index.tsx +++ b/ui/src/components/ContentMapper/index.tsx @@ -1586,8 +1586,8 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R {(!OptionValue?.isDisabled || OptionValue?.label === 'Dropdown'|| (data?.backupFieldType !== 'extension' && data?.backupFieldType !== 'app' && - data?.otherCmsField !== 'title' && - data?.otherCmsField !== 'url')) && ( + data?.backupFieldUid !== 'title' && + data?.backupFieldUid !== 'url')) && (
Date: Wed, 23 Apr 2025 18:22:29 +0530 Subject: [PATCH 16/16] Tag line height corrected and axios version update --- ui/package-lock.json | 192 ++++++++++-------- ui/package.json | 2 +- .../components/AdvancePropertise/index.scss | 7 + 3 files changed, 110 insertions(+), 91 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index c7a984762..86db83adc 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -17,7 +17,7 @@ "@types/react": "^18.2.28", "@types/react-dom": "^18.2.13", "@types/react-redux": "^7.1.33", - "axios": "^1.8.2", + "axios": "^1.8.3", "bootstrap": "5.1.3", "chokidar": "^3.6.0", "final-form": "^4.20.10", @@ -2102,9 +2102,9 @@ } }, "node_modules/@contentstack/venus-components/node_modules/@types/react": { - "version": "17.0.84", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.84.tgz", - "integrity": "sha512-DtgToBBNtUTNokPYGCShoDfbEtv2a0XnL1OVnShFU2d8wZ3EfI8nRwzVOeYxKUZdHdl++eX8Fmka7pDr6X+0xw==", + "version": "17.0.85", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.85.tgz", + "integrity": "sha512-5oBDUsRDsrYq4DdyHaL99gE1AJCfuDhyxqF6/55fvvOIRkp1PpKuwJ+aMiGJR+GJt7YqMNclPROTHF20vY2cXA==", "optional": true, "peer": true, "dependencies": { @@ -2918,9 +2918,9 @@ "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==" }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz", - "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.6.1.tgz", + "integrity": "sha512-KTsJMmobmbrFLe3LDh0PC2FXpcSYJt/MLjlkh/9LEnmKYLSYmT/0EW9JWANjeoemiuZrmogti0tW5Ch+qNUYDw==", "dependencies": { "eslint-visitor-keys": "^3.4.3" }, @@ -3840,9 +3840,9 @@ } }, "node_modules/@pmmmwh/react-refresh-webpack-plugin": { - "version": "0.5.15", - "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.15.tgz", - "integrity": "sha512-LFWllMA55pzB9D34w/wXUCf8+c+IYKuJDgxiZ3qMhl64KRMBHYM1I3VdGaD2BV5FNPV2/S2596bppxHbv2ZydQ==", + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.16.tgz", + "integrity": "sha512-kLQc9xz6QIqd2oIYyXRUiAp79kGpFBm3fEM9ahfG1HI0WI5gdZ2OVHWdmZYnwODt7ISck+QuQ6sBPrtvUBML7Q==", "dependencies": { "ansi-html": "^0.0.9", "core-js-pure": "^3.23.3", @@ -3919,10 +3919,12 @@ "integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==" }, "node_modules/@reduxjs/toolkit": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.6.1.tgz", - "integrity": "sha512-SSlIqZNYhqm/oMkXbtofwZSt9lrncblzo6YcZ9zoX+zLngRBrCOjK4lNLdkNucJF58RHOWrD9txT3bT3piH7Zw==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.7.0.tgz", + "integrity": "sha512-XVwolG6eTqwV0N8z/oDlN93ITCIGIop6leXlGJI/4EKy+0POYkR+ABHRSdGXY+0MQvJBP8yAzh+EYFxTuvmBiQ==", "dependencies": { + "@standard-schema/spec": "^1.0.0", + "@standard-schema/utils": "^0.3.0", "immer": "^10.0.3", "redux": "^5.0.1", "redux-thunk": "^3.1.0", @@ -4064,6 +4066,16 @@ "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz", "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==" }, + "node_modules/@standard-schema/spec": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz", + "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==" + }, + "node_modules/@standard-schema/utils": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz", + "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==" + }, "node_modules/@storybook/addons": { "version": "6.5.16", "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.5.16.tgz", @@ -4694,9 +4706,9 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.8", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", - "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", + "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", "dependencies": { "@babel/types": "^7.0.0" } @@ -4711,9 +4723,9 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.20.6", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", - "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz", + "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==", "dependencies": { "@babel/types": "^7.20.7" } @@ -4964,11 +4976,11 @@ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==" }, "node_modules/@types/node": { - "version": "22.13.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.13.tgz", - "integrity": "sha512-ClsL5nMwKaBRwPcCvH8E7+nU4GxHVx1axNvMZTFHMEfNI7oahimt26P5zjVCRrjiIWj6YFXfE1v3dEp94wLcGQ==", + "version": "22.14.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz", + "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==", "dependencies": { - "undici-types": "~6.20.0" + "undici-types": "~6.21.0" } }, "node_modules/@types/node-forge": { @@ -5019,9 +5031,9 @@ } }, "node_modules/@types/react-dom": { - "version": "18.3.5", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.5.tgz", - "integrity": "sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==", + "version": "18.3.6", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.6.tgz", + "integrity": "sha512-nf22//wEbKXusP6E9pfOCDwFdHAX4u172eaJI4YkDRQEZiorm6KfYnSC2SWLDMVWUOWPERmJnN0ujeAfTBLvrw==", "peerDependencies": { "@types/react": "^18.0.0" } @@ -5066,9 +5078,9 @@ "peer": true }, "node_modules/@types/semver": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==" + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.0.tgz", + "integrity": "sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA==" }, "node_modules/@types/send": { "version": "0.17.4", @@ -5127,9 +5139,9 @@ "peer": true }, "node_modules/@types/ws": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.0.tgz", - "integrity": "sha512-8svvI3hMyvN0kKCJMvTJP/x6Y/EoQbepff882wL+Sn5QsXb3etnamgrJq4isrBxSJj5L2AuXcI0+bgkoAXGUJw==", + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==", "dependencies": { "@types/node": "*" } @@ -5571,9 +5583,9 @@ } }, "node_modules/ace-builds": { - "version": "1.39.1", - "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.39.1.tgz", - "integrity": "sha512-HcJbBzx8qY66t9gZo/sQu7pi0wO/CFLdYn1LxQO1WQTfIkMfyc7LRnBpsp/oNCSSU/LL83jXHN1fqyOTuIhUjg==" + "version": "1.40.1", + "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.40.1.tgz", + "integrity": "sha512-32uwJNwmhqpnYtr6oq8RoO1D6F6tnxisv5f9w2XPX3vi4QruuHNikadHUiHvnxLAV1n5Azv4LFtpItQ5dD1eRw==" }, "node_modules/acorn": { "version": "8.14.1", @@ -6781,9 +6793,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001707", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", - "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", + "version": "1.0.30001715", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz", + "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==", "funding": [ { "type": "opencollective", @@ -8518,9 +8530,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.123", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.123.tgz", - "integrity": "sha512-refir3NlutEZqlKaBLK0tzlVLe5P2wDKS7UQt/3SpibizgsRAPOsqQC3ffw1nlv3ze5gjRQZYHoPymgVZkplFA==" + "version": "1.5.140", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.140.tgz", + "integrity": "sha512-o82Rj+ONp4Ip7Cl1r7lrqx/pXhbp/lh9DpKcMNscFJdh8ebyRofnc7Sh01B4jx403RI0oqTBvlZ7OBIZLMr2+Q==" }, "node_modules/emittery": { "version": "0.8.1", @@ -8835,9 +8847,9 @@ } }, "node_modules/es-module-lexer": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz", - "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz", + "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==" }, "node_modules/es-object-atoms": { "version": "1.1.1", @@ -9196,9 +9208,9 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.37.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz", - "integrity": "sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==", + "version": "7.37.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz", + "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==", "dependencies": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", @@ -9210,7 +9222,7 @@ "hasown": "^2.0.2", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", - "object.entries": "^1.1.8", + "object.entries": "^1.1.9", "object.fromentries": "^2.0.8", "object.values": "^1.2.1", "prop-types": "^15.8.1", @@ -10710,9 +10722,9 @@ } }, "node_modules/html-entities": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.3.tgz", - "integrity": "sha512-D3AfvN7SjhTgBSA8L1BN4FpPzuEd06uy4lHwSoRWr0lndi9BKaNzPLKGOWZ2ocSGguozr08TTb2jhCLHaemruw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz", + "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==", "funding": [ { "type": "github", @@ -10841,9 +10853,9 @@ } }, "node_modules/http-parser-js": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.9.tgz", - "integrity": "sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw==" + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz", + "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==" }, "node_modules/http-proxy": { "version": "1.18.1", @@ -10872,9 +10884,9 @@ } }, "node_modules/http-proxy-middleware": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.3.tgz", - "integrity": "sha512-usY0HG5nyDUwtqpiZdETNbmKtw3QQ1jwYFZ9wi5iHzX2BcILwQKtYDJPo7XHTsu5Z0B2Hj3W9NNnbd+AjFWjqg==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.5.tgz", + "integrity": "sha512-GLZZm1X38BPY4lkXA01jhwxvDoOkkXqjgVyUzVxiEK4iuRu03PZoYHhHRwxnfhQMDuaxi3vVri0YgSro/1oWqg==", "dependencies": { "@types/http-proxy": "^1.17.15", "debug": "^4.3.6", @@ -10963,9 +10975,9 @@ } }, "node_modules/immutable": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz", - "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.1.tgz", + "integrity": "sha512-3jatXi9ObIsPGr3N5hGw/vWWcTkq6hUYhpQz4k0wLC+owqWi/LiugIw9x0EdNZ2yGedKN/HzePiBvaJRXa0Ujg==" }, "node_modules/import-fresh": { "version": "3.3.1", @@ -13621,9 +13633,9 @@ } }, "node_modules/nwsapi": { - "version": "2.2.19", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.19.tgz", - "integrity": "sha512-94bcyI3RsqiZufXjkr3ltkI86iEl+I7uiHVDtcq9wJUTwYQJ5odHDeSzkkrRzi80jJ8MaeZgqKjH1bAWAFw9bA==" + "version": "2.2.20", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz", + "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==" }, "node_modules/object-assign": { "version": "4.1.1", @@ -14075,9 +14087,9 @@ } }, "node_modules/pirates": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", + "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", "engines": { "node": ">= 6" } @@ -14656,9 +14668,9 @@ } }, "node_modules/postcss-load-config/node_modules/yaml": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", - "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz", + "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==", "bin": { "yaml": "bin.mjs" }, @@ -16121,9 +16133,9 @@ } }, "node_modules/react-onclickoutside": { - "version": "6.13.1", - "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.1.tgz", - "integrity": "sha512-LdrrxK/Yh9zbBQdFbMTXPp3dTSN9B+9YJQucdDu3JNKRrbdU+H+/TVONJoWtOwy4II8Sqf1y/DTI6w/vGPYW0w==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.2.tgz", + "integrity": "sha512-h6Hbf1c8b7tIYY4u90mDdBLY4+AGQVMFtIE89HgC0DtVCh/JfKl477gYqUtGLmjZBKK3MJxomP/lFiLbz4sq9A==", "funding": { "type": "individual", "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md" @@ -16522,9 +16534,9 @@ } }, "node_modules/recharts": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.1.tgz", - "integrity": "sha512-v8PUTUlyiDe56qUj82w/EDVuzEFXwEHp9/xOowGAZwfLjB9uAy3GllQVIYMWF6nU+qibx85WF75zD7AjqoT54Q==", + "version": "2.15.3", + "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.3.tgz", + "integrity": "sha512-EdOPzTwcFSuqtvkDoaM5ws/Km1+WTAO2eizL7rqiG0V2UVhTnz0m7J2i0CjVPUCdEkZImaWvXLbZDS2H5t6GFQ==", "dependencies": { "clsx": "^2.0.0", "eventemitter3": "^4.0.1", @@ -17165,9 +17177,9 @@ "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA==" }, "node_modules/sass": { - "version": "1.86.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.86.0.tgz", - "integrity": "sha512-zV8vGUld/+mP4KbMLJMX7TyGCuUp7hnkOScgCMsWuHtns8CWBoz+vmEhoGMXsaJrbUP8gj+F1dLvVe79sK8UdA==", + "version": "1.87.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.87.0.tgz", + "integrity": "sha512-d0NoFH4v6SjEK7BoX810Jsrhj7IQSYHAHLi/iSpgqKc7LaIDshFRlSg5LOymf9FqQhxEHs2W5ZQXlvy0KD45Uw==", "dependencies": { "chokidar": "^4.0.0", "immutable": "^5.0.2", @@ -17271,9 +17283,9 @@ } }, "node_modules/schema-utils": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz", - "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz", + "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==", "dependencies": { "@types/json-schema": "^7.0.9", "ajv": "^8.9.0", @@ -19278,9 +19290,9 @@ "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==" }, "node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==" + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==" }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.1", @@ -19414,9 +19426,9 @@ } }, "node_modules/use-sync-external-store": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz", - "integrity": "sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz", + "integrity": "sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==", "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } @@ -19605,9 +19617,9 @@ } }, "node_modules/webpack": { - "version": "5.98.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz", - "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==", + "version": "5.99.6", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.6.tgz", + "integrity": "sha512-TJOLrJ6oeccsGWPl7ujCYuc0pIq2cNsuD6GZDma8i5o5Npvcco/z+NKvZSFsP0/x6SShVb0+X2JK/JHUjKY9dQ==", "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.6", diff --git a/ui/package.json b/ui/package.json index 78c2115da..54a60f985 100644 --- a/ui/package.json +++ b/ui/package.json @@ -12,7 +12,7 @@ "@types/react": "^18.2.28", "@types/react-dom": "^18.2.13", "@types/react-redux": "^7.1.33", - "axios": "^1.8.2", + "axios": "^1.8.3", "bootstrap": "5.1.3", "chokidar": "^3.6.0", "final-form": "^4.20.10", diff --git a/ui/src/components/AdvancePropertise/index.scss b/ui/src/components/AdvancePropertise/index.scss index 9c17e1b41..f9127100f 100644 --- a/ui/src/components/AdvancePropertise/index.scss +++ b/ui/src/components/AdvancePropertise/index.scss @@ -182,3 +182,10 @@ font-size: 14px; color: $color-stepper-title; } +.Tag { + .Tag__item { + span { + line-height: $line-height-reset!important; + } + } +}