Merge branch '212867-clean-up-dependency_list_ui-for-table' into 'master'

Remove feature flag from dependencies table

See merge request gitlab-org/gitlab!31079

ee/app/assets/javascripts/dependencies/components/dependencies_table.vue

@@ -2,8 +2,6 @@
 import { cloneDeep } from 'lodash';
 import { GlBadge, GlIcon, GlLink, GlButton, GlSkeletonLoading, GlTable } from '@gitlab/ui';
 import { s__ } from '~/locale';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import DependenciesTableRow from './dependencies_table_row.vue';
 import DependencyLicenseLinks from './dependency_license_links.vue';
 import DependencyVulnerabilities from './dependency_vulnerabilities.vue';
 
@@ -26,7 +24,6 @@ const tdClass = (value, key, item) => {
 export default {
   name: 'DependenciesTable',
   components: {
-    DependenciesTableRow,
     DependencyLicenseLinks,
     DependencyVulnerabilities,
     GlBadge,
@@ -36,7 +33,6 @@ export default {
     GlSkeletonLoading,
     GlTable,
   },
-  mixins: [glFeatureFlagsMixin()],
   props: {
     dependencies: {
       type: Array,
@@ -48,18 +44,8 @@ export default {
     },
   },
   data() {
-    const tableSections = [
-      { className: 'section-20', label: s__('Dependencies|Status') },
-      { className: 'section-20', label: s__('Dependencies|Component') },
-      { className: 'section-10', label: s__('Dependencies|Version') },
-      { className: 'section-20', label: s__('Dependencies|Packager') },
-      { className: 'section-15', label: s__('Dependencies|Location') },
-      { className: 'section-15', label: s__('Dependencies|License') },
-    ];
-
     return {
       localDependencies: this.transformDependenciesForUI(this.dependencies),
-      tableSections,
     };
   },
   computed: {
@@ -96,7 +82,6 @@ export default {
   <!-- tbody- and thead-class props can be removed when
     https://gitlab.com/gitlab-org/gitlab/-/issues/213324 is fixed -->
   <gl-table
-    v-if="glFeatures.dependencyListUi"
     :fields="$options.fields"
     :items="localDependencies"
     :busy="isLoading"
@@ -168,25 +153,4 @@ export default {
       </div>
     </template>
   </gl-table>
-
-  <div v-else>
-    <div class="gl-responsive-table-row table-row-header text-2 bg-secondary-50 px-2" role="row">
-      <div
-        v-for="(section, index) in tableSections"
-        :key="index"
-        class="table-section"
-        :class="section.className"
-        role="rowheader"
-      >
-        {{ section.label }}
-      </div>
-    </div>
-
-    <dependencies-table-row
-      v-for="(dependency, index) in dependencies"
-      :key="index"
-      :dependency="dependency"
-      :is-loading="isLoading"
-    />
-  </div>
 </template>

ee/spec/frontend/dependencies/components/__snapshots__/dependencies_table_spec.js.snap

-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`DependenciesTable component given a list of dependencies (loaded) matches the snapshot 1`] = `
-<div>
-  <div
-    class="gl-responsive-table-row table-row-header text-2 bg-secondary-50 px-2"
-    role="row"
-  >
-    <div
-      class="table-section section-20"
-      role="rowheader"
-    >
-      
-      Status
-    
-    </div>
-    <div
-      class="table-section section-20"
-      role="rowheader"
-    >
-      
-      Component
-    
-    </div>
-    <div
-      class="table-section section-10"
-      role="rowheader"
-    >
-      
-      Version
-    
-    </div>
-    <div
-      class="table-section section-20"
-      role="rowheader"
-    >
-      
-      Packager
-    
-    </div>
-    <div
-      class="table-section section-15"
-      role="rowheader"
-    >
-      
-      Location
-    
-    </div>
-    <div
-      class="table-section section-15"
-      role="rowheader"
-    >
-      
-      License
-    
-    </div>
-  </div>
-   
-  <dependencies-table-row-stub
-    dependency="[object Object]"
-  />
-  <dependencies-table-row-stub
-    dependency="[object Object]"
-  />
-</div>
-`;
-
-exports[`DependenciesTable component given a list of dependencies (loading) matches the snapshot 1`] = `
-<div>
-  <div
-    class="gl-responsive-table-row table-row-header text-2 bg-secondary-50 px-2"
-    role="row"
-  >
-    <div
-      class="table-section section-20"
-      role="rowheader"
-    >
-      
-      Status
-    
-    </div>
-    <div
-      class="table-section section-20"
-      role="rowheader"
-    >
-      
-      Component
-    
-    </div>
-    <div
-      class="table-section section-10"
-      role="rowheader"
-    >
-      
-      Version
-    
-    </div>
-    <div
-      class="table-section section-20"
-      role="rowheader"
-    >
-      
-      Packager
-    
-    </div>
-    <div
-      class="table-section section-15"
-      role="rowheader"
-    >
-      
-      Location
-    
-    </div>
-    <div
-      class="table-section section-15"
-      role="rowheader"
-    >
-      
-      License
-    
-    </div>
-  </div>
-   
-  <dependencies-table-row-stub
-    dependency="[object Object]"
-    isloading="true"
-  />
-  <dependencies-table-row-stub
-    dependency="[object Object]"
-    isloading="true"
-  />
-</div>
-`;
-
-exports[`DependenciesTable component given an empty list of dependencies matches the snapshot 1`] = `
-<div>
-  <div
-    class="gl-responsive-table-row table-row-header text-2 bg-secondary-50 px-2"
-    role="row"
-  >
-    <div
-      class="table-section section-20"
-      role="rowheader"
-    >
-      
-      Status
-    
-    </div>
-    <div
-      class="table-section section-20"
-      role="rowheader"
-    >
-      
-      Component
-    
-    </div>
-    <div
-      class="table-section section-10"
-      role="rowheader"
-    >
-      
-      Version
-    
-    </div>
-    <div
-      class="table-section section-20"
-      role="rowheader"
-    >
-      
-      Packager
-    
-    </div>
-    <div
-      class="table-section section-15"
-      role="rowheader"
-    >
-      
-      Location
-    
-    </div>
-    <div
-      class="table-section section-15"
-      role="rowheader"
-    >
-      
-      License
-    
-    </div>
-  </div>
-   
-</div>
-`;