Fix use of default model in create dialog

#878
mff-uk · Jan 27, 2025 · 04a7869 · 04a7869
1 parent b22e190
commit 04a7869
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/applications/conceptual-model-editor/src/action/open-create-association-dialog.tsx b/applications/conceptual-model-editor/src/action/open-create-association-dialog.tsx
@@ -35,7 +35,7 @@ export function openCreateAssociationDialogAction(
   }
 
   const state = createCreateAssociationDialogState(
-    classes, graph, visualModel, options.language);
+    classes, graph, visualModel, options.language, model.getId());
 
   const onConfirm = (state: EditAssociationDialogState) => {
     // Create association.

diff --git a/applications/conceptual-model-editor/src/action/open-create-attribute-dialog.tsx b/applications/conceptual-model-editor/src/action/open-create-attribute-dialog.tsx
@@ -93,6 +93,6 @@ function openCreateAttributeDialog(
   onConfirm: (state: EditAttributeDialogState) => void,
 ) {
   const state = createNewAttributeDialogState(
-    classes, graph, visualModel, options.language);
+    classes, graph, visualModel, options.language, model.getId());
   dialogs.openDialog(createNewAttributeDialog(state, onConfirm));
 }
diff --git a/applications/conceptual-model-editor/src/action/open-create-class-dialog.tsx b/applications/conceptual-model-editor/src/action/open-create-class-dialog.tsx
@@ -110,6 +110,6 @@ function openCreateClassDialog(
   onConfirm: (state: EditClassDialogState) => void,
 ) {
   const state = createNewClassDialogState(
-    classes, graph, visualModel, options.language);
+    classes, graph, visualModel, options.language, model.getId());
   dialogs.openDialog(createNewClassDialog(state, onConfirm));
 }
diff --git a/...ons/conceptual-model-editor/src/dialog/association/create-new-association-dialog-state.ts b/...ons/conceptual-model-editor/src/dialog/association/create-new-association-dialog-state.ts
@@ -16,6 +16,7 @@ export function createCreateAssociationDialogState(
   graphContext: ModelGraphContextType,
   visualModel: VisualModel | null,
   language: string,
+  defaultModelIdentifier: string | null,
 ): EditAssociationDialogState {
 
   const models = [...graphContext.models.values()];
@@ -24,7 +25,8 @@ export function createCreateAssociationDialogState(
 
   // EntityState
 
-  const entityState = createEntityStateForNew(language, vocabularies, configuration().nameToIri);
+  const entityState = createEntityStateForNew(
+    language, defaultModelIdentifier, vocabularies, configuration().nameToIri);
 
   // SpecializationState
 

diff --git a/...cations/conceptual-model-editor/src/dialog/attribute/create-new-attribute-dialog-state.ts b/...cations/conceptual-model-editor/src/dialog/attribute/create-new-attribute-dialog-state.ts
@@ -16,6 +16,7 @@ export function createNewAttributeDialogState(
   graphContext: ModelGraphContextType,
   visualModel: VisualModel | null,
   language: string,
+  defaultModelIdentifier: string | null,
 ): EditAttributeDialogState {
 
   const models = [...graphContext.models.values()];
@@ -24,7 +25,8 @@ export function createNewAttributeDialogState(
 
   // EntityState
 
-  const entityState = createEntityStateForNew(language, vocabularies, configuration().nameToIri);
+  const entityState = createEntityStateForNew(
+    language, defaultModelIdentifier, vocabularies, configuration().nameToIri);
 
   // SpecializationState
 

diff --git a/applications/conceptual-model-editor/src/dialog/class/create-new-class-dialog.ts b/applications/conceptual-model-editor/src/dialog/class/create-new-class-dialog.ts
@@ -16,6 +16,7 @@ export function createNewClassDialogState(
   graphContext: ModelGraphContextType,
   visualModel: VisualModel | null,
   language: string,
+  defaultModelIdentifier: string | null,
 ): EditClassDialogState {
 
   const models = [...graphContext.models.values()];
@@ -24,7 +25,8 @@ export function createNewClassDialogState(
 
   // EntityState
 
-  const entityState = createEntityStateForNew(language, vocabularies, configuration().nameToIri);
+  const entityState = createEntityStateForNew(
+    language, defaultModelIdentifier, vocabularies, configuration().nameToIri);
 
   // SpecializationState
 

diff --git a/applications/conceptual-model-editor/src/dialog/utilities/entity-utilities.ts b/applications/conceptual-model-editor/src/dialog/utilities/entity-utilities.ts
@@ -56,14 +56,17 @@ export interface EntityState {
  */
 export function createEntityStateForNew(
   language: string,
+  defaultModelIdentifier: string | null,
   vocabularies: CmeModel[],
   generateIriFromName: (name: string) => string,
 ): EntityState {
   const writableVocabularies = filterWritableModels(vocabularies);
   if (writableVocabularies.length === 0) {
     throw new NoWritableModelFound();
   }
-  const selectedVocabulary = writableVocabularies[0];
+  const selectedVocabulary =
+    writableVocabularies.find(item => item.dsIdentifier === defaultModelIdentifier)
+    ?? writableVocabularies[0];
 
   const name = generateName();