diff options
Diffstat (limited to 'app/assets/javascripts/projects')
6 files changed, 27 insertions, 25 deletions
diff --git a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue index ccecc914cf1..0feaf8db82b 100644 --- a/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue +++ b/app/assets/javascripts/projects/commit_box/info/components/commit_box_pipeline_status.vue @@ -1,6 +1,6 @@ <script> -import { GlLoadingIcon, GlLink } from '@gitlab/ui'; -import CiIcon from '~/vue_shared/components/ci_icon.vue'; +import { GlLoadingIcon } from '@gitlab/ui'; +import CiBadgeLink from '~/vue_shared/components/ci_badge_link.vue'; import { createAlert } from '~/alert'; import { getQueryHeaders, toggleQueryPollingByVisibility } from '~/ci/pipeline_details/graph/utils'; import getLatestPipelineStatusQuery from '../graphql/queries/get_latest_pipeline_status.query.graphql'; @@ -9,9 +9,8 @@ import { COMMIT_BOX_POLL_INTERVAL, PIPELINE_STATUS_FETCH_ERROR } from '../consta export default { PIPELINE_STATUS_FETCH_ERROR, components: { - CiIcon, + CiBadgeLink, GlLoadingIcon, - GlLink, }, inject: { fullPath: { @@ -64,8 +63,12 @@ export default { <template> <div class="gl-display-inline-block gl-vertical-align-middle gl-mr-2"> <gl-loading-icon v-if="loading" /> - <gl-link v-else :href="pipelineStatus.detailsPath"> - <ci-icon :status="pipelineStatus" :size="24" /> - </gl-link> + <ci-badge-link + v-else + :status="pipelineStatus" + :details-path="pipelineStatus.detailsPath" + size="md" + :show-text="false" + /> </div> </template> diff --git a/app/assets/javascripts/projects/components/shared/delete_button.vue b/app/assets/javascripts/projects/components/shared/delete_button.vue index c749034d2a8..b290b2b085f 100644 --- a/app/assets/javascripts/projects/components/shared/delete_button.vue +++ b/app/assets/javascripts/projects/components/shared/delete_button.vue @@ -87,7 +87,7 @@ export default { <gl-button category="primary" variant="danger" - data-qa-selector="delete_button" + data-testid="delete-button" @click="onButtonClick" >{{ $options.i18n.deleteProject }}</gl-button > diff --git a/app/assets/javascripts/projects/project_find_file.js b/app/assets/javascripts/projects/project_find_file.js index a8b884a68a0..711a8278e07 100644 --- a/app/assets/javascripts/projects/project_find_file.js +++ b/app/assets/javascripts/projects/project_find_file.js @@ -50,8 +50,6 @@ export default class ProjectFindFile { this.initEvent(); // focus text input box this.inputElement.focus(); - // load file list - this.load(this.options.url); } initEvent() { @@ -110,7 +108,14 @@ export default class ProjectFindFile { if (searchText) { matches = fuzzaldrinPlus.match(filePath, searchText); } - const blobItemUrl = joinPaths(this.options.blobUrlTemplate, escapeFileUrl(filePath)); + + let blobItemUrl = joinPaths(this.options.blobUrlTemplate, escapeFileUrl(filePath)); + + if (this.options.refType) { + const blobUrlObject = new URL(blobItemUrl, window.location.origin); + blobUrlObject.searchParams.append('ref_type', this.options.refType); + blobItemUrl = blobUrlObject.toString(); + } const html = ProjectFindFile.makeHtml(filePath, matches, blobItemUrl); results.push(this.element.find('.tree-table > tbody').append(html)); } diff --git a/app/assets/javascripts/projects/settings/api/access_dropdown_api.js b/app/assets/javascripts/projects/settings/api/access_dropdown_api.js index b886bf43b57..df99aac6b9e 100644 --- a/app/assets/javascripts/projects/settings/api/access_dropdown_api.js +++ b/app/assets/javascripts/projects/settings/api/access_dropdown_api.js @@ -1,9 +1,7 @@ -import Api from '~/api'; import axios from '~/lib/utils/axios_utils'; -import { ACCESS_LEVEL_DEVELOPER_INTEGER } from '~/access_level/constants'; -const GROUPS_PATH = '/-/autocomplete/project_groups.json'; const USERS_PATH = '/-/autocomplete/users.json'; +const GROUPS_PATH = '/-/autocomplete/project_groups.json'; const DEPLOY_KEYS_PATH = '/-/autocomplete/deploy_keys_with_owners.json'; const buildUrl = (urlRoot, url) => { @@ -28,14 +26,10 @@ export const getUsers = (query, states) => { }; export const getGroups = () => { - if (gon.current_project_id) { - return Api.projectGroups(gon.current_project_id, { - with_shared: true, - shared_min_access_level: ACCESS_LEVEL_DEVELOPER_INTEGER, - }); - } - return axios.get(buildUrl(gon.relative_url_root || '', GROUPS_PATH)).then(({ data }) => { - return data; + return axios.get(buildUrl(gon.relative_url_root || '', GROUPS_PATH), { + params: { + project_id: gon.current_project_id, + }, }); }; diff --git a/app/assets/javascripts/projects/settings/components/access_dropdown.vue b/app/assets/javascripts/projects/settings/components/access_dropdown.vue index ca24e948f69..2dd7633e2c8 100644 --- a/app/assets/javascripts/projects/settings/components/access_dropdown.vue +++ b/app/assets/javascripts/projects/settings/components/access_dropdown.vue @@ -229,10 +229,10 @@ export default { Promise.all([ getDeployKeys(this.query), getUsers(this.query), - this.groups.length ? Promise.resolve(this.groups) : getGroups(), + this.groups.length ? Promise.resolve({ data: this.groups }) : getGroups(), ]) .then(([deployKeysResponse, usersResponse, groupsResponse]) => { - this.consolidateData(deployKeysResponse.data, usersResponse.data, groupsResponse); + this.consolidateData(deployKeysResponse.data, usersResponse.data, groupsResponse.data); this.setSelected({ initial }); }) .catch(() => diff --git a/app/assets/javascripts/projects/settings/components/transfer_project_form.vue b/app/assets/javascripts/projects/settings/components/transfer_project_form.vue index fd5fabd7c8a..a426d6d7bb8 100644 --- a/app/assets/javascripts/projects/settings/components/transfer_project_form.vue +++ b/app/assets/javascripts/projects/settings/components/transfer_project_form.vue @@ -51,7 +51,7 @@ export default { :disabled="!hasSelectedNamespace" :phrase="confirmationPhrase" :button-text="confirmButtonText" - button-qa-selector="transfer_project_button" + button-testid="transfer-project-button" @confirm="$emit('confirm')" /> </div> |