Merge pull request #4277 from systeminit/jobelenus/take-out-the-trash

Removing "within-a-changeset" conflict detection & retry we don't need
systeminit · Aug 6, 2024 · 36d7f0b · 36d7f0b
2 parents d80ad04 + 4010e9d
commit 36d7f0b
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 283 deletions.
diff --git 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
@@ -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
diff --git a/app/web/src/components/toasts/Conflict.vue b/app/web/src/components/toasts/Conflict.vue
diff --git 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
@@ -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,
     };
   };