From d50f4ac0456c98b530ae3ddb4aa74549c8a72f43 Mon Sep 17 00:00:00 2001
From: safwanuahmed <safahmed@gitlab.com>
Date: Wed, 9 Apr 2025 06:36:21 -0400
Subject: [PATCH] Remove workspace termination fields from client side code

---
 .../components/get_project_details_query.vue    | 12 ++++--------
 .../fragments/workspace_item.fragment.graphql   |  1 -
 ...ote_development_cluster_agents.query.graphql |  1 -
 .../workspaces/user/pages/create.vue            |  9 ---------
 .../get_project_details_query_spec.js           |  3 +--
 ee/spec/frontend/workspaces/mock_data/index.js  | 17 -----------------
 .../workspaces/user/pages/create_spec.js        | 15 +--------------
 .../workspaces/user/router/index_spec.js        |  2 --
 locale/gitlab.pot                               |  3 ---
 9 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/ee/app/assets/javascripts/workspaces/common/components/get_project_details_query.vue b/ee/app/assets/javascripts/workspaces/common/components/get_project_details_query.vue
index 53ccce75b7b820..e1131dc17ee396 100644
--- a/ee/app/assets/javascripts/workspaces/common/components/get_project_details_query.vue
+++ b/ee/app/assets/javascripts/workspaces/common/components/get_project_details_query.vue
@@ -90,14 +90,10 @@ export default {
 
         return {
           clusterAgents:
-            data.namespace?.remoteDevelopmentClusterAgents?.nodes.map(
-              ({ id, name, project, workspacesAgentConfig }) => ({
-                value: id,
-                text: `${project.nameWithNamespace} / ${name}`,
-                defaultMaxHoursBeforeTermination:
-                  workspacesAgentConfig.defaultMaxHoursBeforeTermination,
-              }),
-            ) || [],
+            data.namespace?.remoteDevelopmentClusterAgents?.nodes.map(({ id, name, project }) => ({
+              value: id,
+              text: `${project.nameWithNamespace} / ${name}`,
+            })) || [],
         };
       } catch (error) {
         return { errors: [error] };
diff --git a/ee/app/assets/javascripts/workspaces/common/graphql/fragments/workspace_item.fragment.graphql b/ee/app/assets/javascripts/workspaces/common/graphql/fragments/workspace_item.fragment.graphql
index 5383b1cea0595f..7fa49723f9fa20 100644
--- a/ee/app/assets/javascripts/workspaces/common/graphql/fragments/workspace_item.fragment.graphql
+++ b/ee/app/assets/javascripts/workspaces/common/graphql/fragments/workspace_item.fragment.graphql
@@ -9,6 +9,5 @@ fragment WorkspaceItem on Workspace {
   devfileRef
   devfilePath
   devfileWebUrl
-  maxHoursBeforeTermination
   createdAt
 }
diff --git a/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_remote_development_cluster_agents.query.graphql b/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_remote_development_cluster_agents.query.graphql
index 548fb3219419be..745f85745fe4f0 100644
--- a/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_remote_development_cluster_agents.query.graphql
+++ b/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_remote_development_cluster_agents.query.graphql
@@ -11,7 +11,6 @@ query getRemoteDevelopmentClusterAgents($namespace: ID!) {
         }
         workspacesAgentConfig {
           id
-          defaultMaxHoursBeforeTermination
         }
       }
     }
diff --git a/ee/app/assets/javascripts/workspaces/user/pages/create.vue b/ee/app/assets/javascripts/workspaces/user/pages/create.vue
index 2a95a47cfe896d..0402d8f1de930a 100644
--- a/ee/app/assets/javascripts/workspaces/user/pages/create.vue
+++ b/ee/app/assets/javascripts/workspaces/user/pages/create.vue
@@ -59,7 +59,6 @@ export const i18n = {
     },
     pathToDevfile: s__('Workspaces|Path to devfile'),
     agentId: s__('Workspaces|Cluster agent'),
-    maxHoursBeforeTermination: s__('Workspaces|Workspace automatically terminates after'),
     maxHoursSuffix: __('hours'),
   },
   invalidProjectAlert: {
@@ -116,7 +115,6 @@ export default {
       clusterAgentsMap: {},
       devfileRef: '',
       projectId: null,
-      maxHoursBeforeTermination: 0,
       workspaceVariables: [],
       showWorkspaceVariableValidations: false,
       projectDetailsLoaded: false,
@@ -158,10 +156,6 @@ export default {
     this.focusFirstElement();
   },
   methods: {
-    onAgentChange(agentId) {
-      this.maxHoursBeforeTermination =
-        this.clusterAgentsMap[agentId].defaultMaxHoursBeforeTermination;
-    },
     onProjectDetailsResult({ fullPath, nameWithNamespace, clusterAgents, id, rootRef }) {
       // This scenario happens when the selected project is specified in the URL as a query param
       if (!this.selectedProject) {
@@ -180,7 +174,6 @@ export default {
       // Select the first agent if there are any
       if (clusterAgents.length > 0) {
         this.selectedAgent = clusterAgents[0].value;
-        this.maxHoursBeforeTermination = clusterAgents[0].defaultMaxHoursBeforeTermination;
       }
     },
     onProjectDetailsError() {
@@ -223,7 +216,6 @@ export default {
               desiredState: DEFAULT_DESIRED_STATE,
               devfileRef: this.devfileRef,
               devfilePath: this.devfilePath,
-              maxHoursBeforeTermination: parseInt(this.maxHoursBeforeTermination, 10),
               variables: this.workspaceVariables.map((v) => omit(v, 'valid')),
             },
           },
@@ -338,7 +330,6 @@ export default {
             class="gl-max-w-full"
             autocomplete="off"
             data-testid="workspace-cluster-agent-id-field"
-            @input="onAgentChange"
           />
         </gl-form-group>
         <template v-if="selectedAgent">
diff --git a/ee/spec/frontend/workspaces/common/components/get_project_details_query_spec.js b/ee/spec/frontend/workspaces/common/components/get_project_details_query_spec.js
index 33fa26851a537f..2688772126b76a 100644
--- a/ee/spec/frontend/workspaces/common/components/get_project_details_query_spec.js
+++ b/ee/spec/frontend/workspaces/common/components/get_project_details_query_spec.js
@@ -58,10 +58,9 @@ describe('workspaces/common/components/get_project_details_query', () => {
     clusterAgentsGraphQLResult,
   ) =>
     clusterAgentsGraphQLResult.data.namespace.remoteDevelopmentClusterAgents.nodes.map(
-      ({ id, name, project, workspacesAgentConfig }) => ({
+      ({ id, name, project }) => ({
         text: `${project.nameWithNamespace} / ${name}`,
         value: id,
-        defaultMaxHoursBeforeTermination: workspacesAgentConfig.defaultMaxHoursBeforeTermination,
       }),
     );
 
diff --git a/ee/spec/frontend/workspaces/mock_data/index.js b/ee/spec/frontend/workspaces/mock_data/index.js
index d8634a36ce5ab9..a50bf5f647e153 100644
--- a/ee/spec/frontend/workspaces/mock_data/index.js
+++ b/ee/spec/frontend/workspaces/mock_data/index.js
@@ -19,7 +19,6 @@ export const WORKSPACE = {
   devfilePath: '.devfile.yaml',
   devfileWebUrl: 'http://gdk.test:3000/gitlab-org/gitlab-shell/-/blob/main/.devfile.yaml',
   createdAt: '2023-05-01T18:24:34Z',
-  maxHoursBeforeTermination: 120,
 };
 
 export const PROJECT_ID = 1;
@@ -50,7 +49,6 @@ export const USER_WORKSPACES_LIST_QUERY_RESULT = {
             devfileWebUrl: 'http://gdk.test:3000/gitlab-org/gitlab-shell/-/blob/main/.devfile.yaml',
             projectId: 'gid://gitlab/Project/1',
             createdAt: '2023-04-29T18:24:34Z',
-            maxHoursBeforeTermination: 120,
           },
           {
             __typename: 'Workspace',
@@ -65,7 +63,6 @@ export const USER_WORKSPACES_LIST_QUERY_RESULT = {
             devfileWebUrl: 'http://gdk.test:3000/gitlab-org/gitlab-shell/-/blob/main/.devfile.yaml',
             projectId: 'gid://gitlab/Project/1',
             createdAt: '2023-05-01T18:24:34Z',
-            maxHoursBeforeTermination: 120,
           },
         ],
         pageInfo: {
@@ -98,7 +95,6 @@ export const USER_WORKSPACES_TAB_LIST_QUERY_RESULT = {
             devfileWebUrl: 'http://gdk.test:3000/gitlab-org/gitlab-shell/-/blob/main/.devfile.yaml',
             projectId: 'gid://gitlab/Project/1',
             createdAt: '2023-04-29T18:24:34Z',
-            maxHoursBeforeTermination: 120,
           },
           {
             __typename: 'Workspace',
@@ -113,7 +109,6 @@ export const USER_WORKSPACES_TAB_LIST_QUERY_RESULT = {
             devfileWebUrl: 'http://gdk.test:3000/gitlab-org/gitlab-shell/-/blob/main/.devfile.yaml',
             projectId: 'gid://gitlab/Project/1',
             createdAt: '2023-05-01T18:24:34Z',
-            maxHoursBeforeTermination: 120,
           },
         ],
         pageInfo: {
@@ -138,7 +133,6 @@ export const USER_WORKSPACES_TAB_LIST_QUERY_RESULT = {
             devfileWebUrl: 'http://gdk.test:3000/gitlab-org/gitlab-shell/-/blob/main/.devfile.yaml',
             projectId: 'gid://gitlab/Project/1',
             createdAt: '2023-04-29T18:24:34Z',
-            maxHoursBeforeTermination: 120,
           },
           {
             __typename: 'Workspace',
@@ -153,7 +147,6 @@ export const USER_WORKSPACES_TAB_LIST_QUERY_RESULT = {
             devfileWebUrl: 'http://gdk.test:3000/gitlab-org/gitlab-shell/-/blob/main/.devfile.yaml',
             projectId: 'gid://gitlab/Project/1',
             createdAt: '2023-05-01T18:24:34Z',
-            maxHoursBeforeTermination: 120,
           },
         ],
         pageInfo: {
@@ -242,7 +235,6 @@ export const AGENT_WORKSPACES_LIST_QUERY_RESULT = {
                 'http://gdk.test:3000/gitlab-org/gitlab-shell/-/blob/main/.devfile.yaml',
               projectId: 'gid://gitlab/Project/1',
               createdAt: '2023-04-29T18:24:34Z',
-              maxHoursBeforeTermination: 120,
             },
             {
               __typename: 'Workspace',
@@ -258,7 +250,6 @@ export const AGENT_WORKSPACES_LIST_QUERY_RESULT = {
                 'http://gdk.test:3000/gitlab-org/gitlab-shell/-/blob/main/.devfile.yaml',
               projectId: 'gid://gitlab/Project/1',
               createdAt: '2023-05-01T18:24:34Z',
-              maxHoursBeforeTermination: 120,
             },
           ],
           pageInfo: {
@@ -515,8 +506,6 @@ export const GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS = {
             },
             workspacesAgentConfig: {
               id: 'gid://gitlab/RemoteDevelopment::WorkspacesAgentConfig/999',
-              defaultMaxHoursBeforeTermination: 99,
-              maxHoursBeforeTerminationLimit: 999,
             },
           },
           {
@@ -528,8 +517,6 @@ export const GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS = {
             },
             workspacesAgentConfig: {
               id: 'gid://gitlab/RemoteDevelopment::WorkspacesAgentConfig/998',
-              defaultMaxHoursBeforeTermination: 98,
-              maxHoursBeforeTerminationLimit: 998,
             },
           },
         ],
@@ -555,8 +542,6 @@ export const MAPPED_CLUSTER_AGENT = {
   mappingStatus: AGENT_MAPPING_STATUS_MAPPED,
   workspacesAgentConfig: {
     id: 'gid://gitlab/RemoteDevelopment::WorkspacesAgentConfig/999',
-    defaultMaxHoursBeforeTermination: 99,
-    maxHoursBeforeTerminationLimit: 999,
   },
 };
 
@@ -577,8 +562,6 @@ export const UNMAPPED_CLUSTER_AGENT = {
   mappingStatus: AGENT_MAPPING_STATUS_UNMAPPED,
   workspacesAgentConfig: {
     id: 'gid://gitlab/RemoteDevelopment::WorkspacesAgentConfig/999',
-    defaultMaxHoursBeforeTermination: 99,
-    maxHoursBeforeTerminationLimit: 999,
   },
 };
 
diff --git a/ee/spec/frontend/workspaces/user/pages/create_spec.js b/ee/spec/frontend/workspaces/user/pages/create_spec.js
index 510a18a617b3b4..3a1f3b04fef003 100644
--- a/ee/spec/frontend/workspaces/user/pages/create_spec.js
+++ b/ee/spec/frontend/workspaces/user/pages/create_spec.js
@@ -42,19 +42,16 @@ describe('workspaces/user/pages/create.vue', () => {
     fullPath: 'gitlab-org/gitlab',
     nameWithNamespace: 'GitLab Org / GitLab',
   };
-  const clusterAgentOneDefaultMaxHours = 100;
-  const clusterAgentTwoDefaultMaxHours = 200;
+
   const selectedClusterAgentOneIDFixture = 'agents/1';
   const selectedClusterAgentTwoIDFixture = 'agents/2';
   const clusterAgentOne = {
     text: 'Agent',
     value: selectedClusterAgentOneIDFixture,
-    defaultMaxHoursBeforeTermination: clusterAgentOneDefaultMaxHours,
   };
   const clusterAgentTwo = {
     text: 'Agent 2',
     value: selectedClusterAgentTwoIDFixture,
-    defaultMaxHoursBeforeTermination: clusterAgentTwoDefaultMaxHours,
   };
   const clusterAgentsFixture = [clusterAgentOne];
   const twoClusterAgentsFixture = [clusterAgentOne, clusterAgentTwo];
@@ -171,9 +168,6 @@ describe('workspaces/user/pages/create.vue', () => {
   const findDevfileDropDown = () => findDevfileField().findComponent(DevfileListbox);
   const findDevfileHelpDrawer = () => findDevfileField().findComponent(DevfileHelpDrawer);
 
-  const findMaxHoursBeforeTerminationField = () =>
-    wrapper.findByTestId('max-hours-before-termination');
-
   const emitGetProjectDetailsQueryResult = ({
     clusterAgents = [],
     groupPath = GET_PROJECT_DETAILS_QUERY_RESULT.data.project.group.fullPath,
@@ -244,10 +238,6 @@ describe('workspaces/user/pages/create.vue', () => {
       expect(findDevfileField().exists()).toBe(false);
     });
 
-    it('does not display max hours before termination field', () => {
-      expect(findMaxHoursBeforeTerminationField().exists()).toBe(false);
-    });
-
     it('shows a link to the troubleshooting page', () => {
       expect(wrapper.findByTestId('workspaces-troubleshooting-doc-link').attributes('href')).toBe(
         '/help/user/workspace/workspaces_troubleshooting.html',
@@ -336,7 +326,6 @@ describe('workspaces/user/pages/create.vue', () => {
 
         expect(workspaceCreateMutationHandler).toHaveBeenCalledWith({
           input: expect.objectContaining({
-            maxHoursBeforeTermination: clusterAgentTwoDefaultMaxHours,
             clusterAgentId: selectedClusterAgentTwoIDFixture,
           }),
         });
@@ -392,7 +381,6 @@ describe('workspaces/user/pages/create.vue', () => {
 
     describe('when clicking Create Workspace button', () => {
       it('submits workspaceCreate mutation', async () => {
-        const maxHoursBeforeTermination = 100;
         const devfileRef = 'mybranch';
         findDevfileRefRefSelector().vm.$emit('input', devfileRef);
         await waitForPromises();
@@ -405,7 +393,6 @@ describe('workspaces/user/pages/create.vue', () => {
             projectId: projectGid,
             desiredState: DEFAULT_DESIRED_STATE,
             devfilePath: null,
-            maxHoursBeforeTermination,
             devfileRef,
             variables: findWorkspaceVariables().props().variables,
           },
diff --git a/ee/spec/frontend/workspaces/user/router/index_spec.js b/ee/spec/frontend/workspaces/user/router/index_spec.js
index 451fc7f1607d9e..59961fd476c557 100644
--- a/ee/spec/frontend/workspaces/user/router/index_spec.js
+++ b/ee/spec/frontend/workspaces/user/router/index_spec.js
@@ -24,7 +24,6 @@ Vue.use(VueRouter);
 Vue.use(VueApollo);
 
 const SVG_PATH = '/assets/illustrations/empty_states/empty_workspaces.svg';
-const DEFAULT_MAX_HOURS_BEFORE_TERMINATION = 42;
 
 describe('workspaces/router/index.js', () => {
   let router;
@@ -58,7 +57,6 @@ describe('workspaces/router/index.js', () => {
       ]),
       provide: {
         emptyStateSvgPath: SVG_PATH,
-        defaultMaxHoursBeforeTermination: DEFAULT_MAX_HOURS_BEFORE_TERMINATION,
         defaultDevfile: 'mock-devfile-value',
       },
       stubs: {
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index c800dc840b42ef..54eba79a43b73d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -68604,9 +68604,6 @@ msgstr ""
 msgid "Workspaces|When no devfile is provided, the GitLab default devfile will be used."
 msgstr ""
 
-msgid "Workspaces|Workspace automatically terminates after"
-msgstr ""
-
 msgid "Workspaces|Workspaces"
 msgstr ""
 
-- 
GitLab