Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42

14 files changed, 27 insertions, 77 deletions

diff --git a/app/assets/javascripts/environments/components/deployment.vue b/app/assets/javascripts/environments/components/deployment.vue
index 96d2a8d9ba2..ef6d3b79198 100644
--- a/app/assets/javascripts/environments/components/deployment.vue
+++ b/app/assets/javascripts/environments/components/deployment.vue
@@ -209,7 +209,7 @@ export default {
           </div>
           <time-ago-tooltip v-if="createdAt" :time="createdAt" class="gl-display-flex">
             <template #default="{ timeAgo }">
-              <gl-icon name="calendar" />
+              <gl-icon name="calendar" class="gl-mr-2" />
               <span class="gl-mr-2 gl-white-space-nowrap">{{ timeAgo }}</span>
             </template>
           </time-ago-tooltip>
diff --git a/app/assets/javascripts/environments/components/edit_environment.vue b/app/assets/javascripts/environments/components/edit_environment.vue
index f90a1dcd193..0eebd81b671 100644
--- a/app/assets/javascripts/environments/components/edit_environment.vue
+++ b/app/assets/javascripts/environments/components/edit_environment.vue
@@ -4,7 +4,6 @@ import { createAlert } from '~/alert';
 import { visitUrl } from '~/lib/utils/url_utility';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import getEnvironment from '../graphql/queries/environment.query.graphql';
-import getEnvironmentWithFluxResource from '../graphql/queries/environment_with_flux_resource.query.graphql';
 import updateEnvironment from '../graphql/mutations/update_environment.mutation.graphql';
 import EnvironmentForm from './environment_form.vue';
 
@@ -17,11 +16,7 @@ export default {
   inject: ['projectEnvironmentsPath', 'projectPath', 'environmentName'],
   apollo: {
     environment: {
-      query() {
-        return this.glFeatures?.fluxResourceForEnvironment
-          ? getEnvironmentWithFluxResource
-          : getEnvironment;
-      },
+      query: getEnvironment,
       variables() {
         return {
           environmentName: this.environmentName,
diff --git a/app/assets/javascripts/environments/components/environment_actions.vue b/app/assets/javascripts/environments/components/environment_actions.vue
index d49598d2f21..926c556966c 100644
--- a/app/assets/javascripts/environments/components/environment_actions.vue
+++ b/app/assets/javascripts/environments/components/environment_actions.vue
@@ -87,7 +87,7 @@ export default {
 </script>
 <template>
   <gl-disclosure-dropdown
-    :text="title"
+    :toggle-text="title"
     :title="title"
     :loading="isLoading"
     :aria-label="title"
diff --git a/app/assets/javascripts/environments/components/environment_form.vue b/app/assets/javascripts/environments/components/environment_form.vue
index d89dcf56b7c..846f2cf73b2 100644
--- a/app/assets/javascripts/environments/components/environment_form.vue
+++ b/app/assets/javascripts/environments/components/environment_form.vue
@@ -181,13 +181,8 @@ export default {
     namespaceDropdownToggleText() {
       return this.selectedNamespace || this.$options.i18n.namespaceHelpText;
     },
-    isKasFluxResourceAvailable() {
-      return this.glFeatures?.fluxResourceForEnvironment;
-    },
     showFluxResourceSelector() {
-      return Boolean(
-        this.isKasFluxResourceAvailable && this.selectedNamespace && this.selectedAgentId,
-      );
+      return Boolean(this.selectedNamespace && this.selectedAgentId);
     },
     k8sAccessConfiguration() {
       if (!this.showNamespaceSelector) {
diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue
index b02142c24cf..08a1eacec7a 100644
--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@@ -1,6 +1,6 @@
 <script>
 import {
-  GlDropdown,
+  GlDisclosureDropdown,
   GlTooltipDirective,
   GlIcon,
   GlLink,
@@ -24,7 +24,6 @@ import PinComponent from './environment_pin.vue';
 import RollbackComponent from './environment_rollback.vue';
 import StopComponent from './environment_stop.vue';
 import TerminalButtonComponent from './environment_terminal_button.vue';
-
 /**
  * Environment Item Component
  *
@@ -36,7 +35,7 @@ export default {
     ActionsComponent,
     CommitComponent,
     ExternalUrlComponent,
-    GlDropdown,
+    GlDisclosureDropdown,
     GlBadge,
     GlIcon,
     GlLink,
@@ -820,13 +819,13 @@ export default {
           data-track-label="environment_stop"
         />
 
-        <gl-dropdown
-          v-if="hasExtraActions"
-          icon="ellipsis_v"
+        <gl-disclosure-dropdown
           text-sr-only
-          :text="__('More actions')"
-          category="secondary"
           no-caret
+          icon="ellipsis_v"
+          category="secondary"
+          placement="right"
+          :toggle-text="__('More actions')"
         >
           <rollback-component
             v-if="canRetry"
@@ -857,7 +856,7 @@ export default {
             data-track-action="click_button"
             data-track-label="environment_delete"
           />
-        </gl-dropdown>
+        </gl-disclosure-dropdown>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/environments/components/kubernetes_status_bar.vue b/app/assets/javascripts/environments/components/kubernetes_status_bar.vue
index e8857dfe459..c603d83db9c 100644
--- a/app/assets/javascripts/environments/components/kubernetes_status_bar.vue
+++ b/app/assets/javascripts/environments/components/kubernetes_status_bar.vue
@@ -145,15 +145,20 @@ export default {
     syncStatusBadge() {
       if (!this.fluxCRD.length && this.fluxApiError) {
         return { ...SYNC_STATUS_BADGES.unavailable, popoverText: this.fluxApiError };
-      } else if (!this.fluxCRD.length) {
+      }
+      if (!this.fluxCRD.length) {
         return SYNC_STATUS_BADGES.unavailable;
-      } else if (this.fluxAnyFailed) {
+      }
+      if (this.fluxAnyFailed) {
         return { ...SYNC_STATUS_BADGES.failed, popoverText: this.fluxAnyFailed.message };
-      } else if (this.fluxAnyStalled) {
+      }
+      if (this.fluxAnyStalled) {
         return { ...SYNC_STATUS_BADGES.stalled, popoverText: this.fluxAnyStalled.message };
-      } else if (this.fluxAnyReconciling) {
+      }
+      if (this.fluxAnyReconciling) {
         return SYNC_STATUS_BADGES.reconciling;
-      } else if (this.fluxAnyReconciled) {
+      }
+      if (this.fluxAnyReconciled) {
         return SYNC_STATUS_BADGES.reconciled;
       }
       return SYNC_STATUS_BADGES.unknown;
diff --git a/app/assets/javascripts/environments/components/new_environment_item.vue b/app/assets/javascripts/environments/components/new_environment_item.vue
index 2148343f690..149cab21acd 100644
--- a/app/assets/javascripts/environments/components/new_environment_item.vue
+++ b/app/assets/javascripts/environments/components/new_environment_item.vue
@@ -14,7 +14,6 @@ import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import isLastDeployment from '../graphql/queries/is_last_deployment.query.graphql';
 import getEnvironmentClusterAgent from '../graphql/queries/environment_cluster_agent.query.graphql';
-import getEnvironmentClusterAgentWithFluxResource from '../graphql/queries/environment_cluster_agent_with_flux_resource.query.graphql';
 import ExternalUrl from './environment_external_url.vue';
 import Actions from './environment_actions.vue';
 import StopComponent from './environment_stop.vue';
@@ -165,9 +164,6 @@ export default {
     rolloutStatus() {
       return this.environment?.rolloutStatus;
     },
-    isFluxResourceAvailable() {
-      return this.glFeatures?.fluxResourceForEnvironment;
-    },
   },
   methods: {
     toggleEnvironmentCollapse() {
@@ -185,9 +181,7 @@ export default {
           return { environmentName: this.environment.name, projectFullPath: this.projectPath };
         },
         query() {
-          return this.isFluxResourceAvailable
-            ? getEnvironmentClusterAgentWithFluxResource
-            : getEnvironmentClusterAgent;
+          return getEnvironmentClusterAgent;
         },
         update(data) {
           this.clusterAgent = data?.project?.environment?.clusterAgent;
diff --git a/app/assets/javascripts/environments/environment_details/deployments_table.vue b/app/assets/javascripts/environments/environment_details/deployments_table.vue
index f37f93798ae..261d8106438 100644
--- a/app/assets/javascripts/environments/environment_details/deployments_table.vue
+++ b/app/assets/javascripts/environments/environment_details/deployments_table.vue
@@ -36,7 +36,7 @@ export default {
       <deployment-status-link :deployment-job="item.job" :status="item.status" />
     </template>
     <template #cell(id)="{ item }">
-      <strong>{{ item.id }}</strong>
+      <strong data-testid="deployment-id">{{ item.id }}</strong>
     </template>
     <template #cell(triggerer)="{ item }">
       <deployment-triggerer :triggerer="item.triggerer" />
diff --git a/app/assets/javascripts/environments/graphql/queries/environment.query.graphql b/app/assets/javascripts/environments/graphql/queries/environment.query.graphql
index 53dfe5303f3..2d6faed5c88 100644
--- a/app/assets/javascripts/environments/graphql/queries/environment.query.graphql
+++ b/app/assets/javascripts/environments/graphql/queries/environment.query.graphql
@@ -6,6 +6,7 @@ query getEnvironment($projectFullPath: ID!, $environmentName: String) {
       name
       externalUrl
       kubernetesNamespace
+      fluxResourcePath
       clusterAgent {
         id
         name
diff --git a/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent.query.graphql b/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent.query.graphql
index 19374ae7a81..3f8874f2a8d 100644
--- a/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent.query.graphql
+++ b/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent.query.graphql
@@ -3,6 +3,7 @@ query getEnvironmentClusterAgent($projectFullPath: ID!, $environmentName: String
     id
     environment(name: $environmentName) {
       id
+      fluxResourcePath
       kubernetesNamespace
       clusterAgent {
         id
diff --git a/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent_with_flux_resource.query.graphql b/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent_with_flux_resource.query.graphql
deleted file mode 100644
index 80363a06d42..00000000000
--- a/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent_with_flux_resource.query.graphql
+++ /dev/null
@@ -1,21 +0,0 @@
-query getEnvironmentClusterAgentWithFluxResource($projectFullPath: ID!, $environmentName: String) {
-  project(fullPath: $projectFullPath) {
-    id
-    environment(name: $environmentName) {
-      id
-      kubernetesNamespace
-      fluxResourcePath
-      clusterAgent {
-        id
-        name
-        webPath
-        tokens {
-          nodes {
-            id
-            lastUsedAt
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/app/assets/javascripts/environments/graphql/queries/environment_with_flux_resource.query.graphql b/app/assets/javascripts/environments/graphql/queries/environment_with_flux_resource.query.graphql
deleted file mode 100644
index 166cd64189f..00000000000
--- a/app/assets/javascripts/environments/graphql/queries/environment_with_flux_resource.query.graphql
+++ /dev/null
@@ -1,16 +0,0 @@
-query getEnvironmentWithFluxResource($projectFullPath: ID!, $environmentName: String) {
-  project(fullPath: $projectFullPath) {
-    id
-    environment(name: $environmentName) {
-      id
-      name
-      externalUrl
-      kubernetesNamespace
-      fluxResourcePath
-      clusterAgent {
-        id
-        name
-      }
-    }
-  }
-}
diff --git a/app/assets/javascripts/environments/mixins/environments_pagination_api_mixin.js b/app/assets/javascripts/environments/mixins/environments_pagination_api_mixin.js
index 55e2536e283..a64cc0405bb 100644
--- a/app/assets/javascripts/environments/mixins/environments_pagination_api_mixin.js
+++ b/app/assets/javascripts/environments/mixins/environments_pagination_api_mixin.js
@@ -3,7 +3,7 @@
  *
  * Components need to have `scope`, `page` and `requestData`
  */
-import { validateParams } from '~/pipelines/utils';
+import { validateParams } from '~/ci/pipeline_details/utils';
 import { historyPushState, buildUrlWithCurrentLocation } from '~/lib/utils/common_utils';
 
 export default {
diff --git a/app/assets/javascripts/environments/mount_show.js b/app/assets/javascripts/environments/mount_show.js
index fb9a7a02d07..9924e1c7d7b 100644
--- a/app/assets/javascripts/environments/mount_show.js
+++ b/app/assets/javascripts/environments/mount_show.js
@@ -59,9 +59,6 @@ export const initHeader = () => {
 };
 
 export const initPage = async () => {
-  if (!gon.features.environmentDetailsVue) {
-    return null;
-  }
   const EnvironmentsDetailPageModule = await import('./environment_details/index.vue');
   const EnvironmentsDetailPage = EnvironmentsDetailPageModule.default;
   const dataElement = document.getElementById('environments-detail-view');