diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/app.html b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/app.html index 12b732464..a97899b02 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/app.html +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/app.html @@ -9,7 +9,7 @@
-
+
%sveltekit.body%
diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/components/utils/metadata/metadataComponentUtils.ts b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/components/utils/metadata/metadataComponentUtils.ts index 3614227c9..7451b9956 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/components/utils/metadata/metadataComponentUtils.ts +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/components/utils/metadata/metadataComponentUtils.ts @@ -312,7 +312,7 @@ export function hasValue(node) { } if (typeof node === 'string') { - console.log("πŸš€ ~ hasValue ~ node:", node, node.trim().length) + //console.log("πŸš€ ~ hasValue ~ node:", node, node.trim().length) return node.trim().length > 0; } diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/components/utils/metadata/simpleComponentSuite.ts b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/components/utils/metadata/simpleComponentSuite.ts index aaaeb91c8..0709c775c 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/components/utils/metadata/simpleComponentSuite.ts +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/components/utils/metadata/simpleComponentSuite.ts @@ -25,7 +25,7 @@ const suite = create((fieldName: string='') => { if((fieldName && fieldName == item.path) || fieldName === ''){ const data = getValueByPath(item.path); - console.log("πŸš€ ~ data:", data) + //console.log("πŸš€ ~ data:", data) //Validate required field if(item.required){ diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/m/edit/MetadataComponentHeader.svelte b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/m/edit/MetadataComponentHeader.svelte index 5268e89ae..a2e91efa9 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/m/edit/MetadataComponentHeader.svelte +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/m/edit/MetadataComponentHeader.svelte @@ -28,7 +28,7 @@ export let active: boolean = false; onMount(() => { - console.log('complexComponentWrapper onMount', path, $activeStore); + //console.log('complexComponentWrapper onMount', path, $activeStore); if(!$activeStore.includes(path)) { initActivity(); } diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/m/edit/PartySelector.svelte b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/m/edit/PartySelector.svelte index c241d8822..1dac9bbdf 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/m/edit/PartySelector.svelte +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/m/edit/PartySelector.svelte @@ -49,13 +49,14 @@ const dispatch = createEventDispatcher(); partyMappingObject = mappingComponentConfig?.partyMappingObject; pathWithoutIndices = removeJsonPathIndices(path); list = mappingComponentConfig?.partyMappingObject?.list ?? []; + console.log("πŸš€ ~ list:",partyMappingObject, list) if(value) { if(mappingComponentConfig.partyMappingObject.complexity){ // get party id from parent - console.log("πŸš€ ~ onMount ~ path:", path) + //console.log("πŸš€ ~ onMount ~ path:", path) const parentPath = getParentPath(path); partyId = getPartyIdByPath(parentPath); //alert(partyId); @@ -86,7 +87,7 @@ const dispatch = createEventDispatcher(); // we need to update the value with the new selected party and also trigger the validation for this field because maybe there are some validation rules on the party id async function onUpdateParty(e: any){ - // console.log("xyz Update Party",value, e.detail); + console.log("onUpdateParty",value, e.detail); const partyid = e.detail.partyId; const newValue = e.detail.value; @@ -109,6 +110,7 @@ const dispatch = createEventDispatcher(); updateMetadataStore(path, newValue, isMulti, undefined, undefined); const parentPath = getParentPath(path); + console.log("πŸš€ ~ onUpdateParty ~ parentPath:", parentPath) const parentPathWithoutIndices = removeJsonPathIndices(parentPath); // if mapping is complex diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/m/services/apiCalls.ts b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/m/services/apiCalls.ts index 5296c59c0..5af7449ea 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/m/services/apiCalls.ts +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/m/services/apiCalls.ts @@ -102,6 +102,7 @@ export const GetMetadataAsXml = async (id: number, version) => { const header = { 'Accept': 'application/xml' } const config = { responseType: 'blob' } + alert(id + " " + version) const response = await Api.get('/api/metadata/' + id + '/version_number/' + version + '?format=1', '', header, config); // console.log(" response.data.MetadataStructureId:", response); diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/ComponentConfigController.cs b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/ComponentConfigController.cs index 628366059..9db541e92 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/ComponentConfigController.cs +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/ComponentConfigController.cs @@ -1,6 +1,7 @@ ο»Ώusing BExIS.App.Bootstrap.Attributes; using BExIS.UI.Helpers; using Newtonsoft.Json; +using System.Collections.Generic; using System.IO; using System.Web.Mvc; using Vaiona.Utils.Cfg; @@ -70,12 +71,14 @@ public class Data { public string Id { get; set; } public string Content { get; set; } + public List Components { get; set; } public string Type { get; set; } public Data() { Id = ""; Content = ""; + Components = new List(); Type = ""; } } diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/MController.cs b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/MController.cs index f842e7a21..18e0a1695 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/MController.cs +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/MController.cs @@ -165,6 +165,7 @@ private List getList(long id, LinkElementType type) if (MappingUtils.PartyAttrIsMain(id, type)) { x = MappingUtils.GetAllMatchesInSystem(id, type, ""); + //x = x.Distinct(e => e.Id); } return x;