diff options
Diffstat (limited to 'catalog-ui')
5 files changed, 15 insertions, 6 deletions
diff --git a/catalog-ui/src/app/models/csar-component.ts b/catalog-ui/src/app/models/csar-component.ts index d59edb0b88..cb89f0ba5e 100644 --- a/catalog-ui/src/app/models/csar-component.ts +++ b/catalog-ui/src/app/models/csar-component.ts @@ -30,6 +30,7 @@ export interface ICsarComponent { subCategory:string vendorName:string; packageType:string; + resourceType:string; vendorRelease:string; } diff --git a/catalog-ui/src/app/utils/component-factory.ts b/catalog-ui/src/app/utils/component-factory.ts index bdcfc2cc2d..2b134bd2e7 100644 --- a/catalog-ui/src/app/utils/component-factory.ts +++ b/catalog-ui/src/app/utils/component-factory.ts @@ -135,6 +135,7 @@ export class ComponentFactory { newResource.csarVersion = csar.version; newResource.packageId = csar.packageId; newResource.description = csar.description; + newResource.resourceType = csar.resourceType; newResource.filterTerm = newResource.name + ' ' + newResource.description + ' ' + newResource.vendorName + ' ' + newResource.csarVersion return newResource; }; diff --git a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts index 46b258f0bd..01394a3c33 100644 --- a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts +++ b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view-model.ts @@ -202,6 +202,7 @@ export class OnboardingModalViewModel { {title: 'Vendor', property: 'vendorName'}, {title: 'Category', property: 'categories'}, {title: 'Version', property: 'csarVersion'}, + {title: 'Type', property: 'resourceType'}, {title: '#', property: 'importAndUpdate'} //{title: 'Date', property: 'componentDate'} ]; diff --git a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html index ea9d6ba63a..7f19389bdf 100644 --- a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html +++ b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html @@ -14,7 +14,7 @@ ~ limitations under the License. --> -<ng1-modal modal="modalOnboarding" class="w-sdc-modal-onboarding w-sdc-classic-top-line-modal" buttons="footerButtons" header="Import VF" show-close-button="true"> +<ng1-modal modal="modalOnboarding" class="w-sdc-modal-onboarding w-sdc-classic-top-line-modal" buttons="footerButtons" header="Import VSP" show-close-button="true"> <info-tooltip class="general-info-button" info-message-translate="ON_BOARDING_GENERAL_INFO "></info-tooltip> <div class="title-wrapper"> <div> @@ -82,6 +82,11 @@ {{component.csarVersion}} </div> + <!-- Type --> + <div class="table-col-general flex-item" sdc-smart-tooltip> + {{component.resourceType}} + </div> + <!-- Import And Update --> <div class="table-col-general flex-item" sdc-smart-tooltip></div> diff --git a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal.less b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal.less index c745a86888..ccf4fb00b5 100644 --- a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal.less +++ b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal.less @@ -6,7 +6,7 @@ .general-info-button{ position: relative; top: -40px; - left: 86px; + left: 95px; float: left; } @@ -76,16 +76,16 @@ align-self: center; } - .item-opened-description {flex-grow: 25;} + .item-opened-description {flex-grow: 25.3;} .item-opened-metadata1 {flex-grow: 25;} - .item-opened-metadata2 {flex-grow: 30;} + .item-opened-metadata2 {flex-grow: 45;} .item-opened-metadata3 { flex-grow: 10; .info-button{ float: right; } } - .item-opened-icon {flex-grow: 10;} + .item-opened-icon {flex-grow: 10.1;} } } } @@ -101,7 +101,8 @@ .flex-item:nth-child(2) {flex-grow: 25;} .flex-item:nth-child(3) {flex-grow: 30;} .flex-item:nth-child(4) {flex-grow: 10; text-align: center; } - .flex-item:nth-child(5) {flex-grow: 10; } + .flex-item:nth-child(5) {flex-grow: 10; text-align: center; } + .flex-item:nth-child(6) {flex-grow: 10; } } |