refactor: rename entities for readability/accuracy

Parkreiner · Parkreiner · commit eac4164cf8c3 · 2023-10-09T17:55:48.000Z
diff --git a/site/src/pages/TemplatePage/TemplatePageHeader.tsx b/site/src/pages/TemplatePage/TemplatePageHeader.tsx
@@ -1,6 +1,6 @@
 import { type FC, useRef, useState } from "react";
 import { Link as RouterLink, useNavigate } from "react-router-dom";
-import { useDeleteTemplate } from "./deleteTemplate";
+import { useDeletionPopoverState } from "./useDeletionPopoverState";
 
 import { useQuery } from "react-query";
 import { workspacesByQuery } from "api/queries/workspaces";
@@ -123,7 +123,7 @@ export const TemplatePageHeader: FC<TemplatePageHeaderProps> = ({
   onDeleteTemplate,
 }) => {
   const navigate = useNavigate();
-  const deletionState = useDeleteTemplate(template, onDeleteTemplate);
+  const popoverState = useDeletionPopoverState(template, onDeleteTemplate);
 
   const queryText = `template:${template.name}`;
   const workspaceCountQuery = useQuery({
@@ -153,7 +153,7 @@ export const TemplatePageHeader: FC<TemplatePageHeaderProps> = ({
               <TemplateMenu
                 templateVersion={activeVersion.name}
                 templateName={template.name}
-                onDelete={deletionState.openDeleteConfirmation}
+                onDelete={popoverState.openDeleteConfirmation}
               />
             )}
           </>
@@ -184,9 +184,9 @@ export const TemplatePageHeader: FC<TemplatePageHeaderProps> = ({
 
       {safeToDeleteTemplate ? (
         <DeleteDialog
-          isOpen={deletionState.isDeleteDialogOpen}
-          onConfirm={deletionState.confirmDelete}
-          onCancel={deletionState.cancelDeleteConfirmation}
+          isOpen={popoverState.isDeleteDialogOpen}
+          onConfirm={popoverState.confirmDelete}
+          onCancel={popoverState.cancelDeleteConfirmation}
           entity="template"
           name={template.name}
         />
@@ -195,8 +195,8 @@ export const TemplatePageHeader: FC<TemplatePageHeaderProps> = ({
           type="info"
           title="Unable to delete"
           hideCancel={false}
-          open={deletionState.isDeleteDialogOpen}
-          onClose={deletionState.cancelDeleteConfirmation}
+          open={popoverState.isDeleteDialogOpen}
+          onClose={popoverState.cancelDeleteConfirmation}
           confirmText="See workspaces"
           confirmLoading={workspaceCountQuery.status !== "success"}
           onConfirm={() => {
diff --git a/site/src/pages/TemplatePage/useDeletionPopoverState.test.ts b/site/src/pages/TemplatePage/useDeletionPopoverState.test.ts
@@ -1,19 +1,19 @@
 import { act, renderHook, waitFor } from "@testing-library/react";
 import { MockTemplate } from "testHelpers/entities";
-import { useDeleteTemplate } from "./deleteTemplate";
+import { useDeletionPopoverState } from "./useDeletionPopoverState";
 import * as API from "api/api";
 
 test("delete dialog starts closed", () => {
   const { result } = renderHook(() =>
-    useDeleteTemplate(MockTemplate, jest.fn()),
+    useDeletionPopoverState(MockTemplate, jest.fn()),
   );
   expect(result.current.isDeleteDialogOpen).toBeFalsy();
 });
 
 test("confirm template deletion", async () => {
   const onDeleteTemplate = jest.fn();
   const { result } = renderHook(() =>
-    useDeleteTemplate(MockTemplate, onDeleteTemplate),
+    useDeletionPopoverState(MockTemplate, onDeleteTemplate),
   );
 
   //Open delete confirmation
@@ -31,7 +31,7 @@ test("confirm template deletion", async () => {
 
 test("cancel template deletion", () => {
   const { result } = renderHook(() =>
-    useDeleteTemplate(MockTemplate, jest.fn()),
+    useDeletionPopoverState(MockTemplate, jest.fn()),
   );
 
   //Open delete confirmation
diff --git a/site/src/pages/TemplatePage/useDeletionPopoverState.ts b/site/src/pages/TemplatePage/useDeletionPopoverState.ts
@@ -9,7 +9,10 @@ type DeleteTemplateState =
   | { status: "confirming" }
   | { status: "deleting" };
 
-export const useDeleteTemplate = (template: Template, onDelete: () => void) => {
+export const useDeletionPopoverState = (
+  template: Template,
+  onDelete: () => void,
+) => {
   const [state, setState] = useState<DeleteTemplateState>({ status: "idle" });
   const isDeleteDialogOpen =
     state.status === "confirming" || state.status === "deleting";
