@cwa/nuxt-edge 1.0.0-29140666.31bb7d4 → 1.0.0-29141013.85e8d7a

package/dist/runtime/api/fetcher/fetcher.js

@@ -131,7 +131,7 @@ export default class Fetcher {
     if (!type) {
       return;
     }
-    const nestedIris = [];
+    let nestedIris = [];
     const nestedPropertiesToFetch = resourceTypeToNestedResourceProperties[type];
     for (const prop of nestedPropertiesToFetch) {
       let propIris = resource[prop];
@@ -148,7 +148,7 @@ export default class Fetcher {
       }
     }
     if (onlyIfNoExist) {
-      nestedIris.filter((iri2) => !this.resourcesStore.current.currentIds.includes(iri2));
+      nestedIris = nestedIris.filter((iri2) => !this.resourcesStore.current.currentIds.includes(iri2));
       if (!nestedIris.length) {
         return;
       }

package/dist/runtime/composables/cwa-resource-model.js

@@ -82,6 +82,7 @@ export const useCwaResourceModel = (iri, property, ops) => {
       },
       source
     });
+    isSubmitting.value = false;
     const newIriReturned = newResource?.["@id"] && newResource["@id"] !== submittingIri;
     if (newIriReturned) {
       localValueWithIri.value[newResource["@id"]] = localValueWithIri.value[submittingIri];

package/dist/runtime/storage/stores/resources/actions.js

@@ -52,9 +52,22 @@ export default function(resourcesState, resourcesGetters) {
         if (!resource.data || event.noCascade) {
           break;
         }
-        const hasAlternativeVersion = resourcesGetters.findAllPublishableIris.value(event.resource).length > 1;
-        if (!hasAlternativeVersion) {
-          const mappedPositions = [...resource.data.componentPositions || [], ...resourcesState.current.positionsByComponent[event.resource] || []];
+        const alternativeVersions = resourcesGetters.findAllPublishableIris.value(event.resource);
+        const hasAlternativeVersion = alternativeVersions.length > 1;
+        const mappedPositions = [...resource.data.componentPositions || [], ...resourcesState.current.positionsByComponent[event.resource] || []];
+        if (hasAlternativeVersion) {
+          const otherVersions = alternativeVersions.filter((altIri) => altIri !== event.resource);
+          if (otherVersions.length) {
+            const newPositionIri = otherVersions[0];
+            for (const positionIri of mappedPositions) {
+              const positionResource = resourcesState.current.byId[positionIri];
+              if (!positionResource?.data) {
+                continue;
+              }
+              positionResource.data.component = newPositionIri;
+            }
+          }
+        } else {
           for (const positionIri of mappedPositions) {
             const positionResource = resourcesState.current.byId[positionIri];
             if (!positionResource?.data) {

package/dist/runtime/templates/components/main/admin/resource-manager/ComponentFocus.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { computed, onBeforeUnmount, onMounted, ref, toRef, useTemplateRef, watch } from "vue";
 import { useElementSize, useWindowSize } from "@vueuse/core";
+import { v4 as uuidv4 } from "uuid";
 import { useCwa } from "#imports";
 import { getPublishedResourceState } from "#cwa/runtime/resources/resource-utils";
 const props = defineProps({
@@ -13,6 +14,7 @@ const iri = toRef(props, "iri");
 const canvas = useTemplateRef("canvas");
 const windowSize = useWindowSize();
 const elementSizeInstances = ref([]);
+const reorderId = ref();
 watch(props.domElements, (newDomElements) => {
   for (const esInstance of elementSizeInstances.value) {
     esInstance.stop();
@@ -39,7 +41,6 @@ const resource = computed(() => {
   }
   return $cwa.resources.getResource(iri.value).value;
 });
-const resourceData = computed(() => resource.value?.data);
 const position = computed(() => {
   const clearCoords = {
     top: 999999999999,
@@ -50,7 +51,8 @@ const position = computed(() => {
       width: windowSize.width.value,
       height: windowSize.height.value
     },
-    totalWidthAndHeight: totalWidthAndHeight.value
+    totalWidthAndHeight: totalWidthAndHeight.value,
+    reorderId: reorderId.value
   };
   for (const domElement of domElements.value) {
     if (domElement.nodeType !== 1) {
@@ -124,14 +126,18 @@ function drawRoundedRect(ctx, x, y, width, height, radius) {
   ctx.arcTo(x + width, y, x + width - radius, y, radius);
   ctx.arcTo(x, y, x, y + radius, radius);
 }
+function assignReorderId() {
+  reorderId.value = uuidv4();
+}
 onMounted(() => {
   $cwa.admin.eventBus.on("redrawFocus", redraw);
-  watch(resourceData, $cwa.admin.emitRedraw, { deep: true, flush: "post" });
+  $cwa.admin.eventBus.on("reorder", assignReorderId);
+  watch([totalWidthAndHeight, position], $cwa.admin.emitRedraw);
   watch(canvas, (newCanvas) => newCanvas && redraw());
-  watch(totalWidthAndHeight, $cwa.admin.emitRedraw);
 });
 onBeforeUnmount(() => {
   $cwa.admin.eventBus.off("redrawFocus", redraw);
+  $cwa.admin.eventBus.off("reorder", assignReorderId);
 });
 defineExpose({
   redraw

package/dist/runtime/templates/components/main/admin/resource-manager/cta/CurrentResourceCta.vue

@@ -55,9 +55,6 @@ const buttonOptions = computed(() => {
       ]);
     }
   }
-  if (resourceType.value === CwaResourceTypes.COMPONENT) {
-    ops.push({ label: "Clone", value: "clone" });
-  }
   return ops;
 });
 async function publishResource() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cwa/nuxt-edge",
-  "version": "1.0.0-29140666.31bb7d4",
+  "version": "1.0.0-29141013.85e8d7a",
   "license": "MIT",
   "type": "module",
   "description": "Components Web Apps Nuxt Module. UI for creating component-driven web apps with the API Components Bundle",