Merge branch 'main' into bq/remove-change-version

coder · BrunoQuaresma · Mar 16, 2023 · Mar 15, 2023 · Mar 15, 2023 · Mar 16, 2023
commit 9803af289d1a29ac12aeca0b4fec8981960320bb
diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
@@ -225,10 +225,7 @@ export const AppRouter: FC = () => {
                     path="builds/:buildNumber"
                     element={<WorkspaceBuildPage />}
                   />
-                  <Route
-                    path="build-parameters"
-                    element={<WorkspaceBuildParametersPage />}
-                  />
+                  <Route path="settings" element={<WorkspaceSettingsPage />} />
                 </Route>
               </Route>
             </Route>

diff --git a/site/src/components/DropdownButton/ActionCtas.tsx b/site/src/components/DropdownButton/ActionCtas.tsx
@@ -35,9 +35,9 @@ export const UpdateButton: FC<React.PropsWithChildren<WorkspaceAction>> = ({
   )
 }
 
-export const BuildParametersButton: FC<
-  React.PropsWithChildren<WorkspaceAction>
-> = ({ handleAction }) => {
+export const SettingsButton: FC<React.PropsWithChildren<WorkspaceAction>> = ({
+  handleAction,
+}) => {
   const styles = useStyles()
   const { t } = useTranslation("workspacePage")
 

diff --git a/site/src/components/Workspace/Workspace.tsx b/site/src/components/Workspace/Workspace.tsx
@@ -42,7 +42,7 @@ export interface WorkspaceProps {
   handleDelete: () => void
   handleUpdate: () => void
   handleCancel: () => void
-  handleBuildParameters: () => void
+  handleSettings: () => void
   isUpdating: boolean
   workspace: TypesGen.Workspace
   resources?: TypesGen.WorkspaceResource[]
@@ -67,7 +67,7 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
   handleDelete,
   handleUpdate,
   handleCancel,
-  handleBuildParameters,
+  handleSettings,
   workspace,
   isUpdating,
   resources,
@@ -128,7 +128,7 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
               handleDelete={handleDelete}
               handleUpdate={handleUpdate}
               handleCancel={handleCancel}
-              handleBuildParameters={handleBuildParameters}
+              handleSettings={handleSettings}
               isUpdating={isUpdating}
             />
           </Stack>

diff --git a/site/src/components/WorkspaceActions/WorkspaceActions.test.tsx b/site/src/components/WorkspaceActions/WorkspaceActions.test.tsx
@@ -18,7 +18,7 @@ const renderComponent = async (props: Partial<WorkspaceActionsProps> = {}) => {
       handleDelete={jest.fn()}
       handleUpdate={jest.fn()}
       handleCancel={jest.fn()}
-      handleBuildParameters={jest.fn()}
+      handleSettings={jest.fn()}
       isUpdating={false}
     />,
   )
@@ -36,7 +36,7 @@ const renderAndClick = async (props: Partial<WorkspaceActionsProps> = {}) => {
       handleDelete={jest.fn()}
       handleUpdate={jest.fn()}
       handleCancel={jest.fn()}
-      handleBuildParameters={jest.fn()}
+      handleSettings={jest.fn()}
       isUpdating={false}
     />,
   )

diff --git a/site/src/components/WorkspaceActions/WorkspaceActions.tsx b/site/src/components/WorkspaceActions/WorkspaceActions.tsx
@@ -21,7 +21,7 @@ export interface WorkspaceActionsProps {
   handleDelete: () => void
   handleUpdate: () => void
   handleCancel: () => void
-  handleBuildParameters: () => void
+  handleSettings: () => void
   isUpdating: boolean
   children?: ReactNode
 }
@@ -34,7 +34,7 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({
   handleDelete,
   handleUpdate,
   handleCancel,
-  handleBuildParameters,
+  handleSettings,
   isUpdating,
 }) => {
   const { t } = useTranslation("workspacePage")
@@ -47,8 +47,8 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({
     [ButtonTypesEnum.updating]: (
       <ActionLoadingButton label={t("actionButton.updating")} />
     ),
-    [ButtonTypesEnum.buildParameters]: (
-      <BuildParametersButton handleAction={handleBuildParameters} />
+    [ButtonTypesEnum.settings]: (
+      <SettingsButton handleAction={handleSettings} />
     ),
     [ButtonTypesEnum.start]: <StartButton handleAction={handleStart} />,
     [ButtonTypesEnum.starting]: (

diff --git a/site/src/components/WorkspaceActions/constants.ts b/site/src/components/WorkspaceActions/constants.ts
@@ -11,7 +11,7 @@ export enum ButtonTypesEnum {
   deleting = "deleting",
   update = "update",
   updating = "updating",
-  buildParameters = "buildParameters",
+  settings = "settings",
   // disabled buttons
   canceling = "canceling",
   deleted = "deleted",
@@ -43,7 +43,7 @@ const statusToAbilities: Record<WorkspaceStatus, WorkspaceAbilities> = {
   running: {
     actions: [
       ButtonTypesEnum.stop,
-      ButtonTypesEnum.buildParameters,
+      ButtonTypesEnum.settings,
       ButtonTypesEnum.delete,
     ],
     canCancel: false,
@@ -57,7 +57,7 @@ const statusToAbilities: Record<WorkspaceStatus, WorkspaceAbilities> = {
   stopped: {
     actions: [
       ButtonTypesEnum.start,
-      ButtonTypesEnum.buildParameters,
+      ButtonTypesEnum.settings,
       ButtonTypesEnum.delete,
     ],
     canCancel: false,
@@ -67,7 +67,7 @@ const statusToAbilities: Record<WorkspaceStatus, WorkspaceAbilities> = {
     actions: [
       ButtonTypesEnum.start,
       ButtonTypesEnum.stop,
-      ButtonTypesEnum.buildParameters,
+      ButtonTypesEnum.settings,
       ButtonTypesEnum.delete,
     ],
     canCancel: false,
@@ -77,7 +77,8 @@ const statusToAbilities: Record<WorkspaceStatus, WorkspaceAbilities> = {
   failed: {
     actions: [
       ButtonTypesEnum.start,
-      ButtonTypesEnum.buildParameters,
+      ButtonTypesEnum.stop,
+      ButtonTypesEnum.settings,
       ButtonTypesEnum.delete,
     ],
     canCancel: false,

diff --git a/site/src/i18n/en/index.ts b/site/src/i18n/en/index.ts
@@ -12,7 +12,6 @@ import templateSettingsPage from "./templateSettingsPage.json"
 import templateVariablesPage from "./templateVariablesPage.json"
 import templateVersionPage from "./templateVersionPage.json"
 import loginPage from "./loginPage.json"
-import workspaceBuildParametersPage from "./workspaceBuildParametersPage.json"
 import workspaceSchedulePage from "./workspaceSchedulePage.json"
 import appearanceSettings from "./appearanceSettings.json"
 import starterTemplatesPage from "./starterTemplatesPage.json"
@@ -37,7 +36,6 @@ export const en = {
   templateVariablesPage,
   templateVersionPage,
   loginPage,
-  workspaceBuildParametersPage,
   workspaceSchedulePage,
   appearanceSettings,
   starterTemplatesPage,

diff --git a/site/src/i18n/en/workspacePage.json b/site/src/i18n/en/workspacePage.json
@@ -28,7 +28,7 @@
     "starting": "Starting...",
     "stopping": "Stopping...",
     "deleting": "Deleting...",
-    "buildParameters": "Build parameters"
+    "settings": "Settings"
   },
   "disabledButton": {
     "canceling": "Canceling",

diff --git a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
@@ -111,7 +111,7 @@ export const WorkspaceReadyPage = ({
         handleDelete={() => workspaceSend({ type: "ASK_DELETE" })}
         handleUpdate={() => workspaceSend({ type: "UPDATE" })}
         handleCancel={() => workspaceSend({ type: "CANCEL" })}
-        handleBuildParameters={() => navigate("build-parameters")}
+        handleSettings={() => navigate("settings")}
         resources={workspace.latest_build.resources}
         builds={builds}
         canUpdateWorkspace={canUpdateWorkspace}