When creating new tile, update edit session #147

archesproject · Jan 13, 2025 · 8ffb6c1 · 8ffb6c1
1 parent e41c50f
commit 8ffb6c1
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 11 deletions.
diff --git a/arches_lingo/src/arches_lingo/components/generic/LabelEditor.vue b/arches_lingo/src/arches_lingo/components/generic/LabelEditor.vue
@@ -76,13 +76,15 @@ const groupAndPersonOptions = ref<ResourceInstanceReference[]>();
 const textualWorkOptions = ref<ResourceInstanceReference[]>();
 
 function onUpdateString(node: keyof AppellativeStatus, val: string) {
+    console.log(formValue.value[node]);
     (formValue.value[node] as unknown) = toRaw(val);
 }
 
 function onUpdateReferenceDatatype(
     node: keyof AppellativeStatus,
     val: ControlledListItem[],
 ) {
+    console.log(formValue.value[node]);
     (formValue.value[node] as unknown) = val.map((item) => toRaw(item));
 }
 
@@ -91,6 +93,7 @@ function onUpdateResourceInstance(
     val: string[],
     options: ResourceInstanceReference[],
 ) {
+    console.log(formValue.value[node]);
     if (val.length > 0) {
         const selectedOptions = options.filter((option) =>
             val.includes(option.resourceId),
@@ -111,7 +114,12 @@ async function save() {
                 params: { id: updated.resourceinstanceid },
             });
         } else if (!formValue.value.tileid) {
-            await createSchemeLabel(route.params.id as string, formValue.value);
+            const schemeLabel: AppellativeStatus = await createSchemeLabel(
+                route.params.id as string,
+                formValue.value,
+            );
+            valueRef.value = schemeLabel;
+            emit("update", schemeLabel.tileid);
         } else {
             await updateSchemeLabel(
                 route.params.id as string,

diff --git a/arches_lingo/src/arches_lingo/components/scheme/editor/SchemeEditor.vue b/arches_lingo/src/arches_lingo/components/scheme/editor/SchemeEditor.vue
@@ -7,9 +7,16 @@ import SchemeStandard from "@/arches_lingo/components/scheme/report/SchemeStanda
 import SchemeLabel from "@/arches_lingo/components/scheme/report/SchemeLabel.vue";
 import SchemeNote from "@/arches_lingo/components/scheme/report/SchemeNote.vue";
 import type { SectionTypes } from "@/arches_lingo/types.ts";
+import {
+    OPEN_EDITOR,
+    EDIT,
+    UPDATED,
+    MAXIMIZE,
+    SIDE,
+    CLOSE,
+} from "@/arches_lingo/constants.ts";
 
 const { $gettext } = useGettext();
-const EDIT = "edit";
 const props = defineProps<{
     editorMax: boolean;
     editorForm: string;
@@ -59,22 +66,22 @@ watch(
     { immediate: true },
 );
 
-const emit = defineEmits(["maximize", "side", "close", "updated"]);
+const emit = defineEmits([MAXIMIZE, SIDE, CLOSE, UPDATED, OPEN_EDITOR]);
 
 onBeforeUpdate(() => {
     childRefs.value = [];
 });
 
 function toggleSize() {
     if (props.editorMax) {
-        emit("maximize");
+        emit(MAXIMIZE);
     } else {
-        emit("side");
+        emit(SIDE);
     }
 }
 
 function onSectionUpdate() {
-    emit("updated");
+    emit(UPDATED);
 }
 </script>
 
@@ -98,7 +105,7 @@ function onSectionUpdate() {
                 </Button>
                 <Button
                     :aria-label="$gettext('close editor')"
-                    @click="$emit('close')"
+                    @click="$emit(CLOSE)"
                 >
                     <i
                         class="pi pi-times"
@@ -116,7 +123,11 @@ function onSectionUpdate() {
         <component
             :is="currentEditor.component"
             v-bind="{ mode: EDIT, tileId: tileId }"
-            v-on="{ updated: onSectionUpdate }"
+            v-on="{
+                updated: onSectionUpdate,
+                openEditor: (tileId: string | undefined) =>
+                    $emit(OPEN_EDITOR, currentEditor?.id, tileId),
+            }"
         />
     </div>
 </template>

diff --git a/arches_lingo/src/arches_lingo/components/scheme/report/SchemeLabel.vue b/arches_lingo/src/arches_lingo/components/scheme/report/SchemeLabel.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useGettext } from "vue3-gettext";
-import { computed, onMounted, ref } from "vue";
+import { computed, onMounted, ref, watch } from "vue";
 import { useRoute } from "vue-router";
 import { useToast } from "primevue/usetoast";
 
@@ -55,6 +55,10 @@ const appellativeStatusToEdit = computed(() => {
 
 defineExpose({ getSectionValue });
 
+watch(props, () => {
+    getSectionValue();
+});
+
 const emit = defineEmits([OPEN_EDITOR, UPDATED]);
 
 onMounted(() => {
@@ -117,8 +121,11 @@ function editSectionValue(tileId: string) {
     }
 }
 
-function update() {
-    emit(UPDATED);
+async function update(tileId: string | undefined) {
+    await emit(UPDATED);
+    if (tileId) {
+        await emit(OPEN_EDITOR, tileId);
+    }
 }
 </script>
 

diff --git a/arches_lingo/src/arches_lingo/constants.ts b/arches_lingo/src/arches_lingo/constants.ts
@@ -11,6 +11,9 @@ export const VIEW = "view";
 export const OPEN_EDITOR = "openEditor";
 export const UPDATED = "updated";
 export const NEW = "new";
+export const MAXIMIZE = "maximize";
+export const SIDE = "side";
+export const CLOSE = "close";
 
 export const DEFAULT_ERROR_TOAST_LIFE = 8000;
 export const SEARCH_RESULTS_PER_PAGE = 25;

diff --git a/arches_lingo/src/arches_lingo/pages/SchemePage.vue b/arches_lingo/src/arches_lingo/pages/SchemePage.vue
@@ -94,6 +94,7 @@ const getRef = (el: object | null, index: number) => {
                 @side="onSide"
                 @close="onClose"
                 @updated="onUpdated"
+                @open-editor="onOpenEditor"
             />
         </SplitterPanel>
     </Splitter>