diff options
Diffstat (limited to 'app/assets/javascripts/repository/components/table')
-rw-r--r-- | app/assets/javascripts/repository/components/table/index.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/repository/components/table/row.vue | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue index 69eefc807d7..10a30bd44b1 100644 --- a/app/assets/javascripts/repository/components/table/index.vue +++ b/app/assets/javascripts/repository/components/table/index.vue @@ -100,9 +100,9 @@ export default { /> <template v-for="val in entries"> <table-row - v-for="entry in val" + v-for="(entry, index) in val" :id="entry.id" - :key="`${entry.flatPath}-${entry.id}`" + :key="`${entry.flatPath}-${entry.id}-${index}`" :sha="entry.sha" :project-path="projectPath" :current-path="path" diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue index fa358a75cc1..009dd19b4a5 100644 --- a/app/assets/javascripts/repository/components/table/row.vue +++ b/app/assets/javascripts/repository/components/table/row.vue @@ -1,5 +1,4 @@ <script> -/* eslint-disable vue/no-v-html */ import { GlBadge, GlLink, @@ -11,6 +10,7 @@ import { } from '@gitlab/ui'; import { escapeRegExp } from 'lodash'; import filesQuery from 'shared_queries/repository/files.query.graphql'; +import paginatedTreeQuery from 'shared_queries/repository/paginated_tree.query.graphql'; import { escapeFileUrl } from '~/lib/utils/url_utility'; import { TREE_PAGE_SIZE } from '~/repository/constants'; import FileIcon from '~/vue_shared/components/file_icon.vue'; @@ -154,7 +154,8 @@ export default { return this.isFolder ? this.loadFolder() : this.loadBlob(); }, loadFolder() { - this.apolloQuery(filesQuery, { + const query = this.glFeatures.paginatedTreeGraphqlQuery ? paginatedTreeQuery : filesQuery; + this.apolloQuery(query, { projectPath: this.projectPath, ref: this.ref, path: this.path, @@ -230,7 +231,7 @@ export default { :href="commit.commitPath" :title="commit.message" class="str-truncated-100 tree-commit-link" - v-html="commit.titleHtml" + v-html="commit.titleHtml /* eslint-disable-line vue/no-v-html */" /> <gl-skeleton-loading v-else :lines="1" class="h-auto" /> </td> |