Moving remaining commits from 7.0.5 to master (#2665)

* System tests topology_spec, events_spec fix  (#2654)

* fixing imports in yamls files for component app blueprint
* improve events spec

* Blueprints and deployments view specs fix (#2655)

* downgrade css loader (#2658)

* NE-36163 Adjust deployments widget to breaking changes in manager (#2659)

* Audit fix (#2663)

* audit fix
* increase size limit

* Getting started system test fix (#2662)

* loading all yaml files instead of one
* increasing plugin upload service timeout as we started loading more items to the manager
* providing tests improvements after changes
* replacing AWS with GCP in blueprint catalog spec because one of the tests is not passing due to types issues in blueprint 
   yaml file, GCP works correctly

---------

Co-authored-by: yakub korbaczek <jakub.kuba.stepien@gmail.com>

Author: ykamartus

.size-limit

@@ -7,7 +7,7 @@
     },
     {
         "name": "Vendor JS bundle",
-        "limit": "5.15 MB",
+        "limit": "5.16 MB",
         "gzip": false,
         "path": "dist/static/js/vendor.bundle.js"
     },

app/components/overlays/gettingStarted/installation/process.ts

@@ -1,5 +1,5 @@
 import log from 'loglevel';
-
+import isEmpty from 'lodash/isEmpty';
 import type { PostPluginsUploadQueryParams } from 'backend/routes/Plugins.types';
 import StageUtils from '../../../../utils/stageUtils';
 import type Internal from '../../../../utils/Internal';
@@ -29,14 +29,14 @@ const sleep = async (milliseconds: number) => new Promise(resolve => setTimeout(
 
 // TODO(RD-1874): use common api for backend requests
 export const installPlugin = async (internal: Internal, plugin: PluginInstallationTask) => {
-    if (!plugin.yamlUrl || !plugin.wagonUrl) {
+    if (isEmpty(plugin.yamlUrls) || !plugin.wagonUrl) {
         return false;
     }
     const params = {
         visibility: 'tenant',
         title: plugin.title,
         iconUrl: plugin.icon,
-        yamlUrl: plugin.yamlUrl,
+        yamlUrl: plugin.yamlUrls,
         wagonUrl: plugin.wagonUrl
     };
     try {
@@ -167,7 +167,7 @@ export const createResourcesInstaller = (
 
         const runInstallPluginStep = async (scheduledPlugin: PluginInstallationTask) => {
             let result = false;
-            if (scheduledPlugin.yamlUrl && scheduledPlugin.wagonUrl) {
+            if (!isEmpty(scheduledPlugin.yamlUrls) && scheduledPlugin.wagonUrl) {
                 triggerProgressEvent(TaskType.Plugin, scheduledPlugin.name, TaskStatus.InstallationProgress);
                 result = await installPlugin(internal, scheduledPlugin);
                 if (destroyed) return;

app/components/overlays/gettingStarted/installation/tasks.ts

@@ -12,7 +12,7 @@ import type { SecretsHook } from '../secrets/useFetchSecrets';
 import type { BlueprintsHook } from '../blueprints/useFetchBlueprints';
 import useFetchBlueprints from '../blueprints/useFetchBlueprints';
 import type { BlueprintResponse } from '../blueprints/model';
-import { getWagon, getYamlUrl } from '../../../../utils/shared/PluginUtils';
+import { getWagon, getYamlUrls } from '../../../../utils/shared/PluginUtils';
 
 /**
  * Validates plugin version. If version pattern is not defined, any version is accepted.
@@ -89,7 +89,7 @@ const findScheduledPluginCandidate = (
         title: catalogPlugin.display_name ?? expectedPluginName,
         version: catalogPlugin.version,
         distribution: wagon.release,
-        yamlUrl: getYamlUrl(catalogPlugin),
+        yamlUrls: getYamlUrls(catalogPlugin),
         wagonUrl: wagon.url
     };
 };
@@ -123,7 +123,7 @@ export type PluginInstallationTask = {
     title: string;
     version: string;
     distribution?: string;
-    yamlUrl?: URLString;
+    yamlUrls?: URLString[];
     wagonUrl?: URLString;
 };
 

app/utils/shared/PluginUtils.ts

@@ -1,12 +1,8 @@
-import { find, last } from 'lodash';
+import { find } from 'lodash';
 import type { PluginCatalogEntry } from 'backend/routes/Plugins.types';
 
-const latestDslVersion = 'cloudify_dsl_1_5';
-export function getYamlUrl(plugin: Pick<PluginCatalogEntry, 'yaml_urls'>) {
-    const latestDslYamlUrl = find(plugin.yaml_urls, { dsl_version: latestDslVersion })?.url;
-    const fallbackYamlUrl = last(plugin.yaml_urls)!.url;
-
-    return latestDslYamlUrl || fallbackYamlUrl;
+export function getYamlUrls(plugin: Pick<PluginCatalogEntry, 'yaml_urls'>) {
+    return plugin.yaml_urls.map(item => item.url);
 }
 
 const fallbackDistributionPrefix = 'manylinux';
@@ -19,5 +15,5 @@ export function getWagon(plugin: Pick<PluginCatalogEntry, 'wagon_urls'>, current
 
 export default {
     getWagon,
-    getYamlUrl
+    getYamlUrls
 };