fix: use insert and update instead of upsert

jaaydenh · jaaydenh · commit ffa67cf7a052 · 2024-08-12T20:48:28.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -603,11 +603,26 @@ class ApiMethods {
   /**
    * @param organization Can be the organization's ID or name
    */
-  patchOrganizationRole = async (
+  createOrganizationRole = async (
     organization: string,
     role: TypesGen.Role,
   ): Promise<TypesGen.Role> => {
-    const response = await this.axios.patch<TypesGen.Role>(
+    const response = await this.axios.post<TypesGen.Role>(
+      `/api/v2/organizations/${organization}/members/roles`,
+      role,
+    );
+
+    return response.data;
+  };
+
+  /**
+   * @param organization Can be the organization's ID or name
+   */
+  updateOrganizationRole = async (
+    organization: string,
+    role: TypesGen.Role,
+  ): Promise<TypesGen.Role> => {
+    const response = await this.axios.put<TypesGen.Role>(
       `/api/v2/organizations/${organization}/members/roles`,
       role,
     );
diff --git a/site/src/api/queries/roles.ts b/site/src/api/queries/roles.ts
@@ -23,13 +23,27 @@ export const organizationRoles = (organization: string) => {
   };
 };
 
-export const patchOrganizationRole = (
+export const createOrganizationRole = (
   queryClient: QueryClient,
   organization: string,
 ) => {
   return {
     mutationFn: (request: Role) =>
-      API.patchOrganizationRole(organization, request),
+      API.createOrganizationRole(organization, request),
+    onSuccess: async (updatedRole: Role) =>
+      await queryClient.invalidateQueries(
+        getRoleQueryKey(organization, updatedRole.name),
+      ),
+  };
+};
+
+export const updateOrganizationRole = (
+  queryClient: QueryClient,
+  organization: string,
+) => {
+  return {
+    mutationFn: (request: Role) =>
+      API.updateOrganizationRole(organization, request),
     onSuccess: async (updatedRole: Role) =>
       await queryClient.invalidateQueries(
         getRoleQueryKey(organization, updatedRole.name),
diff --git a/site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePage.tsx b/site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePage.tsx
@@ -4,8 +4,12 @@ import { useMutation, useQuery, useQueryClient } from "react-query";
 import { useNavigate, useParams } from "react-router-dom";
 import { getErrorMessage } from "api/errors";
 import { organizationPermissions } from "api/queries/organizations";
-import { patchOrganizationRole, organizationRoles } from "api/queries/roles";
-import type { PatchRoleRequest } from "api/typesGenerated";
+import {
+  organizationRoles,
+  createOrganizationRole,
+  updateOrganizationRole,
+} from "api/queries/roles";
+import type { CustomRoleRequest } from "api/typesGenerated";
 import { displayError } from "components/GlobalSnackbar/utils";
 import { Loader } from "components/Loader/Loader";
 import { pageTitle } from "utils/page";
@@ -22,8 +26,11 @@ export const CreateEditRolePage: FC = () => {
   const { organizations } = useOrganizationSettings();
   const organization = organizations?.find((o) => o.name === organizationName);
   const permissionsQuery = useQuery(organizationPermissions(organization?.id));
-  const patchOrganizationRoleMutation = useMutation(
-    patchOrganizationRole(queryClient, organizationName),
+  const createOrganizationRoleMutation = useMutation(
+    createOrganizationRole(queryClient, organizationName),
+  );
+  const updateOrganizationRoleMutation = useMutation(
+    updateOrganizationRole(queryClient, organizationName),
   );
   const { data: roleData, isLoading } = useQuery(
     organizationRoles(organizationName),
@@ -47,18 +54,31 @@ export const CreateEditRolePage: FC = () => {
 
       <CreateEditRolePageView
         role={role}
-        onSubmit={async (data: PatchRoleRequest) => {
+        onSubmit={async (data: CustomRoleRequest) => {
           try {
-            await patchOrganizationRoleMutation.mutateAsync(data);
-            navigate(`/organizations/${organizationName}/roles`);
+            if (role) {
+              await updateOrganizationRoleMutation.mutateAsync(data);
+              navigate(`/organizations/${organizationName}/roles`);
+            } else {
+              await createOrganizationRoleMutation.mutateAsync(data);
+              navigate(`/organizations/${organizationName}/roles`);
+            }
           } catch (error) {
             displayError(
               getErrorMessage(error, "Failed to update custom role"),
             );
           }
         }}
-        error={patchOrganizationRoleMutation.error}
-        isLoading={patchOrganizationRoleMutation.isLoading}
+        error={
+          role
+            ? updateOrganizationRoleMutation.error
+            : createOrganizationRoleMutation.error
+        }
+        isLoading={
+          role
+            ? updateOrganizationRoleMutation.isLoading
+            : createOrganizationRoleMutation.isLoading
+        }
         organizationName={organizationName}
         canAssignOrgRole={permissions.assignOrgRole}
       />
diff --git a/site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx b/site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx
@@ -20,7 +20,7 @@ import { isApiValidationError } from "api/errors";
 import { RBACResourceActions } from "api/rbacresources_gen";
 import type {
   Role,
-  PatchRoleRequest,
+  CustomRoleRequest,
   Permission,
   AssignableRoles,
   RBACResource,
@@ -38,7 +38,7 @@ const validationSchema = Yup.object({
 
 export type CreateEditRolePageViewProps = {
   role: AssignableRoles | undefined;
-  onSubmit: (data: PatchRoleRequest) => void;
+  onSubmit: (data: CustomRoleRequest) => void;
   error?: unknown;
   isLoading: boolean;
   organizationName: string;
@@ -58,7 +58,7 @@ export const CreateEditRolePageView: FC<CreateEditRolePageViewProps> = ({
   const navigate = useNavigate();
   const onCancel = () => navigate(-1);
 
-  const form = useFormik<PatchRoleRequest>({
+  const form = useFormik<CustomRoleRequest>({
     initialValues: {
       name: role?.name || "",
       display_name: role?.display_name || "",
