Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/layout/argument_alignment.yml

@@ -1405,23 +1405,6 @@ Layout/ArgumentAlignment:
     - 'spec/lib/gitlab/auth/otp/strategies/forti_token_cloud_spec.rb'
     - 'spec/lib/gitlab/auth/saml/auth_hash_spec.rb'
     - 'spec/lib/gitlab/auth/saml/user_spec.rb'
-    - 'spec/lib/gitlab/background_migration/batched_migration_job_spec.rb'
-    - 'spec/lib/gitlab/background_migration/copy_column_using_background_migration_job_spec.rb'
-    - 'spec/lib/gitlab/background_migration/delete_orphaned_operational_vulnerabilities_spec.rb'
-    - 'spec/lib/gitlab/background_migration/delete_orphans_approval_merge_request_rules_spec.rb'
-    - 'spec/lib/gitlab/background_migration/delete_orphans_approval_project_rules_spec.rb'
-    - 'spec/lib/gitlab/background_migration/destroy_invalid_group_members_spec.rb'
-    - 'spec/lib/gitlab/background_migration/destroy_invalid_members_spec.rb'
-    - 'spec/lib/gitlab/background_migration/destroy_invalid_project_members_spec.rb'
-    - 'spec/lib/gitlab/background_migration/disable_legacy_open_source_licence_for_recent_public_projects_spec.rb'
-    - 'spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_inactive_public_projects_spec.rb'
-    - 'spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_no_issues_no_repo_projects_spec.rb'
-    - 'spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_one_member_no_repo_projects_spec.rb'
-    - 'spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb'
-    - 'spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_projects_less_than_one_mb_spec.rb'
-    - 'spec/lib/gitlab/background_migration/expire_o_auth_tokens_spec.rb'
-    - 'spec/lib/gitlab/background_migration/fix_incoherent_packages_size_on_project_statistics_spec.rb'
-    - 'spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb'
     - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb'
     - 'spec/lib/gitlab/bitbucket_import/project_creator_spec.rb'
     - 'spec/lib/gitlab/bitbucket_import/wiki_formatter_spec.rb'

app/assets/javascripts/ci/runner/components/registration/registration_instructions.vue

@@ -100,11 +100,11 @@ export default {
     tokenMessage() {
       if (this.token) {
         return s__(
-          'Runners|The %{boldStart}runner token%{boldEnd} %{token} displays %{boldStart}only for a short time%{boldEnd}, and is stored in the %{codeStart}config.toml%{codeEnd} after you register the runner. It will not be visible once the runner is registered.',
+          'Runners|The %{boldStart}runner authentication token%{boldEnd} %{token} displays here %{boldStart}for a short time only%{boldEnd}. After you register the runner, this token is stored in the %{codeStart}config.toml%{codeEnd} and cannot be accessed again from the UI.',
         );
       }
       return s__(
-        'Runners|The %{boldStart}runner token%{boldEnd} is no longer visible, it is stored in the %{codeStart}config.toml%{codeEnd} if you have registered the runner.',
+        'Runners|The %{boldStart}runner authentication token%{boldEnd} is no longer visible, it is stored in the %{codeStart}config.toml%{codeEnd} if you have registered the runner.',
       );
     },
     commandPrompt() {

app/assets/javascripts/main.js

@@ -29,7 +29,6 @@ import initBreadcrumbs from './breadcrumb';
 import initPersistentUserCallouts from './persistent_user_callouts';
 import { initUserTracking, initDefaultTrackers } from './tracking';
 import { initSidebarTracking } from './pages/shared/nav/sidebar_tracking';
-import initServicePingConsent from './service_ping_consent';
 import GlFieldErrors from './gl_field_errors';
 import initUserPopovers from './user_popovers';
 import initBroadcastNotifications from './broadcast_notification';
@@ -93,7 +92,6 @@ function deferredInitialisation() {
   initBreadcrumbs();
   initPrefetchLinks('.js-prefetch-document');
   initLogoAnimation();
-  initServicePingConsent();
   initUserPopovers();
   initBroadcastNotifications();
   initPersistentUserCallouts();

app/assets/javascripts/observability/client.js

@@ -70,6 +70,7 @@ const SUPPORTED_FILTERS = {
   serviceName: ['=', '!='],
   period: ['='],
   traceId: ['=', '!='],
+  attribute: ['='],
   // free-text 'search' temporarily ignored https://gitlab.com/gitlab-org/opstrace/opstrace/-/issues/2309
 };
 
@@ -82,6 +83,7 @@ const FILTER_TO_QUERY_PARAM = {
   serviceName: 'service_name',
   period: 'period',
   traceId: 'trace_id',
+  attribute: 'attribute',
 };
 
 const FILTER_OPERATORS_PREFIX = {
@@ -113,6 +115,25 @@ function getFilterParamName(filterName, operator) {
   return undefined;
 }
 
+/**
+ * Process `filterValue` and append the proper query params to the  `searchParams` arg
+ *
+ * It mutates `searchParams`
+ *
+ * @param {String} filterValue The filter value, in the format `attribute_name=attribute_value`
+ * @param {String} filterOperator The filter operator
+ * @param {URLSearchParams} searchParams The URLSearchParams object where to append the proper query params
+ */
+function handleAttributeFilter(filterValue, filterOperator, searchParams) {
+  const [attrName, attrValue] = filterValue.split('=');
+  if (attrName && attrValue) {
+    if (filterOperator === '=') {
+      searchParams.append('attr_name', attrName);
+      searchParams.append('attr_value', attrValue);
+    }
+  }
+}
+
 /**
  * Builds URLSearchParams from a filter object of type { [filterName]: undefined | null | Array<{operator: String, value: any} }
  *  e.g:
@@ -133,20 +154,22 @@ function filterObjToQueryParams(filterObj) {
 
   Object.keys(SUPPORTED_FILTERS).forEach((filterName) => {
     const filterValues = filterObj[filterName] || [];
-    const supportedFilters = filterValues.filter((f) =>
+    const validFilters = filterValues.filter((f) =>
       SUPPORTED_FILTERS[filterName].includes(f.operator),
     );
-    supportedFilters.forEach(({ operator, value: rawValue }) => {
-      const paramName = getFilterParamName(filterName, operator);
-
-      let value = rawValue;
-      if (filterName === 'durationMs') {
-        // converting durationMs to duration_nano
-        value *= 1000000;
-      }
-
-      if (paramName && value) {
-        filterParams.append(paramName, value);
+    validFilters.forEach(({ operator, value: rawValue }) => {
+      if (filterName === 'attribute') {
+        handleAttributeFilter(rawValue, operator, filterParams);
+      } else {
+        const paramName = getFilterParamName(filterName, operator);
+        let value = rawValue;
+        if (filterName === 'durationMs') {
+          // converting durationMs to duration_nano
+          value *= 1000000;
+        }
+        if (paramName && value) {
+          filterParams.append(paramName, value);
+        }
       }
     });
   });
@@ -248,19 +271,40 @@ async function fetchMetrics() {
   /* eslint-enable @gitlab/require-i18n-strings */
 }
 
-export function buildClient({ provisioningUrl, tracingUrl, servicesUrl, operationsUrl } = {}) {
-  if (!provisioningUrl || !tracingUrl || !servicesUrl || !operationsUrl) {
-    throw new Error(
-      'missing required params. provisioningUrl, tracingUrl, servicesUrl, operationsUrl are required',
-    );
+export function buildClient(options) {
+  if (!options) {
+    throw new Error('No options object provided'); // eslint-disable-line @gitlab/require-i18n-strings
   }
+
+  const { provisioningUrl, tracingUrl, servicesUrl, operationsUrl, metricsUrl } = options;
+
+  if (typeof provisioningUrl !== 'string') {
+    throw new Error('provisioningUrl param must be a string');
+  }
+
+  if (typeof tracingUrl !== 'string') {
+    throw new Error('tracingUrl param must be a string');
+  }
+
+  if (typeof servicesUrl !== 'string') {
+    throw new Error('servicesUrl param must be a string');
+  }
+
+  if (typeof operationsUrl !== 'string') {
+    throw new Error('operationsUrl param must be a string');
+  }
+
+  if (typeof metricsUrl !== 'string') {
+    throw new Error('metricsUrl param must be a string');
+  }
+
   return {
     enableObservability: () => enableObservability(provisioningUrl),
     isObservabilityEnabled: () => isObservabilityEnabled(provisioningUrl),
     fetchTraces: (filters) => fetchTraces(tracingUrl, filters),
     fetchTrace: (traceId) => fetchTrace(tracingUrl, traceId),
     fetchServices: () => fetchServices(servicesUrl),
     fetchOperations: (serviceName) => fetchOperations(operationsUrl, serviceName),
-    fetchMetrics: () => fetchMetrics(),
+    fetchMetrics: () => fetchMetrics(metricsUrl),
   };
 }

app/assets/javascripts/observability/components/observability_container.vue

@@ -10,24 +10,8 @@ export default {
     ObservabilityLoader,
   },
   props: {
-    oauthUrl: {
-      type: String,
-      required: true,
-    },
-    provisioningUrl: {
-      type: String,
-      required: true,
-    },
-    tracingUrl: {
-      type: String,
-      required: true,
-    },
-    servicesUrl: {
-      type: String,
-      required: true,
-    },
-    operationsUrl: {
-      type: String,
+    apiConfig: {
+      type: Object,
       required: true,
     },
   },
@@ -55,7 +39,7 @@ export default {
   },
   methods: {
     messageHandler(e) {
-      const isExpectedOrigin = e.origin === new URL(this.oauthUrl).origin;
+      const isExpectedOrigin = e.origin === new URL(this.apiConfig.oauthUrl).origin;
       if (!isExpectedOrigin) return;
 
       const { data } = e;
@@ -65,12 +49,7 @@ export default {
 
         const { status, message, statusCode } = data;
         if (status === 'success') {
-          this.observabilityClient = buildClient({
-            provisioningUrl: this.provisioningUrl,
-            tracingUrl: this.tracingUrl,
-            servicesUrl: this.servicesUrl,
-            operationsUrl: this.operationsUrl,
-          });
+          this.observabilityClient = buildClient(this.apiConfig);
           this.$emit('observability-client-ready', this.observabilityClient);
           this.loaderContentState = CONTENT_STATE.LOADED;
         } else if (status === 'error') {
@@ -92,7 +71,7 @@ export default {
       v-if="!authCompleted"
       sandbox="allow-same-origin allow-forms allow-scripts"
       hidden
-      :src="oauthUrl"
+      :src="apiConfig.oauthUrl"
       data-testid="observability-oauth-iframe"
     ></iframe>
 

app/assets/javascripts/observability/components/provisioned_observability_container.vue

@@ -12,24 +12,8 @@ export default {
     GlLoadingIcon,
   },
   props: {
-    oauthUrl: {
-      type: String,
-      required: true,
-    },
-    tracingUrl: {
-      type: String,
-      required: true,
-    },
-    servicesUrl: {
-      type: String,
-      required: true,
-    },
-    provisioningUrl: {
-      type: String,
-      required: true,
-    },
-    operationsUrl: {
-      type: String,
+    apiConfig: {
+      type: Object,
       required: true,
     },
   },
@@ -91,11 +75,7 @@ export default {
 
 <template>
   <observability-container
-    :oauth-url="oauthUrl"
-    :tracing-url="tracingUrl"
-    :provisioning-url="provisioningUrl"
-    :services-url="servicesUrl"
-    :operations-url="operationsUrl"
+    :api-config="apiConfig"
     @observability-client-ready="onObservabilityClientReady"
   >
     <div v-if="loading" class="gl-py-5">

app/assets/javascripts/profile/edit/components/profile_edit_app.vue

@@ -109,8 +109,11 @@ export default {
     async syncHeaderAvatars() {
       const dataURL = await readFileAsDataURL(this.avatarBlob);
 
-      // TODO: implement sync for super sidebar
-      ['.header-user-avatar', '.js-sidebar-user-avatar'].forEach((selector) => {
+      const elements = gon?.use_new_navigation
+        ? ['[data-testid="user-dropdown"] .gl-avatar']
+        : ['.header-user-avatar', '.js-sidebar-user-avatar'];
+
+      elements.forEach((selector) => {
         const node = document.querySelector(selector);
         if (!node) return;
 

app/assets/javascripts/profile/profile.js

@@ -89,8 +89,12 @@ export default class Profile {
   }
 
   updateHeaderAvatar() {
-    $('.header-user-avatar').attr('src', this.avatarGlCrop.dataURL);
-    $('.js-sidebar-user-avatar').attr('src', this.avatarGlCrop.dataURL);
+    if (gon?.use_new_navigation) {
+      $('[data-testid="user-dropdown"] .gl-avatar').attr('src', this.avatarGlCrop.dataURL);
+    } else {
+      $('.header-user-avatar').attr('src', this.avatarGlCrop.dataURL);
+      $('.js-sidebar-user-avatar').attr('src', this.avatarGlCrop.dataURL);
+    }
   }
 
   setRepoRadio() {

app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue

@@ -55,6 +55,9 @@ export default {
     projectKey: {
       default: '',
     },
+    addExternalParticipantsFromCc: {
+      default: false,
+    },
     templates: {
       default: [],
     },
@@ -109,13 +112,20 @@ export default {
         });
     },
 
-    onSaveTemplate({ selectedTemplate, fileTemplateProjectId, outgoingName, projectKey }) {
+    onSaveTemplate({
+      selectedTemplate,
+      fileTemplateProjectId,
+      outgoingName,
+      projectKey,
+      addExternalParticipantsFromCc,
+    }) {
       this.isTemplateSaving = true;
 
       const body = {
         issue_template_key: selectedTemplate,
         outgoing_name: outgoingName,
         project_key: projectKey,
+        add_external_participants_from_cc: addExternalParticipantsFromCc,
         service_desk_enabled: this.isEnabled,
         file_template_project_id: fileTemplateProjectId,
       };
@@ -187,6 +197,7 @@ export default {
       :initial-selected-file-template-project-id="selectedFileTemplateProjectId"
       :initial-outgoing-name="outgoingName"
       :initial-project-key="projectKey"
+      :initial-add-external-participants-from-cc="addExternalParticipantsFromCc"
       :templates="templates"
       :is-template-saving="isTemplateSaving"
       @save="onSaveTemplate"