Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop.yml

@@ -1128,6 +1128,7 @@ Search/NamespacedClass:
   Enabled: true
   Exclude:
     - 'config/**/*.rb'
+    - 'ee/config/**/*.rb'
     - 'db/**/*.rb'
     - 'ee/db/**/*.rb'
     - 'ee/bin/**/*'

.rubocop_todo/gitlab/avoid_gitlab_instance_checks.yml

@@ -27,7 +27,6 @@ Gitlab/AvoidGitlabInstanceChecks:
     - 'config/initializers/active_record_transaction_observer.rb'
     - 'config/initializers/active_record_transaction_patches.rb'
     - 'config/initializers/check_forced_decomposition.rb'
-    - 'config/initializers/gitlab_suggested_reviewers_secret.rb'
     - 'config/initializers/rack_multipart_patch.rb'
     - 'config/initializers/validate_puma.rb'
     - 'config/initializers/warden.rb'
@@ -77,6 +76,7 @@ Gitlab/AvoidGitlabInstanceChecks:
     - 'ee/app/workers/gitlab_subscriptions/refresh_seats_worker.rb'
     - 'ee/app/workers/gitlab_subscriptions/schedule_refresh_seats_worker.rb'
     - 'ee/app/workers/update_all_mirrors_worker.rb'
+    - 'ee/config/initializers/gitlab_suggested_reviewers_secret.rb'
     - 'ee/lib/api/code_suggestions.rb'
     - 'ee/lib/api/scim/instance_scim.rb'
     - 'ee/lib/ee/api/namespaces.rb'

.rubocop_todo/layout/line_length.yml

@@ -573,7 +573,6 @@ Layout/LineLength:
     - 'config/initializers/devise_dynamic_password_length_validation.rb'
     - 'config/initializers/direct_upload_support.rb'
     - 'config/initializers/doorkeeper.rb'
-    - 'config/initializers/elastic_client_setup.rb'
     - 'config/initializers/google_api_client.rb'
     - 'config/initializers/kaminari_active_record_relation_methods_with_limit.rb'
     - 'config/initializers/pages_storage_check.rb'
@@ -958,6 +957,7 @@ Layout/LineLength:
     - 'ee/app/workers/repository_update_mirror_worker.rb'
     - 'ee/app/workers/security/orchestration_policy_rule_schedule_namespace_worker.rb'
     - 'ee/app/workers/security/orchestration_policy_rule_schedule_worker.rb'
+    - 'ee/config/initializers/elastic_client_setup.rb'
     - 'ee/config/routes/group.rb'
     - 'ee/config/routes/project.rb'
     - 'ee/db/fixtures/development/20_burndown.rb'

.rubocop_todo/lint/constant_definition_in_block.yml

@@ -6,7 +6,6 @@ Lint/ConstantDefinitionInBlock:
     - 'app/workers/concerns/worker_context.rb'
     - 'config/application.rb'
     - 'config/initializers/direct_upload_support.rb'
-    - 'config/initializers/elastic_client_setup.rb'
     - 'ee/app/graphql/ee/types/work_items/widget_interface.rb'
     - 'ee/app/models/concerns/ee/issuable_link.rb'
     - 'ee/app/models/ee/application_setting.rb'
@@ -22,6 +21,7 @@ Lint/ConstantDefinitionInBlock:
     - 'ee/app/models/ee/user.rb'
     - 'ee/app/models/ee/vulnerability.rb'
     - 'ee/app/services/ee/notes/quick_actions_service.rb'
+    - 'ee/config/initializers/elastic_client_setup.rb'
     - 'ee/lib/gitlab/subscription_portal/clients/rest.rb'
     - 'ee/lib/tasks/geo.rake'
     - 'ee/spec/db/schema_support.rb'

.rubocop_todo/style/if_unless_modifier.yml

@@ -238,7 +238,6 @@ Style/IfUnlessModifier:
     - 'config/initializers/default_url_options.rb'
     - 'config/initializers/direct_upload_support.rb'
     - 'config/initializers/doorkeeper.rb'
-    - 'config/initializers/geo.rb'
     - 'config/initializers/google_api_client.rb'
     - 'config/initializers/jira.rb'
     - 'config/initializers/kaminari_active_record_relation_methods_with_limit.rb'

GITLAB_KAS_VERSION

@@ -1 +1 @@
-b595a368555ce8d92856d0bccbc3b73638cce63d
+544867d98264184574c73d9f23985dead631594c

Gemfile.checksum

@@ -746,7 +746,7 @@
 {"name":"unf_ext","version":"0.0.8.2","platform":"x64-mingw32","checksum":"f7e4c01774c91eb22e30d53dfc40ffbbb5a175f785c8f6f1be17ad96a0b29ed0"},
 {"name":"unf_ext","version":"0.0.8.2","platform":"x86-mingw32","checksum":"6d44c13c98924bebd15ebdd4ed196ead403a0770ac03304570873349fda2a208"},
 {"name":"unicode-display_width","version":"2.4.2","platform":"ruby","checksum":"6a10205d1a19ca790c4e53064ba93f09d9eb234bf6bd135d9deb6001c21428be"},
-{"name":"unicode-emoji","version":"3.6.0","platform":"ruby","checksum":"9d333b0bec74bbf0992b77ce59c809b762f0d1b4018ea454f524491fabc8e5ec"},
+{"name":"unicode-emoji","version":"3.7.0","platform":"ruby","checksum":"e72131357cffc199c2ecce64e2f9daa6a922944fd2f955aae0702708bda423ff"},
 {"name":"unicode-version","version":"1.4.0","platform":"ruby","checksum":"56409a354a042df2e9acd547f58f81c6ee24839560b47f4907b1c097b6677563"},
 {"name":"unicode_utils","version":"1.4.0","platform":"ruby","checksum":"b922d0cf2313b6b7136ada6645ce7154ffc86418ca07d53b058efe9eb72f2a40"},
 {"name":"uniform_notifier","version":"1.16.0","platform":"ruby","checksum":"99b39ee4a0864e3b49f375b5e5803eb26d35ed6eb1719c96407573a87bc4dbb5"},

Gemfile.lock

@@ -1876,7 +1876,7 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
-    unicode-emoji (3.6.0)
+    unicode-emoji (3.7.0)
       unicode-version (~> 1.0)
     unicode-version (1.4.0)
     unicode_utils (1.4.0)

Gemfile.next.checksum

@@ -761,7 +761,7 @@
 {"name":"unf_ext","version":"0.0.8.2","platform":"x64-mingw32","checksum":"f7e4c01774c91eb22e30d53dfc40ffbbb5a175f785c8f6f1be17ad96a0b29ed0"},
 {"name":"unf_ext","version":"0.0.8.2","platform":"x86-mingw32","checksum":"6d44c13c98924bebd15ebdd4ed196ead403a0770ac03304570873349fda2a208"},
 {"name":"unicode-display_width","version":"2.4.2","platform":"ruby","checksum":"6a10205d1a19ca790c4e53064ba93f09d9eb234bf6bd135d9deb6001c21428be"},
-{"name":"unicode-emoji","version":"3.6.0","platform":"ruby","checksum":"9d333b0bec74bbf0992b77ce59c809b762f0d1b4018ea454f524491fabc8e5ec"},
+{"name":"unicode-emoji","version":"3.7.0","platform":"ruby","checksum":"e72131357cffc199c2ecce64e2f9daa6a922944fd2f955aae0702708bda423ff"},
 {"name":"unicode-version","version":"1.4.0","platform":"ruby","checksum":"56409a354a042df2e9acd547f58f81c6ee24839560b47f4907b1c097b6677563"},
 {"name":"unicode_utils","version":"1.4.0","platform":"ruby","checksum":"b922d0cf2313b6b7136ada6645ce7154ffc86418ca07d53b058efe9eb72f2a40"},
 {"name":"uniform_notifier","version":"1.16.0","platform":"ruby","checksum":"99b39ee4a0864e3b49f375b5e5803eb26d35ed6eb1719c96407573a87bc4dbb5"},

Gemfile.next.lock

@@ -1903,7 +1903,7 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
-    unicode-emoji (3.6.0)
+    unicode-emoji (3.7.0)
       unicode-version (~> 1.0)
     unicode-version (1.4.0)
     unicode_utils (1.4.0)

app/assets/javascripts/ml/model_registry/apps/index_ml_models.vue

@@ -1,30 +1,27 @@
 <script>
-import { GlButton, GlExperimentBadge } from '@gitlab/ui';
-import MetadataItem from '~/vue_shared/components/registry/metadata_item.vue';
+import { GlButton, GlExperimentBadge, GlIcon } from '@gitlab/ui';
 import TitleArea from '~/vue_shared/components/registry/title_area.vue';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
 import { s__ } from '~/locale';
 import EmptyState from '../components/model_list_empty_state.vue';
 import * as i18n from '../translations';
 import { BASE_SORT_FIELDS } from '../constants';
-import ModelRow from '../components/model_row.vue';
 import ActionsDropdown from '../components/actions_dropdown.vue';
 import getModelsQuery from '../graphql/queries/get_models.query.graphql';
 import { makeLoadModelErrorMessage } from '../translations';
-import SearchableList from '../components/searchable_list.vue';
+import SearchableTable from '../components/searchable_table.vue';
 
 export default {
   name: 'IndexMlModels',
   components: {
-    ModelRow,
-    MetadataItem,
+    GlIcon,
     TitleArea,
     GlButton,
     GlExperimentBadge,
     EmptyState,
     ActionsDropdown,
-    SearchableList,
+    SearchableTable,
   },
   provide() {
     return {
@@ -144,7 +141,10 @@ export default {
         </div>
       </template>
       <template #metadata-models-count>
-        <metadata-item icon="machine-learning" :text="$options.i18n.modelsCountLabel(count)" />
+        <div class="detail-page-header-body gl-flex-wrap gl-gap-x-2" data-testid="metadata-item">
+          <gl-icon name="machine-learning" />
+          {{ $options.i18n.modelsCountLabel(count) }}
+        </div>
       </template>
       <template #right-actions>
         <gl-button
@@ -158,13 +158,14 @@ export default {
         <actions-dropdown />
       </template>
     </title-area>
-    <searchable-list
+    <searchable-table
       show-search
       :page-info="pageInfo"
-      :items="items"
+      :models="items"
       :error-message="errorMessage"
       :is-loading="isLoading"
       :sortable-fields="$options.sortableFields"
+      can-write-model-registry
       @fetch-page="fetchPage"
     >
       <template #empty-state>
@@ -175,10 +176,6 @@ export default {
           :primary-link="createModelPath"
         />
       </template>
-
-      <template #item="{ item }">
-        <model-row :model="item" />
-      </template>
-    </searchable-list>
+    </searchable-table>
   </div>
 </template>

app/assets/javascripts/ml/model_registry/components/models_table.vue

@@ -0,0 +1,74 @@
+<script>
+import { GlAvatarLink, GlAvatar, GlTable, GlLink, GlTooltip } from '@gitlab/ui';
+import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+import { s__ } from '~/locale';
+
+export default {
+  name: 'ModelsTable',
+  components: {
+    GlAvatarLink,
+    GlTable,
+    TimeAgoTooltip,
+    GlAvatar,
+    GlLink,
+  },
+  directives: {
+    GlTooltip,
+  },
+  props: {
+    items: {
+      type: Array,
+      required: true,
+    },
+  },
+  computed: {
+    tableFields() {
+      return [
+        { key: 'name', label: s__('ModelRegistry|Model name'), thClass: 'gl-w-1/4' },
+        { key: 'latestVersion', label: s__('ModelRegistry|Latest version'), thClass: 'gl-w-1/4' },
+        { key: 'author', label: s__('ModelRegistry|Author'), thClass: 'gl-w-1/4' },
+        { key: 'createdAt', label: s__('ModelRegistry|Created'), thClass: 'gl-w-1/4' },
+      ];
+    },
+  },
+  methods: {
+    versionLabel(item) {
+      return item.versionCount === 1 ? s__('ModelRegistry|version') : s__('ModelRegistry|versions');
+    },
+    showLatestVersion(item) {
+      return item.latestVersion && item.latestVersion._links;
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-table class="fixed" :sticky-header="false" :items="items" :fields="tableFields" stacked="sm">
+    <template #cell(name)="{ item }">
+      <gl-link :href="item._links.showPath">
+        {{ item.name }}
+      </gl-link>
+    </template>
+    <template #cell(latestVersion)="{ item }">
+      <gl-link v-if="showLatestVersion(item)" :href="item.latestVersion._links.showPath">
+        {{ item.latestVersion.version }}
+      </gl-link>
+      <span v-if="item.latestVersion" class="gl-text-subtle"> · </span>
+      <span class="gl-text-subtle">{{ item.versionCount }} {{ versionLabel(item) }}</span>
+    </template>
+    <template #cell(author)="{ item: { author } }">
+      <gl-avatar-link
+        v-if="author"
+        :href="author.webUrl"
+        :title="author.name"
+        class="js-user-link gl-text-subtle"
+      >
+        <gl-avatar :src="author.avatarUrl" :size="16" :entity-name="author.name" class="mr-2" />
+        {{ author.name }}
+      </gl-avatar-link>
+    </template>
+    <template #cell(createdAt)="{ item: { createdAt } }">
+      <time-ago-tooltip v-if="createdAt" :time="createdAt" />
+    </template>
+  </gl-table>
+</template>

app/assets/javascripts/ml/model_registry/components/searchable_table.vue

@@ -5,6 +5,7 @@ import { GRAPHQL_PAGE_SIZE, LIST_KEY_CREATED_AT } from '~/ml/model_registry/cons
 import { queryToObject, setUrlParams, updateHistory } from '~/lib/utils/url_utility';
 import { FILTERED_SEARCH_TERM } from '~/vue_shared/components/filtered_search_bar/constants';
 import LoadOrErrorOrShow from '~/ml/model_registry/components/load_or_error_or_show.vue';
+import ModelsTable from '~/ml/model_registry/components/models_table.vue';
 import ModelVersionsTable from '~/ml/model_registry/components/model_versions_table.vue';
 
 export default {
@@ -13,6 +14,7 @@ export default {
     RegistrySearch,
     LoadOrErrorOrShow,
     GlKeysetPagination,
+    ModelsTable,
     ModelVersionsTable,
   },
   directives: {
@@ -21,7 +23,13 @@ export default {
   props: {
     modelVersions: {
       type: Array,
-      required: true,
+      required: false,
+      default: () => [],
+    },
+    models: {
+      type: Array,
+      required: false,
+      default: () => [],
     },
     pageInfo: {
       type: Object,
@@ -70,10 +78,13 @@ export default {
   },
   computed: {
     isModelVersionsEmpty() {
-      return this.modelVersions && this.modelVersions.length === 0;
+      return this.modelVersions.length === 0;
+    },
+    isModelsEmpty() {
+      return this.models.length === 0;
     },
     isListEmpty() {
-      return this.isModelVersionsEmpty;
+      return this.isModelVersionsEmpty && this.isModelsEmpty;
     },
     parsedQuery() {
       const name = this.filters
@@ -151,7 +162,8 @@ export default {
     />
     <load-or-error-or-show :is-loading="isLoading" :error-message="errorMessage">
       <slot v-if="isListEmpty" name="empty-state"></slot>
-      <model-versions-table v-else-if="modelVersions" :items="modelVersions" />
+      <model-versions-table v-else-if="!isModelVersionsEmpty" :items="modelVersions" />
+      <models-table v-else-if="!isModelsEmpty" :items="models" />
       <gl-keyset-pagination
         v-if="pageInfo.hasPreviousPage || pageInfo.hasNextPage"
         v-bind="pageInfo"

app/assets/javascripts/ml/model_registry/constants.js

@@ -12,7 +12,7 @@ export const BASE_SORT_FIELDS = Object.freeze([
   },
   {
     orderBy: LIST_KEY_CREATED_AT,
-    label: s__('MlExperimentTracking|Created at'),
+    label: s__('MlExperimentTracking|Created'),
   },
 ]);
 

app/assets/javascripts/ml/model_registry/graphql/queries/get_models.query.graphql

@@ -27,6 +27,12 @@ query getModels(
         name
         versionCount
         createdAt
+        author {
+          id
+          name
+          webUrl
+          avatarUrl
+        }
         latestVersion {
           id
           version