@7365admin1/layer-common 4.90.2-staging.497 → 4.90.2-staging.498

package/components/SiteProviderChange.vue

@@ -10,7 +10,7 @@
   <v-dialog v-model="changeOpen" max-width="620" persistent>
     <v-card class="screen-modal" data-test="spc-dialog">
       <v-card-title class="d-flex align-center">
-        {{ kind === "owner" ? "Change site owner" : `Change or end ${fromName}` }}
+        {{ kind === "owner" ? "Change site owner" : `Change or end ${shownFrom}` }}
         <v-spacer />
         <v-btn variant="text" icon="mdi-close" class="screen-modal__close" aria-label="Close" :disabled="saving" @click="changeOpen = false" />
       </v-card-title>
@@ -23,7 +23,7 @@
           </template>
           <template v-else>
             Only {{ preview?.service || "this service" }} at {{ siteName || "this site" }} changes. Other services at the site,
-            and {{ fromName }}'s other sites, are not touched.
+            and {{ shownFrom }}'s other sites, are not touched.
           </template>
         </p>
 
@@ -125,9 +125,20 @@
             <v-btn v-if="c.canCancel" size="small" variant="outlined" :loading="busy === c._id" data-test="spc-cancel" @click="cancelChange(c)">
               Cancel this plan
             </v-btn>
-            <v-btn v-if="c.canUndo" size="small" variant="outlined" :loading="busy === c._id" data-test="spc-undo" @click="undoChange(c)">
-              Undo (until {{ day(c.undoUntil) }})
-            </v-btn>
+            <template v-if="c.canUndo">
+              <span v-if="confirmUndo === c._id" class="spc-sub align-self-center">Everything this change did is put back.</span>
+              <v-btn v-if="confirmUndo === c._id" size="small" variant="text" @click="confirmUndo = ''">Keep it</v-btn>
+              <v-btn
+                size="small"
+                :variant="confirmUndo === c._id ? 'flat' : 'outlined'"
+                :color="confirmUndo === c._id ? 'error' : undefined"
+                :loading="busy === c._id"
+                data-test="spc-undo"
+                @click="confirmUndo === c._id ? undoChange(c) : (confirmUndo = c._id)"
+              >
+                {{ confirmUndo === c._id ? "Yes, undo" : `Undo (until ${day(c.undoUntil)})` }}
+              </v-btn>
+            </template>
           </div>
         </div>
       </v-card-text>
@@ -165,6 +176,10 @@ const historyOpen = ref(false);
 const historyLoading = ref(false);
 const historyError = ref("");
 const busy = ref("");
+/** The change whose Undo was pressed once; the second press does it. */
+const confirmUndo = ref("");
+/** The company being changed, as the server names it once the preview is in. */
+const shownFrom = computed(() => preview.value?.fromName || fromName.value);
 
 const snack = ref(false);
 const snackText = ref("");
@@ -285,7 +300,7 @@ function openHistory() {
 }
 
 async function undoChange(c: Record<string, any>) {
-  if (!window.confirm(`Undo "${title(c)}"? Everything this change did at ${props.siteName || "the site"} is put back.`)) return;
+  confirmUndo.value = "";
   busy.value = c._id;
   try {
     const res = await undoProviderChange(c._id);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.90.2-staging.497",
+  "version": "4.90.2-staging.498",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",