diff --git a/cypress/e2e/catalog.cy.ts b/cypress/e2e/catalog.cy.ts index 0e9a5067..4cbe45a0 100644 --- a/cypress/e2e/catalog.cy.ts +++ b/cypress/e2e/catalog.cy.ts @@ -31,7 +31,7 @@ describe('/my-offerings',{ cy.visit('/my-offerings') cy.wait('@catalog') - cy.get('@catalog.all').should('have.length', 2) + cy.get('@catalog.all').should('have.length', 4) cy.getBySel('newCatalog').click() cy.getBySel('catalogName').type(name) cy.getBySel('catalogDsc').type(description) @@ -72,7 +72,7 @@ describe('/my-offerings',{ cy.visit('/my-offerings') cy.wait('@catalog') - cy.get('@catalog.all').should('have.length', 2) + cy.get('@catalog.all').should('have.length', 4) cy.getBySel('newCatalog').click() cy.getBySel('catalogName').type(name) cy.getBySel('catalogDsc').type(description) diff --git a/cypress/support/constants.ts b/cypress/support/constants.ts index a6d78a4c..cc6b1189 100644 --- a/cypress/support/constants.ts +++ b/cypress/support/constants.ts @@ -109,6 +109,21 @@ export const login_token = () => { } } +export const default_catalog = { + "id": "urn:ngsi-ld:catalog:32828e1d-4652-4f4c-b13e-327450ce83c6", + "href": "urn:ngsi-ld:catalog:32828e1d-4652-4f4c-b13e-327450ce83c6", + "lifecycleStatus": "Launched", + "name": "default", + "version": "1.0", + "category": [ + { + "id": "urn:ngsi-ld:category:26435cca-2707-4c89-8f0c-79464573c9e2", + "href": "urn:ngsi-ld:category:26435cca-2707-4c89-8f0c-79464573c9e2", + "name": "dft cat" + } + ] +} + export const catalog_launched = [ { "id": "urn:ngsi-ld:catalog:32828e1d-4652-4f4c-b13e-327450ce83c6", @@ -194,7 +209,9 @@ export const local_items = { cy.intercept( {method:'GET', url: 'http://proxy.docker:8004/stats'}, init_stat).as('stats') //cy.intercept( {method: 'GET', url: 'http://proxy.docker:8004/catalog/productOffering?*'}, product_offering).as('productOffering') cy.intercept( {method: 'GET', url: 'http://proxy.docker:8004/config'}, init_config).as('config') - cy.intercept( {method:'GET', url: 'http://proxy.docker:8004/catalog/category?*'}, category_launched).as('category') + //cy.intercept('GET', '**/catalog/category/urn:ngsi-ld:category:*', category_dft).as('category'); + cy.intercept({method: 'GET', url: 'catalog/catalog/?*'}, default_catalog).as('catalog') + cy.intercept( {method: 'GET', url: 'http://proxy.docker:8004/catalog/category/?*'}, category_dft).as('category') // Verify mocks are called 1 time cy.visit('/', {onBeforeLoad(win) { win.localStorage.setItem('color-theme', 'dark'); @@ -205,6 +222,8 @@ export const local_items = { cy.get('@config.all').should('have.length', 1) //cy.wait('@productOffering') //cy.get('@productOffering.all').should('have.length', 1) + cy.wait('@catalog') + cy.get('@catalog.all').should('have.length', 1) cy.wait('@category') cy.get('@category.all').should('have.length', 1) // Verify header interactive elemements are displayed and work as expected @@ -277,6 +296,8 @@ export const loginAcc = () => { cy.get('@config.all').should('have.length', 2) //cy.wait('@productOffering') //cy.get('@productOffering.all').should('have.length', 2) + cy.wait('@catalog') + cy.get('@catalog.all').should('have.length', 2) cy.wait('@category') cy.get('@category.all').should('have.length', 2) cy.wait('@login_token') diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 10f768a5..d42cd461 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -102,10 +102,12 @@ const routes: Routes = [ component: BlogEntryDetailComponent }, { path: 'blog-entry', - component: EntryFormComponent + component: EntryFormComponent, + canActivate: [AuthGuard], data: { roles: ['admin'] } }, { path: 'blog-entry/:id', - component: EntryFormComponent + component: EntryFormComponent, + canActivate: [AuthGuard], data: { roles: ['admin'] } }, { path: '**', redirectTo: 'dashboard', pathMatch: 'full' }, ] diff --git a/src/app/app.component.html b/src/app/app.component.html index 24e84480..53d8dfcd 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,5 +1,5 @@ -
+
@if(providerThemeName=='DOME') { diff --git a/src/app/guard/auth.guard.ts b/src/app/guard/auth.guard.ts index b82fc906..81d246b4 100644 --- a/src/app/guard/auth.guard.ts +++ b/src/app/guard/auth.guard.ts @@ -31,6 +31,9 @@ export class AuthGuard implements CanActivate { for(let i=0;i role.name === 'admin')){ + userRoles.push('admin') + } } } else { this.router.navigate(['/dashboard']); diff --git a/src/app/offerings/featured/featured.component.ts b/src/app/offerings/featured/featured.component.ts index 10005d89..3780a2d0 100644 --- a/src/app/offerings/featured/featured.component.ts +++ b/src/app/offerings/featured/featured.component.ts @@ -23,7 +23,7 @@ export class FeaturedComponent implements OnInit { } ngOnInit(): void { - this.api.getLaunchedCategories().then(data => { + this.api.getDefaultCategories().then(data => { for(let i=0; i < data.length; i++){ if(data[i].isRoot==true){ this.categories.push(data[i]) diff --git a/src/app/pages/dome-blog/dome-blog.component.ts b/src/app/pages/dome-blog/dome-blog.component.ts index 10826baf..cca87431 100644 --- a/src/app/pages/dome-blog/dome-blog.component.ts +++ b/src/app/pages/dome-blog/dome-blog.component.ts @@ -33,36 +33,7 @@ export class DomeBlogComponent implements OnInit { partyId:any=''; checkAdmin:boolean=false; - entries:any[]=[ - { - id: '1', - title: 'First entry', - author: 'Author', - date: '2025-08-08T09:32:44.548Z', - content: 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. ' - }, - { - id: '2', - title: 'Second entry', - author: 'Author', - date: '2025-09-08T09:32:44.548Z', - content: 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. ' - }, - { - id: '3', - title: 'Third entry', - author: 'Author', - date: '2025-03-08T11:32:44.548Z', - content: 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. ' - }, - { - id: '4', - title: 'Fourth entry', - author: 'Author', - date: '2025-03-08T11:32:44.548Z', - content: 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. ' - } - ] + entries:any[]=[ ] async ngOnInit(): Promise { this.initPartyInfo(); @@ -77,16 +48,13 @@ export class DomeBlogComponent implements OnInit { console.log(aux) if(aux.logged_as==aux.id){ this.partyId = aux.partyId; - this.checkAdmin=aux.roles.some(role => - role.name === 'admin' - ); } else { let loggedOrg = aux.organizations.find((element: { id: any; }) => element.id == aux.logged_as) this.partyId = loggedOrg.partyId; - this.checkAdmin=loggedOrg.roles.some((role: { name: string; }) => - role.name === 'admin' || role.name === 'orgAdmin' - ); } + this.checkAdmin=aux.roles.some(role => + role.name === 'admin' + ); } } diff --git a/src/app/pages/product-details/product-details.component.html b/src/app/pages/product-details/product-details.component.html index a226620a..a9973b5d 100644 --- a/src/app/pages/product-details/product-details.component.html +++ b/src/app/pages/product-details/product-details.component.html @@ -424,7 +424,7 @@

-

{{att.name}}

+

{{att.name}}

@@ -501,7 +501,7 @@

-

{{rel.name}}

+

{{rel.name}}

{{rel.relationshipType}}

@if(rel.relationshipType == 'dependency'){ diff --git a/src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.html b/src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.html index 218d6f8b..c8be9d10 100644 --- a/src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.html +++ b/src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.html @@ -258,22 +258,22 @@

{{ 'PRODUCT_INVENTORY._pricing' | translate }}

- @if(selectedProduct?.productPrice != undefined){ + @if(productOff?.productOfferingPrice != undefined){ @if(checkCustom){ -
- @for (price of selectedProduct?.productPrice; track price.id) { +
+ @for (price of productOff?.productOfferingPrice; track price.id) { @if (price.priceType == 'custom') {
-

{{price.name}}

+

{{price.name}}

} } - @if(selectedProduct?.productPrice?.length==0){ + @if(productOff?.productOfferingPrice?.length==0){
-
+
{{ 'SHOPPING_CART._free' | translate }}
@@ -281,45 +281,46 @@
- @for (price of selectedProduct?.productPrice; track price) { +
+ @for (price of productOff?.productOfferingPrice; track price.id) { @if (price.priceType == 'recurring') { -
+
-
{{price.name}}
+
{{price.name}}
+
+
+
-

{{price.price?.taxIncludedAmount?.value}} {{price.price?.taxIncludedAmount?.unit}}

-

/{{price.recurringChargePeriodType}}

-

{{price?.description}}

} @else if (price.priceType == 'usage') { -
+
{{price.name}}
-

{{price.price?.taxIncludedAmount?.value}} {{price.price?.taxIncludedAmount?.unit}}

-

/{{price.unitOfMeasure}}

-

{{price?.description}}

+
+ +
} @else { -
+
{{price.name}}
-

{{price.price?.taxIncludedAmount?.value}} {{price.price?.taxIncludedAmount?.unit}}

-

{{price?.description}}

+
+ +
} } - @if(selectedProduct?.productPrice?.length==0){ -
+ @if(productOff?.productOfferingPrice?.length==0){ +
{{ 'SHOPPING_CART._free' | translate }}

{{ 'SHOPPING_CART._free_desc' | translate }}

-
+
}
} diff --git a/src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.ts b/src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.ts index 5331ebcd..bbe5f6a8 100644 --- a/src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.ts +++ b/src/app/pages/product-inventory/inventory-items/inventory-products/inventory-products.component.ts @@ -52,6 +52,7 @@ export class InventoryProductsComponent implements OnInit { selectedInv:any; selectedResources:any[]=[]; selectedServices:any[]=[]; + productOff:any; errorMessage:any=''; showError:boolean=false; @@ -231,37 +232,63 @@ export class InventoryProductsComponent implements OnInit { console.log(id) } - selectProduct(prod:any){ + async selectProduct(prod:any){ this.selectedProduct=prod; console.log('selecting prod') console.log(this.selectedProduct) this.selectedResources=[]; this.selectedServices=[]; - for(let i=0; i { - if(spec.serviceSpecification != undefined){ - for(let j=0; j < spec.serviceSpecification.length; j++){ - this.api.getServiceSpec(spec.serviceSpecification[j].id).then(serv => { - this.selectedServices.push(serv); - console.log(serv) - }) - } + let spec = await this.api.getProductSpecification(this.selectedProduct.product.productSpecification.id) + if(spec.serviceSpecification != undefined){ + for(let j=0; j < spec.serviceSpecification.length; j++){ + let serv = await this.api.getServiceSpec(spec.serviceSpecification[j].id); + this.selectedServices.push(serv); } - if(spec.resourceSpecification != undefined){ - for(let j=0; j < spec.resourceSpecification.length; j++){ - this.api.getResourceSpec(spec.resourceSpecification[j].id).then(res => { - this.selectedResources.push(res); - console.log(res) - }) + } + if(spec.resourceSpecification != undefined){ + for(let j=0; j < spec.resourceSpecification.length; j++){ + let res = await this.api.getResourceSpec(spec.resourceSpecification[j].id); + this.selectedResources.push(res); + } + } + console.log('--- spec') + console.log(spec) + + let prodOff = await this.api.getProductById(this.selectedProduct.productOffering.id); + let prodPrices: any[] | undefined= prodOff.productOfferingPrice; + let prices: any[]=[]; + if(prodPrices!== undefined){ + for(let j=0; j < prodPrices.length; j++){ + let price = await this.api.getProductPrice(prodPrices[j].id); + prices.push(price); + console.log(price) + if(price.priceType == 'custom'){ + this.checkCustom = true; } } - }) + } + + this.productOff={ + id: prodOff.id, + name: prodOff.name, + category: prodOff.category, + description: prodOff.description, + lastUpdate: prodOff.lastUpdate, + attachment: spec.attachment, + productOfferingPrice: prices, + productSpecification: prodOff.productSpecification, + productOfferingTerm: prodOff.productOfferingTerm, + serviceLevelAgreement: prodOff.serviceLevelAgreement, + version: prodOff.version + } this.showDetails=true; console.log(this.selectedProduct) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index acf6e7ff..9d6b1434 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -309,7 +309,7 @@ "_delete": "Yes, delete", "_confirm_delete": "Are you sure about deleting the following billing address?", "_cancel": "No, cancel", - "_invalid_phone": "Phonenumber is invalid!", + "_invalid_phone": "Phone number is invalid!", "_invalid_email": "Email is invalid!", "_save": "Save", "_success": "Updated successfully", @@ -395,7 +395,7 @@ "_delete": "Yes, delete", "_confirm_delete": "Are you sure about deleting the following billing address?", "_cancel": "No, cancel", - "_invalid_phone": "Phonenumber is invalid!", + "_invalid_phone": "Phone number is invalid!", "_invalid_email": "Email is invalid!", "_no_billing": "There's no billing information.", "_close_modal": "Close modal", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index acf6e7ff..9d6b1434 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -309,7 +309,7 @@ "_delete": "Yes, delete", "_confirm_delete": "Are you sure about deleting the following billing address?", "_cancel": "No, cancel", - "_invalid_phone": "Phonenumber is invalid!", + "_invalid_phone": "Phone number is invalid!", "_invalid_email": "Email is invalid!", "_save": "Save", "_success": "Updated successfully", @@ -395,7 +395,7 @@ "_delete": "Yes, delete", "_confirm_delete": "Are you sure about deleting the following billing address?", "_cancel": "No, cancel", - "_invalid_phone": "Phonenumber is invalid!", + "_invalid_phone": "Phone number is invalid!", "_invalid_email": "Email is invalid!", "_no_billing": "There's no billing information.", "_close_modal": "Close modal",