diff options
author | Yuli Shlosberg <ys9693@att.com> | 2020-01-28 15:41:44 +0200 |
---|---|---|
committer | Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-01-28 14:48:15 +0000 |
commit | ceb5ab575aa49f4d082fe1e52cc1a3f8ff3ffd24 (patch) | |
tree | 8e880d0482357e1cde95f736eec036d0f02c1b82 /catalog-ui | |
parent | 2ffcb7dea4d714a7c419c311b752db471691266e (diff) |
fix ui-ci tests
Issue-ID: SDC-2730
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
Change-Id: I45500daf397a523d450b30836dda188573de04a3
Diffstat (limited to 'catalog-ui')
3 files changed, 6 insertions, 3 deletions
diff --git a/catalog-ui/src/app/ng2/components/modals/onboarding-modal/onboarding-modal.component.html b/catalog-ui/src/app/ng2/components/modals/onboarding-modal/onboarding-modal.component.html index 6ba1f428a1..49ed984b47 100644 --- a/catalog-ui/src/app/ng2/components/modals/onboarding-modal/onboarding-modal.component.html +++ b/catalog-ui/src/app/ng2/components/modals/onboarding-modal/onboarding-modal.component.html @@ -1,4 +1,4 @@ -<div class="onboarding-modal"> +<div data-tests-id="importVspTable" class="onboarding-modal"> <div class="search-wrapper"> <span class="sub-title-wrapper"> <svg-icon class="info-button" diff --git a/catalog-ui/src/app/ng2/services/onboarding.service.ts b/catalog-ui/src/app/ng2/services/onboarding.service.ts index 0ec4875d91..51a7fc4c7f 100644 --- a/catalog-ui/src/app/ng2/services/onboarding.service.ts +++ b/catalog-ui/src/app/ng2/services/onboarding.service.ts @@ -116,7 +116,7 @@ export class OnboardingService { newMetadata.description = csar.description; newMetadata.selectedCategory = selectedCategory && selectedSubCategory ? selectedCategory.name + "_#_" + selectedSubCategory.name : ''; newMetadata.filterTerm = newMetadata.name + ' ' + newMetadata.description + ' ' + newMetadata.vendorName + ' ' + newMetadata.csarVersion; - newMetadata.resourceType = "VF"; + newMetadata.resourceType = csar.resourceType; newMetadata.componentType = ComponentType.RESOURCE; newMetadata.tags = []; newMetadata.icon = DEFAULT_ICON; diff --git a/catalog-ui/src/app/utils/component-factory.ts b/catalog-ui/src/app/utils/component-factory.ts index 889f6fb43b..d4e282fcb0 100644 --- a/catalog-ui/src/app/utils/component-factory.ts +++ b/catalog-ui/src/app/utils/component-factory.ts @@ -142,7 +142,7 @@ export class ComponentFactory { return newResource; }; - public createEmptyComponent = (componentType:string):Component => { + public createEmptyComponent = (componentType:string, resourceType?:string):Component => { let newComponent:Component; switch (componentType) { @@ -161,6 +161,9 @@ export class ComponentFactory { case ResourceType.CVFC: case ResourceType.CONFIGURATION: newComponent = new Resource(this.ResourceService, this.$q); + if (resourceType){ + (<Resource> newComponent).resourceType = resourceType; + } break; } newComponent.componentType = componentType; |