Consistently use "Save" on all forms submit button (#5181)

opsmill · Dec 10, 2024 · e77be99 · e77be99
1 parent 846a428
commit e77be99
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 11 deletions.
diff --git a/changelog/4850.fixed.md b/changelog/4850.fixed.md
@@ -0,0 +1 @@
+Consistently use "Save" on all object forms submit buttons
diff --git a/frontend/app/src/App.tsx b/frontend/app/src/App.tsx
@@ -37,7 +37,7 @@ export function App() {
               />
               <RouterProvider router={router} />
             </ApolloProvider>
-            <TanStackQueryDevtools />
+            <TanStackQueryDevtools buttonPosition="bottom-left" />
           </QueryClientProvider>
         </AuthProvider>
       </Provider>

diff --git a/frontend/app/src/screens/resource-manager/number-pool-form.tsx b/frontend/app/src/screens/resource-manager/number-pool-form.tsx
@@ -138,7 +138,7 @@ export const NumberPoolForm = ({
             </Button>
           )}
 
-          <FormSubmit>{currentObject ? "Update" : "Create"}</FormSubmit>
+          <FormSubmit>Save</FormSubmit>
         </div>
       </Form>
     </div>

diff --git a/frontend/app/src/screens/role-management/account-form.tsx b/frontend/app/src/screens/role-management/account-form.tsx
@@ -156,7 +156,7 @@ export const AccountForm = ({
             </Button>
           )}
 
-          <FormSubmit>{currentObject ? "Update" : "Create"}</FormSubmit>
+          <FormSubmit>Save</FormSubmit>
         </div>
       </Form>
     </div>

diff --git a/frontend/app/src/screens/role-management/account-group-form.tsx b/frontend/app/src/screens/role-management/account-group-form.tsx
@@ -173,7 +173,7 @@ export const AccountGroupForm = ({
             </Button>
           )}
 
-          <FormSubmit>{currentObject ? "Update" : "Create"}</FormSubmit>
+          <FormSubmit>Save</FormSubmit>
         </div>
       </Form>
     </div>

diff --git a/frontend/app/src/screens/role-management/account-role-form.tsx b/frontend/app/src/screens/role-management/account-role-form.tsx
@@ -157,7 +157,7 @@ export const AccountRoleForm = ({
             </Button>
           )}
 
-          <FormSubmit>{currentObject ? "Update" : "Create"}</FormSubmit>
+          <FormSubmit>Save</FormSubmit>
         </div>
       </Form>
     </div>

diff --git a/frontend/app/src/screens/role-management/global-permissions-form.tsx b/frontend/app/src/screens/role-management/global-permissions-form.tsx
@@ -156,7 +156,7 @@ export const GlobalPermissionForm = ({
             </Button>
           )}
 
-          <FormSubmit>{currentObject ? "Update" : "Create"}</FormSubmit>
+          <FormSubmit>Save</FormSubmit>
         </div>
       </Form>
     </div>

diff --git a/frontend/app/src/screens/role-management/object-permissions-form.tsx b/frontend/app/src/screens/role-management/object-permissions-form.tsx
@@ -175,7 +175,7 @@ export const ObjectPermissionForm = ({
             </Button>
           )}
 
-          <FormSubmit>{currentObject ? "Update" : "Create"}</FormSubmit>
+          <FormSubmit>Save</FormSubmit>
         </div>
       </Form>
     </div>

diff --git a/frontend/app/tests/e2e/form/select-2-steps.spec.ts b/frontend/app/tests/e2e/form/select-2-steps.spec.ts
@@ -51,7 +51,7 @@ test.describe("Verifies the object creation", () => {
 
       await page.getByTestId("select2step-2").getByTestId("select-open-option-button").click();
       await page.getByRole("option", { name: ENDPOINT_NAME }).last().click();
-      await page.getByRole("button", { name: "Create" }).click();
+      await page.getByRole("button", { name: "Save" }).click();
       await expect(page.getByText(`${KIND} created`)).toBeVisible();
     });
 

diff --git a/frontend/app/tests/e2e/resource-manager/number-pool.spec.ts b/frontend/app/tests/e2e/resource-manager/number-pool.spec.ts
@@ -18,7 +18,7 @@ test.describe("/resource-manager - Resource Manager", () => {
     await page.getByRole("option", { name: "Speed" }).click();
     await page.getByLabel("Start range *").fill("1");
     await page.getByLabel("End range *").fill("10");
-    await page.getByRole("button", { name: "Create" }).click();
+    await page.getByRole("button", { name: "Save" }).click();
     await expect(page.getByText("Number pool created")).toBeVisible();
   });
 

diff --git a/frontend/app/tests/e2e/role-management/roles-crud.spec.ts b/frontend/app/tests/e2e/role-management/roles-crud.spec.ts
@@ -29,7 +29,7 @@ test.describe("Role management - Roles CRUD", () => {
         .getByText("global:manage_repositories:")
         .click();
       await page.getByTestId("side-panel-container").getByLabel("Permissions").click();
-      await page.getByRole("button", { name: "Create" }).click();
+      await page.getByRole("button", { name: "Save" }).click();
       await expect(page.getByText("Role created!")).toBeVisible();
     });
 
@@ -69,7 +69,7 @@ test.describe("Role management - Roles CRUD", () => {
         .getByText("global:manage_schema:allow_all")
         .click();
       await page.getByTestId("side-panel-container").getByLabel("Permissions").click();
-      await page.getByRole("button", { name: "Update" }).click();
+      await page.getByRole("button", { name: "Save" }).click();
       await expect(page.getByText("Role updated!")).toBeVisible();
     });
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Consistently use "Save" on all object forms submit buttons
-Original file line number
+Diff line change
@@ Expand Up / @@ -138,7 +138,7 @@ export const NumberPoolForm = ({ @@
                 </Button>
               )}
-              <FormSubmit>{currentObject ? "Update" : "Create"}</FormSubmit>
+              <FormSubmit>Save</FormSubmit>
             </div>
           </Form>
         </div>
@@ Expand Down @@