Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 13 deletions

diff --git a/app/assets/javascripts/security_configuration/components/constants.js b/app/assets/javascripts/security_configuration/components/constants.js
index 81d222438e3..11e092d8eb4 100644
--- a/app/assets/javascripts/security_configuration/components/constants.js
+++ b/app/assets/javascripts/security_configuration/components/constants.js
@@ -281,3 +281,14 @@ export const featureToMutationMap = {
 
 export const AUTO_DEVOPS_ENABLED_ALERT_DISMISSED_STORAGE_KEY =
   'security_configuration_auto_devops_enabled_dismissed_projects';
+
+// Fetch the svg path from the GraphQL query once this issue is resolved
+// https://gitlab.com/gitlab-org/gitlab/-/issues/346899
+export const TEMP_PROVIDER_LOGOS = {
+  Kontra: {
+    svg: '/assets/illustrations/vulnerability/kontra-logo.svg',
+  },
+  [__('Secure Code Warrior')]: {
+    svg: '/assets/illustrations/vulnerability/scw-logo.svg',
+  },
+};
diff --git a/app/assets/javascripts/security_configuration/components/training_provider_list.vue b/app/assets/javascripts/security_configuration/components/training_provider_list.vue
index bfdabc10227..ea3eedc6e90 100644
--- a/app/assets/javascripts/security_configuration/components/training_provider_list.vue
+++ b/app/assets/javascripts/security_configuration/components/training_provider_list.vue
@@ -24,6 +24,7 @@ import {
   updateSecurityTrainingCache,
   updateSecurityTrainingOptimisticResponse,
 } from '~/security_configuration/graphql/cache_utils';
+import { TEMP_PROVIDER_LOGOS } from './constants';
 
 const i18n = {
   providerQueryErrorMessage: __(
@@ -38,17 +39,6 @@ const i18n = {
   ),
 };
 
-// Fetch the svg path from the GraphQL query once this issue is resolved
-// https://gitlab.com/gitlab-org/gitlab/-/issues/346899
-const TEMP_PROVIDER_LOGOS = {
-  'gid://gitlab/Security::TrainingProvider/1': {
-    svg: '/assets/illustrations/vulnerability/kontra-logo.svg',
-  },
-  'gid://gitlab/Security::TrainingProvider/2': {
-    svg: '/assets/illustrations/vulnerability/scw-logo.svg',
-  },
-};
-
 export default {
   components: {
     GlAlert,
@@ -242,8 +232,12 @@ export default {
               label-position="hidden"
               @change="toggleProvider(provider)"
             />
-            <div v-if="$options.TEMP_PROVIDER_LOGOS[provider.id]" class="gl-ml-4">
-              <img :src="$options.TEMP_PROVIDER_LOGOS[provider.id].svg" width="18" />
+            <div v-if="$options.TEMP_PROVIDER_LOGOS[provider.name]" class="gl-ml-4">
+              <img
+                :src="$options.TEMP_PROVIDER_LOGOS[provider.name].svg"
+                width="18"
+                role="presentation"
+              />
             </div>
             <div class="gl-ml-3">
               <h3 class="gl-font-lg gl-m-0 gl-mb-2">{{ provider.name }}</h3>