From 4010e9da52aaa0f535d68f19672586151cdd52f5 Mon Sep 17 00:00:00 2001
From: John Obelenus <jobelenus@systeminit.com>
Date: Mon, 5 Aug 2024 17:52:28 -0400
Subject: [PATCH] Removing "within-a-changeset" conflict detection & retry we
 no longer need

---
 .../ModelingDiagram/ModelingDiagram.vue       |   1 -
 .../src/components/StatusBar/StatusBar.vue    |   4 -
 .../StatusBar/StatusBarConflictSummary.vue    | 180 ------------------
 app/web/src/components/toasts/Conflict.vue    |  58 ------
 app/web/src/store/status.store.ts             |  12 --
 lib/vue-lib/src/pinia/pinia_api_tools.ts      |  28 ---
 6 files changed, 283 deletions(-)
 delete mode 100644 app/web/src/components/StatusBar/StatusBarConflictSummary.vue
 delete mode 100644 app/web/src/components/toasts/Conflict.vue

diff --git a/app/web/src/components/ModelingDiagram/ModelingDiagram.vue b/app/web/src/components/ModelingDiagram/ModelingDiagram.vue
index f01eca6c8a..6a7d6648a2 100644
--- a/app/web/src/components/ModelingDiagram/ModelingDiagram.vue
+++ b/app/web/src/components/ModelingDiagram/ModelingDiagram.vue
@@ -199,7 +199,6 @@ overflow hidden */
       </v-stage>
 
       <DiagramHelpModal ref="helpModalRef" />
-      RECTS: {{ selectionRects }}
     </div>
   </div>
 </template>
diff --git a/app/web/src/components/StatusBar/StatusBar.vue b/app/web/src/components/StatusBar/StatusBar.vue
index 0241887abf..e416d00010 100644
--- a/app/web/src/components/StatusBar/StatusBar.vue
+++ b/app/web/src/components/StatusBar/StatusBar.vue
@@ -10,9 +10,6 @@
     <div class="flex text-sm items-center pl-xs mr-lg w-full">
       System&nbsp;Initiative
     </div>
-    <div class="border-l border-shade-100">
-      <StatusBarConflictSummary />
-    </div>
     <div class="border-l border-shade-100">
       <StatusBarDiffSummary v-if="!changeSetStore.headSelected" />
     </div>
@@ -31,7 +28,6 @@ import * as _ from "lodash-es";
 import clsx from "clsx";
 import { useChangeSetsStore } from "@/store/change_sets.store";
 
-import StatusBarConflictSummary from "./StatusBarConflictSummary.vue";
 import StatusBarDiffSummary from "./StatusBarDiffSummary.vue";
 import StatusBarResourceSummary from "./StatusBarResourceSummary.vue";
 import StatusBarQualificationSummary from "./StatusBarQualificationSummary.vue";
diff --git a/app/web/src/components/StatusBar/StatusBarConflictSummary.vue b/app/web/src/components/StatusBar/StatusBarConflictSummary.vue
deleted file mode 100644
index 8e814baa47..0000000000
--- a/app/web/src/components/StatusBar/StatusBarConflictSummary.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <StatusBarTab
-    :class="clsx(numConflicts > 0 ? 'animate-bounce cursor-pointer' : '')"
-    :selected="props.selected"
-    :click="() => numConflicts > 0 && openModal()"
-  >
-    <template #icon>
-      <Icon class="text-destructive-600" name="read-only" />
-    </template>
-    <template #name>Conflicts</template>
-    <template #summary>
-      <StatusBarTabPill
-        class="bg-destructive-100 text-destructive-600 font-bold"
-      >
-        <div @click="() => numConflicts > 0 && openModal()">
-          {{ numConflicts }}
-        </div>
-      </StatusBarTabPill>
-      <Modal ref="modalRef" title="Conflicts" noExit>
-        <div>
-          <div class="flex flex-row gap-sm items-center">
-            <Icon
-              name="alert-circle"
-              class="text-warning-600 content-center ml-md"
-              size="lg"
-            />
-            <p v-if="numConflicts > 0" class="grow py-md">
-              Your changes have produced
-              <strong class="underline">{{ numConflicts }} conflict(s)</strong>.
-              These changes have not been applied. If necessary, retry them
-              below:
-            </p>
-            <p v-else>No more conflicts!</p>
-          </div>
-          <ol
-            v-if="numConflicts > 0"
-            class="max-h-[50vh] overflow-hidden overflow-y-auto"
-          >
-            <li
-              v-for="conflict in conflictDisplay"
-              :key="conflict.requestUlid"
-              class="text-sm py-sm border-b-2 border-neutral-200 dark:border-neutral-600 flex flex-col"
-            >
-              <span class="capitalize self-center"
-                >{{ conflict.actionName }}:</span
-              >
-              <pre class="text-xs">{{ conflict.payload }}</pre>
-              <VButton
-                class="self-end"
-                label="Retry Change"
-                size="md"
-                tone="action"
-                @click="retry(conflict.requestUlid)"
-              ></VButton>
-            </li>
-          </ol>
-          <div class="flex flex-row gap-sm items-center mt-sm">
-            <VButton
-              class="grow text-action-300 dark:hover:text-white hover:text-black hover:underline"
-              label="Close"
-              tone="empty"
-              variant="solid"
-              @click="modalRef.close()"
-            ></VButton>
-          </div>
-        </div>
-      </Modal>
-    </template>
-  </StatusBarTab>
-</template>
-
-<script setup lang="ts">
-import { ref, computed, reactive, watch, WatchStopHandle } from "vue";
-import { Store } from "pinia";
-import clsx from "clsx";
-import { RequestUlid, ConflictsForRetry, ApiRequest } from "@si/vue-lib/pinia";
-import { Icon, Modal, VButton } from "@si/vue-lib/design-system";
-import { useComponentAttributesStore } from "@/store/component_attributes.store";
-import { useActionsStore } from "@/store/actions.store";
-import { useAssetStore } from "@/store/asset.store";
-import { useComponentsStore } from "@/store/components.store";
-import StatusBarTabPill from "./StatusBarTabPill.vue";
-import StatusBarTab from "./StatusBarTab.vue";
-
-const modalRef = ref();
-
-const openModal = () => {
-  modalRef.value.open();
-};
-
-const props = defineProps({
-  selected: Boolean,
-});
-
-const assetStore = useAssetStore();
-const actionsStore = useActionsStore();
-const componentsStore = useComponentsStore();
-
-let attributesStore: Store | null;
-const conflicts = reactive({} as ConflictsForRetry);
-let unwatch: WatchStopHandle | undefined;
-
-watch(
-  () => componentsStore.selectedComponentId,
-  () => {
-    if (componentsStore.selectedComponentId) {
-      attributesStore = useComponentAttributesStore(
-        componentsStore.selectedComponentId,
-      );
-      if (unwatch) unwatch();
-      unwatch = watch(attributesStore.availableRetries, () => {
-        Object.assign(conflicts, attributesStore?.availableRetries);
-      });
-    } else {
-      attributesStore = null;
-      if (unwatch) unwatch();
-    }
-  },
-  { immediate: true },
-);
-
-watch(componentsStore.availableRetries, () =>
-  Object.assign(conflicts, componentsStore.availableRetries),
-);
-watch(assetStore.availableRetries, () =>
-  Object.assign(conflicts, assetStore.availableRetries),
-);
-watch(actionsStore.availableRetries, () =>
-  Object.assign(conflicts, actionsStore.availableRetries),
-);
-
-const numConflicts = computed(() => Object.keys(conflicts).length);
-
-type ConflictDisplay = {
-  requestUlid: RequestUlid;
-  actionName: string;
-  payload: Record<string, unknown> | undefined;
-};
-
-const retry = (requestUlid: RequestUlid) => {
-  let p;
-  if (Object.keys(componentsStore.availableRetries).includes(requestUlid))
-    p = componentsStore.RETRY_CONFLICT(requestUlid);
-  else if (Object.keys(assetStore.availableRetries).includes(requestUlid))
-    p = assetStore.RETRY_CONFLICT(requestUlid);
-  else if (Object.keys(actionsStore.availableRetries).includes(requestUlid))
-    p = actionsStore.RETRY_CONFLICT(requestUlid);
-  else if (
-    attributesStore &&
-    Object.keys(attributesStore.availableRetries).includes(requestUlid)
-  )
-    p = attributesStore.RETRY_CONFLICT(requestUlid);
-
-  if (p) delete conflicts[requestUlid];
-  else throw Error("Retry not found");
-};
-
-const conflictDisplay = computed(() => {
-  const display = [] as ConflictDisplay[];
-  for (const requestUlid of Object.keys(conflicts)) {
-    const details = conflicts[requestUlid];
-    const actionName =
-      details?.[0].replaceAll("_", " ").toLowerCase() || "Unknown";
-    const apiRequest = details?.[1] as ApiRequest;
-    const payload = apiRequest?.requestSpec.params;
-    display.push({
-      requestUlid,
-      actionName,
-      payload,
-    });
-  }
-  return display;
-});
-</script>
-
-<style type="less">
-pre {
-  white-space: pre-wrap; /* Since CSS 2.1 */
-}
-</style>
diff --git a/app/web/src/components/toasts/Conflict.vue b/app/web/src/components/toasts/Conflict.vue
deleted file mode 100644
index 761b9d7222..0000000000
--- a/app/web/src/components/toasts/Conflict.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <div>
-    <div class="flex flex-row gap-sm items-center dark:bg-black bg-white">
-      <Icon
-        name="alert-circle"
-        class="text-warning-600 content-center ml-md"
-        size="lg"
-      />
-      <p class="grow py-md">
-        A conflict occurred. This conflict needs to be addressed before you can
-        Apply.
-      </p>
-    </div>
-    <div v-show="show">
-      <pre class="text-sm">{{ props.conflict }}</pre>
-    </div>
-    <div class="flex flex-row gap-sm items-center">
-      <VButton
-        label="View conflict message"
-        tone="empty"
-        variant="solid"
-        class="grow text-action-300 dark:hover:text-white hover:text-black hover:bg-action-400 hover:underline"
-        @click="() => (show = !show)"
-      ></VButton>
-      <VButton
-        class="grow text-action-300 dark:hover:text-white hover:text-black hover:bg-action-400 hover:underline"
-        label="Close"
-        tone="empty"
-        variant="solid"
-        @click="$emit('close-toast')"
-      ></VButton>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from "vue";
-import { Icon, VButton } from "@si/vue-lib/design-system";
-import { Conflict } from "@/store/status.store";
-
-const emit = defineEmits<{
-  (e: "close-toast"): void;
-}>();
-
-const show = ref(false);
-
-const props = defineProps<{
-  conflict: Conflict;
-}>();
-</script>
-
-<style lang="less">
-pre {
-  font-family: monospace;
-  resize: none;
-  display: block;
-}
-</style>
diff --git a/app/web/src/store/status.store.ts b/app/web/src/store/status.store.ts
index eab10bbca1..3067830f8b 100644
--- a/app/web/src/store/status.store.ts
+++ b/app/web/src/store/status.store.ts
@@ -10,7 +10,6 @@ import { ComponentId, SocketId } from "@/api/sdf/dal/component";
 import { useChangeSetsStore } from "./change_sets.store";
 import { useRealtimeStore } from "./realtime/realtime.store";
 import UpdatingModel from "../components/toasts/UpdatingModel.vue";
-import ConflictToast from "../components/toasts/Conflict.vue";
 
 import { useComponentsStore } from "./components.store";
 import handleStoreError from "./errors";
@@ -271,17 +270,6 @@ export const useStatusStore = (forceChangeSetId?: ChangeSetId) => {
             return `Updating ${latestUpdate.componentLabel}`;
           },
         },
-        actions: {
-          addConflictFromHttp(conflict: Conflict): void {
-            this.rawConflicts.push(conflict);
-            toast({
-              component: ConflictToast,
-              props: {
-                conflict,
-              },
-            });
-          },
-        },
         onActivated() {
           if (!changeSetId) return;
 
diff --git a/lib/vue-lib/src/pinia/pinia_api_tools.ts b/lib/vue-lib/src/pinia/pinia_api_tools.ts
index 90dfac99f1..b86064030a 100644
--- a/lib/vue-lib/src/pinia/pinia_api_tools.ts
+++ b/lib/vue-lib/src/pinia/pinia_api_tools.ts
@@ -81,7 +81,6 @@ declare module "pinia" {
   // augments the store's state
   export interface PiniaCustomStateProperties<S> {
     apiRequestStatuses: RawRequestStatusesByKey;
-    availableRetries: ConflictsForRetry;
   }
 }
 
@@ -230,15 +229,10 @@ export const initPiniaApiToolkitPlugin = (config: { api: AxiosInstance }) => {
     store.apiRequestStatuses = reactive({} as RawRequestStatusesByKey);
     (store.$state as any).apiRequestStatuses = store.apiRequestStatuses;
 
-    // 409 conflicts get stored in here
-    store.availableRetries = reactive({} as ConflictsForRetry);
-    (store.$state as any).availableRetries = store.availableRetries;
-
     // make available to devtools
     if (import.meta.env.DEV) {
       // eslint-disable-next-line no-underscore-dangle
       store._customProperties.add("apiRequestStatuses");
-      store._customProperties.add("availableRetries");
     }
 
     // triggers a named api request passing in a payload
@@ -433,14 +427,6 @@ export const initPiniaApiToolkitPlugin = (config: { api: AxiosInstance }) => {
           span.end();
         });
         request.setFailedResult(triggerResult.error);
-        if (
-          actionName !== "SET_COMPONENT_GEOMETRY" &&
-          triggerResult.error.response?.status === 409
-        ) {
-          store.$patch((state) => {
-            state.availableRetries[requestUlid] = [actionName, actionResult];
-          });
-        }
       } else {
         request.setSuccessfulResult(triggerResult.data);
       }
@@ -552,24 +538,10 @@ export const initPiniaApiToolkitPlugin = (config: { api: AxiosInstance }) => {
       delete store.$state.apiRequestStatuses[fullKey];
     };
 
-    const RETRY_CONFLICT = async (requestUlid: RequestUlid) => {
-      const r = store.$state.availableRetries[requestUlid];
-      if (!r) throw Error(`No retry found for: ${requestUlid}`);
-      const actionName = r[0];
-      const apiRequest = r[1];
-      store.$patch((state) => {
-        delete state.availableRetries[requestUlid];
-      });
-      const newRequestUlid = ulid();
-      await fireActionResult(actionName, apiRequest, newRequestUlid);
-      return apiRequest;
-    };
-
     return {
       getRequestStatus,
       getRequestStatuses,
       clearRequestStatus,
-      RETRY_CONFLICT,
       ...apiRequestActions,
     };
   };