diff --git a/app/assets/javascripts/glql/components/common/actions.vue b/app/assets/javascripts/glql/components/common/actions.vue
index 666cd3e0886..55fc4b4cf1d 100644
--- a/app/assets/javascripts/glql/components/common/actions.vue
+++ b/app/assets/javascripts/glql/components/common/actions.vue
@@ -60,14 +60,14 @@ export default {
diff --git a/app/assets/javascripts/glql/components/common/facade.vue b/app/assets/javascripts/glql/components/common/facade.vue
index a15bfe08113..36e22c18cbb 100644
--- a/app/assets/javascripts/glql/components/common/facade.vue
+++ b/app/assets/javascripts/glql/components/common/facade.vue
@@ -91,7 +91,8 @@ export default {
},
title() {
return (
- this.config.title || (this.config.display === 'table' ? __('GLQL table') : __('GLQL list'))
+ this.config.title ||
+ (this.config.display === 'table' ? __('Embedded table view') : __('Embedded list view'))
);
},
showEmptyState() {
@@ -232,13 +233,13 @@ export default {
i18n: {
glqlDisplayError: {
variant: 'warning',
- title: __('An error occurred when trying to display this GLQL view:'),
+ title: __('An error occurred when trying to display this embedded view:'),
},
glqlLimitError: {
variant: 'warning',
title: sprintf(
__(
- 'Only %{n} GLQL views can be automatically displayed on a page. Click the button below to manually display this block.',
+ 'Only %{n} embedded views can be automatically displayed on a page. Click the button below to manually display this block.',
),
{ n: MAX_GLQL_BLOCKS },
),
@@ -246,16 +247,19 @@ export default {
},
glqlTimeoutError: {
variant: 'warning',
- title: sprintf(__('GLQL view timed out. Add more filters to reduce the number of results.'), {
- n: MAX_GLQL_BLOCKS,
- }),
+ title: sprintf(
+ __('Embedded view timed out. Add more filters to reduce the number of results.'),
+ {
+ n: MAX_GLQL_BLOCKS,
+ },
+ ),
action: __('Retry'),
},
glqlForbiddenError: {
variant: 'danger',
- title: __('GLQL view timed out. Try again later.'),
+ title: __('Embedded view timed out. Try again later.'),
},
- loadGlqlView: __('Load GLQL view'),
+ loadGlqlView: __('Load embedded view'),
},
numGlqlBlocks: new Counter(MAX_GLQL_BLOCKS),
};
diff --git a/app/assets/javascripts/glql/components/common/footnote.vue b/app/assets/javascripts/glql/components/common/footnote.vue
index 844ce42a392..401ad5d3421 100644
--- a/app/assets/javascripts/glql/components/common/footnote.vue
+++ b/app/assets/javascripts/glql/components/common/footnote.vue
@@ -16,14 +16,14 @@ export default {
return glqlWorkItemsFeatureFlagEnabled();
},
},
- docsPath: `${helpPagePath('user/glql/_index')}#glql-views`,
+ docsPath: `${helpPagePath('user/glql/_index')}#embedded-views`,
};
-
+
id === project.id))
- projects.push({ ...project, defaultPermissions: true, jobTokenPolicies: [] });
- } else {
- projects = project?.ciJobTokenScope?.inboundAllowlist?.nodes ?? [];
- groups = project?.ciJobTokenScope?.groupsAllowlist?.nodes ?? [];
- const groupAllowlistAutopopulatedIds =
- project?.ciJobTokenScope?.groupAllowlistAutopopulatedIds ?? [];
- const inboundAllowlistAutopopulatedIds =
- project?.ciJobTokenScope?.inboundAllowlistAutopopulatedIds ?? [];
-
- projects = this.addAutopopulatedAttribute(projects, inboundAllowlistAutopopulatedIds);
- groups = this.addAutopopulatedAttribute(groups, groupAllowlistAutopopulatedIds);
- }
+ const allowlist = project?.ciJobTokenScopeAllowlist;
+ const groups = this.mapAllowlistNodes(allowlist?.groupsAllowlist);
+ const projects = this.mapAllowlistNodes(allowlist?.projectsAllowlist);
+ // Add a dummy entry for the current project. The new ciJobTokenScopeAllowlist endpoint doesn't have an entry
+ // for the current project like the old ciJobTokenScope endpoint did, so we have to add it in manually, if it
+ // doesn't exist yet.
+ if (!projects.some(({ id }) => id === project.id))
+ projects.push({ ...project, defaultPermissions: true, jobTokenPolicies: [] });
return { projects, groups };
},
@@ -418,12 +400,6 @@ export default {
this.namespaceToEdit = namespace;
showFormFn();
},
- addAutopopulatedAttribute(collection, idList) {
- return collection.map((item) => ({
- ...item,
- autopopulated: idList.includes(item.id),
- }));
- },
},
};
@@ -545,7 +521,6 @@ export default {
:items="allowlist"
:loading="isAllowlistLoading"
:loading-message="allowlistLoadingMessage"
- :show-policies="isJobTokenPoliciesEnabled"
@editItem="showNamespaceForm($event, showForm)"
@removeItem="namespaceToRemove = $event"
/>
diff --git a/app/assets/javascripts/token_access/components/namespace_form.vue b/app/assets/javascripts/token_access/components/namespace_form.vue
index 9b1ea0a5a60..be40380da06 100644
--- a/app/assets/javascripts/token_access/components/namespace_form.vue
+++ b/app/assets/javascripts/token_access/components/namespace_form.vue
@@ -7,7 +7,7 @@ import PoliciesSelector from './policies_selector.vue';
export default {
components: { GlFormGroup, GlButton, GlFormInput, PoliciesSelector },
- inject: ['fullPath', 'isJobTokenPoliciesEnabled'],
+ inject: ['fullPath'],
props: {
namespace: {
type: Object,
@@ -51,12 +51,12 @@ export default {
this.isSaving = true;
this.errorMessage = '';
- const variables = { projectPath: this.fullPath, targetPath: this.targetPath };
-
- if (this.isJobTokenPoliciesEnabled) {
- variables.defaultPermissions = this.defaultPermissions;
- variables.jobTokenPolicies = this.defaultPermissions ? [] : this.jobTokenPolicies;
- }
+ const variables = {
+ projectPath: this.fullPath,
+ targetPath: this.targetPath,
+ defaultPermissions: this.defaultPermissions,
+ };
+ variables.jobTokenPolicies = this.defaultPermissions ? [] : this.jobTokenPolicies;
const mutation = this.namespace ? editNamespaceMutation : addNamespaceMutation;
const response = await this.$apollo.mutate({ mutation, variables });
@@ -104,7 +104,6 @@ export default {
{
return false;
}
- const {
- csvDownloadPath,
- enforceAllowlist,
- fullPath,
- projectAllowlistLimit,
- jobTokenPoliciesEnabled,
- } = containerEl.dataset;
+ const { csvDownloadPath, enforceAllowlist, fullPath, projectAllowlistLimit } =
+ containerEl.dataset;
return new Vue({
el: containerEl,
@@ -37,7 +31,6 @@ export const initTokenAccess = (containerId = 'js-ci-token-access-app') => {
enforceAllowlist: JSON.parse(enforceAllowlist),
fullPath,
projectAllowlistLimit: Number(projectAllowlistLimit),
- isJobTokenPoliciesEnabled: parseBoolean(jobTokenPoliciesEnabled),
},
render(createElement) {
return createElement(TokenAccessApp);
diff --git a/app/assets/javascripts/wikis/components/wiki_header.vue b/app/assets/javascripts/wikis/components/wiki_header.vue
index 588f2fba714..4169382bcbf 100644
--- a/app/assets/javascripts/wikis/components/wiki_header.vue
+++ b/app/assets/javascripts/wikis/components/wiki_header.vue
@@ -1,13 +1,17 @@