Skip to content

#2385 seperate validation and button functions into metadata function #2392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidBlaa merged 1 commit into from
Mar 2, 2026
+134 −309
Merged

#2385 seperate validation and button functions into metadata function #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 3 additions & 101 deletions ...xIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/metadata/edit/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,47 +3,26 @@


<script lang="ts">
import { onMount } from 'svelte';
import ComplexComponent from './complexComponentWrapper.svelte';

import * as apiCalls from '../services/apiCalls';
import { helpStore, notificationType, Page, pageContentLayoutType, Spinner } from '@bexis2/bexis2-core-ui';
import Functions from './MetadataFunctions.svelte';
import suite from './simpleComponent';

// import { Page } from '@bexis2/bexis2-core-ui';
import { schemaToJson, setConfigStore, setMetadataStore } from '$lib/components/utils/metadata/metadataComponentUtils';
import { type notificationItemType, notificationStore } from '@bexis2/bexis2-core-ui';
import { validationStore } from '$lib/components/utils/metadata/stores';
import type { validationStoretype } from '$lib/components/utils/metadata/models';
import { get } from 'svelte/store';


// This regex accepts HH:mm:ss without requiring Z


// import configJson from './customComponents/config.json';
//export let schemaId: number = 3;
export let datasetId: number = 2;
export let saveWithError: boolean = true;
let disbaleSaveBtn: boolean = false;
$:disbaleSaveBtn;

let errors:any[] = [];
export let saveWithError: boolean = false;

let s: any;
let m: any = null;
let schema: any = s;
$: schema = s;

let validationStoreValues: validationStoretype;

$:{
validationStoreValues;
disbaleSaveBtn = disableSaveFn();
console.log("🚀 ~ file: +page.svelte:92 ~ $: ~ disbaleSaveBtn:", disbaleSaveBtn)
}


async function load() {
// read id from url
Expand All @@ -61,100 +40,23 @@ $:{
const configJson = await apiCalls.GetComponentConfig(datasetInfos.entityTemplateId, "edit");
setConfigStore(configJson);


// listen to validation store changes
validationStoreValues = get(validationStore);

validationStore.subscribe((s) => {
validationStoreValues = s;
});

}
}

let valid: boolean = true;
$:valid;


function validateFn() {

if (!validationStoreValues.allSimpleRequiredValid)
{
// console.log(validationStoreValues.simpleTypeValidationItems.filter(item => item.isValid === false));
// // errors = validate.errors;

notificationStore.showNotification({
notificationType: notificationType.error,
message: 'error validating metadata. Please check the console for details.',
});

}
else {
errors = [];
notificationStore.showNotification({
notificationType: notificationType.success,
message: 'Metadata is valid.',
});
}
}


function disableSaveFn():boolean {

console.log("🚀 ~ disbaleSaveFn ~ validationResult:")

if (saveWithError) return false; // when save with error is allowd, the save button is always enabled
if (!validationStoreValues) return true; // if there is no validation result, we consider the form as not valid, so the save button is disabled
console.log("🚀 ~ disableSaveFn ~ validationStoreValues:", validationStoreValues)

return !validationStoreValues.allSimpleRequiredValid; // disable save button when the metadata is not valid

}

</script>



<Page contentLayoutType={pageContentLayoutType.full} footer={false} >
<Page contentLayoutType={pageContentLayoutType.full} footer={true} >
{#await load()}
<Spinner />
{:then}

<div class="container">
<div class="nav-left scrollable">

<div id="metadata-options" >
<button class="btn variant-filled-secondary m-2" on:click={validateFn}>
validate
</button>

<button
class="btn variant-filled-secondary m-2"
disabled={disbaleSaveBtn}

on:click={async () => {
try {
console.log('Saving metadata:', datasetId, m);
const savedMetadata = await apiCalls.SaveMetadata(datasetId, m);
console.log('Metadata saved successfully:', savedMetadata);
notificationStore.showNotification({
notificationType: notificationType.success,
message: 'Metadata saved successfully.',
});
} catch (error) {
console.error('Error saving metadata:', error);
notificationStore.showNotification({
notificationType: notificationType.error,
message: 'Error saving metadata. Please check the console for details.',
});
}
}}>
Save Metadata
</button>
</div>

{#if m}
<Functions bind:data={m}/>
<Functions bind:metadata={m} saveWithError={saveWithError} bind:datasetId={datasetId} />
{/if}
</div>

Expand Down
153 changes: 0 additions & 153 deletions ....Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/metadata/edit/MetadataEdit.svelte
View file
Open in desktop

This file was deleted.

Loading
Loading