Merge branch 'develop' into parent-child-characteristics

.gitlab-ci.yml

+include:
+  - project: osl/code/org.etsi.osl.main
+    ref: main
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build.yml
+    rules:
+      - if: '$CI_COMMIT_REF_NAME == "main"'
+  
+  - project: osl/code/org.etsi.osl.main
+    ref: develop
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build.yml
+    rules:
+      - if: '$CI_COMMIT_REF_NAME == "develop"'
+
+  - project: osl/code/org.etsi.osl.main
+    ref: develop
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build_unprotected.yml
+    rules:
+      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
+
+angular_build:
+  extends: .angular_build
+
+docker_build:
+  extends: .docker_build
+  needs:
+    - angular_build

src/app/p_services/admin/inventoryManagement/list-service-inventory/list-service-inventory.component.html

@@ -32,9 +32,8 @@
 
                         <ng-container matColumnDef="category">
                             <th mat-header-cell *matHeaderCellDef mat-sort-header> Category </th>
-                            <td mat-cell *matCellDef="let element"> 
-                                <span *ngIf="element.category === 'ResourceFacingServiceSpecification' ">RFSS</span>
-                                <span *ngIf="element.category === 'CustomerFacingServiceSpecification' ">CFSS</span> 
+                            <td mat-cell *matCellDef="let element">
+                                <span>{{element.category}}</span> 
                             </td>
                         </ng-container>
 

src/app/p_services/admin/inventoryManagement/list-service-inventory/list-service-inventory.component.ts

@@ -48,7 +48,7 @@ export class ListServiceInventoryComponent implements OnInit {
         this.dataSource.sortingDataAccessor = (item, property): string | number => {
           switch (property) {
             case 'serviceDate': return new Date(item.serviceDate).getTime();
-            case 'category': return item[property] === 'CustomerFacingServiceSpecification' ? 'CFSS': 'RFSS';
+            // case 'category': return item[property] === 'CustomerFacingServiceSpecification' ? 'CFSS': 'RFSS';
             default: return item[property];
           }
         }

src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html

@@ -357,7 +357,7 @@
                                             There are not any Supporting Resources allocated.
                                         </div>
                                         <p *ngFor="let resource of service?.supportingResource" class="mb-2">
-                                            <a *ngIf="resource.id" routerLink='/resources/resource_inventory/{{resource.id}}'>{{resource.name}}</a>
+                                            <a *ngIf="resource.id" routerLink='/resources/resource/{{resource.id}}'>{{resource.name}}</a>
                                             <span *ngIf="!resource.id">{{resource.name}}</span>
                                         </p>
                                     </div>