diff --git a/Components/IO/BExIS.Io/IoHelper.cs b/Components/IO/BExIS.Io/IoHelper.cs index a1c29115f2..345ce4ed12 100644 --- a/Components/IO/BExIS.Io/IoHelper.cs +++ b/Components/IO/BExIS.Io/IoHelper.cs @@ -68,7 +68,7 @@ public static string GetFileName(FileType type, long datasetId, int versionNr, break; case FileType.PrimaryDataFiles: - downloadName = string.Format("{0}_{1}_v{2}_data_{3}", appName, datasetId, versionOrTagLabel, title); + downloadName = string.Format("{0}_{1}_{2}_data_{3}", appName, datasetId, versionOrTagLabel, title); break; case FileType.Attachments: downloadName = string.Format("{0}_{1}_{2}_attachment_{3}", appName, datasetId, versionOrTagLabel, title); diff --git a/Console/BExIS.Web.Shell.Svelte/package-lock.json b/Console/BExIS.Web.Shell.Svelte/package-lock.json index 96ccec6113..ca61d134dc 100644 --- a/Console/BExIS.Web.Shell.Svelte/package-lock.json +++ b/Console/BExIS.Web.Shell.Svelte/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "hasInstallScript": true, "dependencies": { - "@bexis2/bexis2-core-ui": "0.4.74", + "@bexis2/bexis2-core-ui": "0.4.75", "@sveltejs/adapter-static": "3.0.2", "buffer": "6.0.3", "gray-matter": "4.0.3", diff --git a/Console/BExIS.Web.Shell.Svelte/package.json b/Console/BExIS.Web.Shell.Svelte/package.json index 753c0298dd..012ccc8f7c 100644 --- a/Console/BExIS.Web.Shell.Svelte/package.json +++ b/Console/BExIS.Web.Shell.Svelte/package.json @@ -52,7 +52,7 @@ }, "type": "module", "dependencies": { - "@bexis2/bexis2-core-ui": "0.4.74", + "@bexis2/bexis2-core-ui": "0.4.75", "@sveltejs/adapter-static": "3.0.2", "buffer": "6.0.3", "gray-matter": "4.0.3", diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package-lock.json b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package-lock.json index da1642fe57..abec726fd5 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package-lock.json +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "ISC", "dependencies": { - "@bexis2/bexis2-core-ui": "0.4.74", + "@bexis2/bexis2-core-ui": "0.4.75", "@bexis2/bexis2-rpm-ui": "0.3.0", "@floating-ui/dom": "1.6.8", "@fortawesome/free-solid-svg-icons": "6.6.0", @@ -89,9 +89,9 @@ } }, "node_modules/@bexis2/bexis2-core-ui": { - "version": "0.4.74", - "resolved": "https://registry.npmjs.org/@bexis2/bexis2-core-ui/-/bexis2-core-ui-0.4.74.tgz", - "integrity": "sha512-RGtbDZRDIICzcm7b2b7p8GFrbYlg3CBDDLqNytGO7schfa1Kb6N1MgSmE6Mwqb3hkgTYSVfD9vCwIlp9s1MvWQ==", + "version": "0.4.75", + "resolved": "https://registry.npmjs.org/@bexis2/bexis2-core-ui/-/bexis2-core-ui-0.4.75.tgz", + "integrity": "sha512-HhGKtl4YDNaLCth7wf9npX+yfQ3mANmvgCS7T0ypRD5bktvtPSrkOZfu3+q/M0oe7Muyd0+8xEZIFWvMEVxn2A==", "license": "ISC", "dependencies": { "@codemirror/lang-html": "^6.4.9", @@ -5829,9 +5829,9 @@ } }, "@bexis2/bexis2-core-ui": { - "version": "0.4.74", - "resolved": "https://registry.npmjs.org/@bexis2/bexis2-core-ui/-/bexis2-core-ui-0.4.74.tgz", - "integrity": "sha512-RGtbDZRDIICzcm7b2b7p8GFrbYlg3CBDDLqNytGO7schfa1Kb6N1MgSmE6Mwqb3hkgTYSVfD9vCwIlp9s1MvWQ==", + "version": "0.4.75", + "resolved": "https://registry.npmjs.org/@bexis2/bexis2-core-ui/-/bexis2-core-ui-0.4.75.tgz", + "integrity": "sha512-HhGKtl4YDNaLCth7wf9npX+yfQ3mANmvgCS7T0ypRD5bktvtPSrkOZfu3+q/M0oe7Muyd0+8xEZIFWvMEVxn2A==", "requires": { "@codemirror/lang-html": "^6.4.9", "@codemirror/lang-javascript": "^6.2.2", diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json index 06371007cf..158a43effb 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json @@ -51,7 +51,7 @@ }, "type": "module", "dependencies": { - "@bexis2/bexis2-core-ui": "0.4.74", + "@bexis2/bexis2-core-ui": "0.4.75", "@bexis2/bexis2-rpm-ui": "0.3.0", "@floating-ui/dom": "1.6.8", "@fortawesome/free-solid-svg-icons": "6.6.0", diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/hooks/Metadata.svelte b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/hooks/Metadata.svelte index 77e02473ab..ac9d71b880 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/hooks/Metadata.svelte +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/hooks/Metadata.svelte @@ -74,9 +74,9 @@ - + > --> {#if open} diff --git a/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/package-lock.json b/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/package-lock.json index 4cd3f4f385..d7d3ed18b6 100644 --- a/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/package-lock.json +++ b/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "ISC", "dependencies": { - "@bexis2/bexis2-core-ui": "0.4.74", + "@bexis2/bexis2-core-ui": "0.4.75", "@floating-ui/dom": "1.6.8", "@fortawesome/free-solid-svg-icons": "6.6.0", "@sveltejs/adapter-static": "3.0.2", @@ -77,9 +77,9 @@ } }, "node_modules/@bexis2/bexis2-core-ui": { - "version": "0.4.74", - "resolved": "https://registry.npmjs.org/@bexis2/bexis2-core-ui/-/bexis2-core-ui-0.4.74.tgz", - "integrity": "sha512-RGtbDZRDIICzcm7b2b7p8GFrbYlg3CBDDLqNytGO7schfa1Kb6N1MgSmE6Mwqb3hkgTYSVfD9vCwIlp9s1MvWQ==", + "version": "0.4.75", + "resolved": "https://registry.npmjs.org/@bexis2/bexis2-core-ui/-/bexis2-core-ui-0.4.75.tgz", + "integrity": "sha512-HhGKtl4YDNaLCth7wf9npX+yfQ3mANmvgCS7T0ypRD5bktvtPSrkOZfu3+q/M0oe7Muyd0+8xEZIFWvMEVxn2A==", "license": "ISC", "dependencies": { "@codemirror/lang-html": "^6.4.9", diff --git a/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/package.json b/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/package.json index be36a778bc..e01933a47e 100644 --- a/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/package.json +++ b/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/package.json @@ -50,7 +50,7 @@ }, "type": "module", "dependencies": { - "@bexis2/bexis2-core-ui": "0.4.74", + "@bexis2/bexis2-core-ui": "0.4.75", "@floating-ui/dom": "1.6.8", "@fortawesome/free-solid-svg-icons": "6.6.0", "@sveltejs/adapter-static": "3.0.2", diff --git a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI.Svelte/package-lock.json b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI.Svelte/package-lock.json index acfbad77db..22ed71d98b 100644 --- a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI.Svelte/package-lock.json +++ b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI.Svelte/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "ISC", "dependencies": { - "@bexis2/bexis2-core-ui": "0.4.74", + "@bexis2/bexis2-core-ui": "0.4.75", "@floating-ui/dom": "1.6.8", "@fortawesome/free-solid-svg-icons": "6.6.0", "@sveltejs/adapter-static": "3.0.2", @@ -76,9 +76,9 @@ } }, "node_modules/@bexis2/bexis2-core-ui": { - "version": "0.4.74", - "resolved": "https://registry.npmjs.org/@bexis2/bexis2-core-ui/-/bexis2-core-ui-0.4.74.tgz", - "integrity": "sha512-RGtbDZRDIICzcm7b2b7p8GFrbYlg3CBDDLqNytGO7schfa1Kb6N1MgSmE6Mwqb3hkgTYSVfD9vCwIlp9s1MvWQ==", + "version": "0.4.75", + "resolved": "https://registry.npmjs.org/@bexis2/bexis2-core-ui/-/bexis2-core-ui-0.4.75.tgz", + "integrity": "sha512-HhGKtl4YDNaLCth7wf9npX+yfQ3mANmvgCS7T0ypRD5bktvtPSrkOZfu3+q/M0oe7Muyd0+8xEZIFWvMEVxn2A==", "license": "ISC", "dependencies": { "@codemirror/lang-html": "^6.4.9", diff --git a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI.Svelte/package.json b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI.Svelte/package.json index 053c127629..596481f600 100644 --- a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI.Svelte/package.json +++ b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI.Svelte/package.json @@ -50,7 +50,7 @@ }, "type": "module", "dependencies": { - "@bexis2/bexis2-core-ui": "0.4.74", + "@bexis2/bexis2-core-ui": "0.4.75", "@floating-ui/dom": "1.6.8", "@fortawesome/free-solid-svg-icons": "6.6.0", "@sveltejs/adapter-static": "3.0.2", diff --git a/Console/BExIS.Web.Shell/Areas/PUM/BExIS.Modules.Pum.UI.Svelte/package-lock.json b/Console/BExIS.Web.Shell/Areas/PUM/BExIS.Modules.Pum.UI.Svelte/package-lock.json index 986cbc7dc5..8f7ee1bb57 100644 --- a/Console/BExIS.Web.Shell/Areas/PUM/BExIS.Modules.Pum.UI.Svelte/package-lock.json +++ b/Console/BExIS.Web.Shell/Areas/PUM/BExIS.Modules.Pum.UI.Svelte/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "ISC", "dependencies": { - "@bexis2/bexis2-core-ui": "0.4.74", + "@bexis2/bexis2-core-ui": "0.4.75", "@floating-ui/dom": "1.6.8", "@fortawesome/free-solid-svg-icons": "6.6.0", "@sveltejs/adapter-static": "3.0.2", @@ -78,9 +78,9 @@ } }, "node_modules/@bexis2/bexis2-core-ui": { - "version": "0.4.71", - "resolved": "https://registry.npmjs.org/@bexis2/bexis2-core-ui/-/bexis2-core-ui-0.4.71.tgz", - "integrity": "sha512-rmghEwKf9D0vfHmNozqIATNAh17yShyxp0uuD/RDBKtejt+nqk7c50ZL1ZObyvwva6HT3fQYB5funzCx0+QVlg==", + "version": "0.4.75", + "resolved": "https://registry.npmjs.org/@bexis2/bexis2-core-ui/-/bexis2-core-ui-0.4.75.tgz", + "integrity": "sha512-HhGKtl4YDNaLCth7wf9npX+yfQ3mANmvgCS7T0ypRD5bktvtPSrkOZfu3+q/M0oe7Muyd0+8xEZIFWvMEVxn2A==", "license": "ISC", "dependencies": { "@codemirror/lang-html": "^6.4.9", diff --git a/Console/BExIS.Web.Shell/Areas/PUM/BExIS.Modules.Pum.UI.Svelte/package.json b/Console/BExIS.Web.Shell/Areas/PUM/BExIS.Modules.Pum.UI.Svelte/package.json index a1d5bdf269..8ab2ea13a3 100644 --- a/Console/BExIS.Web.Shell/Areas/PUM/BExIS.Modules.Pum.UI.Svelte/package.json +++ b/Console/BExIS.Web.Shell/Areas/PUM/BExIS.Modules.Pum.UI.Svelte/package.json @@ -52,7 +52,7 @@ }, "type": "module", "dependencies": { - "@bexis2/bexis2-core-ui": "0.4.74", + "@bexis2/bexis2-core-ui": "0.4.75", "@floating-ui/dom": "1.6.8", "@fortawesome/free-solid-svg-icons": "6.6.0", "@sveltejs/adapter-static": "3.0.2", diff --git a/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/SeedData/AttributeCreator.cs b/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/SeedData/AttributeCreator.cs index b12f7b5f2b..c3f576e5bd 100644 --- a/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/SeedData/AttributeCreator.cs +++ b/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/SeedData/AttributeCreator.cs @@ -205,8 +205,7 @@ public void CreateDataTypes(ref DataTable mappedDataTypes) DataType dataType = new DataType(); // get existing dataTypes DataType existDT = dataTypeManager.Repo.Get().Where(d => - d.Name.Equals(dtName) && - d.SystemType.ToString().Equals(mappedDataType["SystemType"].ToString()) + d.Name.Equals(dtName) ).FirstOrDefault(); // return ID of existing dataType or create dataType if (existDT == null && dtSystemType != null) @@ -226,7 +225,10 @@ public void CreateDataTypes(ref DataTable mappedDataTypes) } else { + existDT.Description = dtDescription; + existDT.SystemType = dtSystemType.ToString(); dataType = existDT; + dataTypeManager.Update(dataType); } mappedDataType["DataTypesId"] = dataType.Id; diff --git a/Console/Workspace b/Console/Workspace index c127f4bdf4..47ead9e984 160000 --- a/Console/Workspace +++ b/Console/Workspace @@ -1 +1 @@ -Subproject commit c127f4bdf482e2e5253fa38ce3aa686da5823188 +Subproject commit 47ead9e984d0a3b517266f39fa3816b04b746f41