From dce61e13252489c5db8dd7b69154806da00c419b Mon Sep 17 00:00:00 2001 From: Kostis Trantzas Date: Thu, 29 Aug 2024 18:50:30 +0300 Subject: [PATCH 1/7] Fix the display of Supporting Services in Service Orders than contain multiple Service Order Items (#8) --- ...resource-reservation-calendar.component.ts | 2 +- .../list-service-orders.component.ts | 2 +- .../preview-service-order.component.ts | 22 +++++++++++++------ .../service-order-calendar.component.ts | 2 +- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts b/src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts index 1727f5c..4ea9e87 100644 --- a/src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts +++ b/src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts @@ -84,7 +84,7 @@ export class ResourceReservationCalendarComponent implements OnInit { this.reservations ).map(function(eventEl: Reservation) { - console.info("this is event: " + eventEl.id +" " + eventEl.requestedPeriodStartDateTime ) + // console.info("this is event: " + eventEl.id +" " + eventEl.requestedPeriodStartDateTime ) // var result = new Date(eventEl.startDate); // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today diff --git a/src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts b/src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts index 95b988e..fd2594f 100644 --- a/src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts +++ b/src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts @@ -109,7 +109,7 @@ export class ListServiceOrdersComponent implements OnInit { this.serviceOrders ).map(function(eventEl: ServiceOrder) { - console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate ) + // console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate ) // var result = new Date(eventEl.startDate); // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today diff --git a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.ts b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.ts index 69c43d6..37851f0 100644 --- a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.ts +++ b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.ts @@ -58,8 +58,8 @@ export class PreviewServiceOrderComponent implements OnInit { serviceOrderNotFound: boolean = false finishedLoading: boolean = false - supportingServices: Service[][] = [[]] - + supportingServices: Service[][] = [] + // supportingServices' first array is Order Item Index and second array is SupportingService index of the respective Order Item editMode: boolean = false editModeNotes: boolean = false isAdminUser: boolean = false @@ -122,18 +122,26 @@ export class PreviewServiceOrderComponent implements OnInit { this.checkboxesOrderItemList = [] this.currentItemRelationshipsUrl = [] - this.serviceOrder.orderItem.forEach((orderItem, index) => { + + this.supportingServices = [] + this.serviceOrder.orderItem.forEach((orderItem) => { + + //Expands the length of the array for each Service Order Item + this.supportingServices.push([]) this.checkboxesOrderItemList.push({orderItem: orderItem, isChecked: false}) orderItem.service.serviceCharacteristic.sort(this.sortingService.ascStringSortingFunctionByNameProperty()) - orderItem.service.supportingService.forEach( (supService, serviceIndex) => { - this.retrieveServiceInventory(supService.id).pipe(delay(Math.random()*1000)).subscribe( - data => this.supportingServices[index][serviceIndex] = data + orderItem.service.supportingService.forEach( (supService) => { + this.retrieveServiceInventory(supService.id).subscribe( + data => { + const orderItemIndex = this.serviceOrder.orderItem.findIndex(SOI => orderItem.id === SOI.id) + const supportingServiceIndex = this.serviceOrder.orderItem[orderItemIndex].service.supportingService.findIndex(SupS => supService.id === SupS.id) + this.supportingServices[orderItemIndex][supportingServiceIndex] = data + } ) }) - this.currentItemRelationshipsUrl.push( this.orderService.rootUrl + "/serviceOrdering/v4/serviceOrder/" + this.serviceOrder.id + "/item/" + orderItem.id + "/relationship_graph" ); }) diff --git a/src/app/p_services/admin/orderManagement/service-order-calendar/service-order-calendar.component.ts b/src/app/p_services/admin/orderManagement/service-order-calendar/service-order-calendar.component.ts index 8daf914..39e0af6 100644 --- a/src/app/p_services/admin/orderManagement/service-order-calendar/service-order-calendar.component.ts +++ b/src/app/p_services/admin/orderManagement/service-order-calendar/service-order-calendar.component.ts @@ -69,7 +69,7 @@ export class ServiceOrdersCalendarComponent implements OnInit { this.serviceOrders ).map(function(eventEl: ServiceOrder) { - console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate ) + // console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate ) // var result = new Date(eventEl.startDate); // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today -- GitLab From dae46c5491af3cb367593dee873c19478be80189 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 30 Aug 2024 13:53:56 +0000 Subject: [PATCH 2/7] fix: strictly compare between strings --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad80398..06cd4a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ include: - ci-templates/default.yml - ci-templates/build.yml rules: - - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' + - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' - project: osl/code/org.etsi.osl.main ref: develop @@ -29,7 +29,7 @@ include: - ci-templates/default.yml - ci-templates/build_unprotected.yml rules: - - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED' + - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"' angular_build: extends: .angular_build -- GitLab From 91185ca2cc6f969a49e02e90ae3187f68e9bc4df Mon Sep 17 00:00:00 2001 From: trantzas Date: Tue, 17 Sep 2024 20:08:13 +0000 Subject: [PATCH 3/7] Development preparation for release 2024Q4 --- src/assets/config/config.prod.default.json | 2 +- src/assets/config/config.theming.default.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/config/config.prod.default.json b/src/assets/config/config.prod.default.json index 0465cdc..99eba47 100644 --- a/src/assets/config/config.prod.default.json +++ b/src/assets/config/config.prod.default.json @@ -1,6 +1,6 @@ { "TITLE": "OpenSlice by ETSI", - "PORTALVERSION":"2024Q2", + "PORTALVERSION":"2024Q4-SNAPSHOT", "WIKI": "https://osl.etsi.org/documentation", "BUGZILLA": "{BASEURL}/bugzilla/", "STATUS": "{BASEURL}/healthstatus/", diff --git a/src/assets/config/config.theming.default.json b/src/assets/config/config.theming.default.json index bcb6a64..b4b14d6 100644 --- a/src/assets/config/config.theming.default.json +++ b/src/assets/config/config.theming.default.json @@ -5,5 +5,5 @@ "FAVICON_PATH":"favicon.ico", "WHO_WE_ARE_HTML":"
ETSI SDG OpenSlice|https://osl.etsi.org
The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network Slice as a Service (NSaaS).
OpenSlice by ETSI|http://portal.openslice.io
A portal that allows 5G experimenters to design and deploy network services towards the infrastructure.
OpenSlice by ETSI wiki|https://osl.etsi.org/documentation
A wiki containing OpenSlice software documentation.
", "CONNECT_WITH_US_HTML":"
LinkedIn
Slack
Twitter
", - "FOOTER_HTML":"
OpenSlice has received funding from various projects under European Programmes for research, technological development and demonstration. You may refer to our extensive ecosystem for further details.
Openslice by ETSI running OSL version 2024Q2 | Terms and Conditions | © 2024 on behalf of osl.etsi.org
" + "FOOTER_HTML":"
OpenSlice has received funding from various projects under European Programmes for research, technological development and demonstration. You may refer to our extensive ecosystem for further details.
Openslice by ETSI running OSL version 2024Q4-SNAPSHOT | Terms and Conditions | © 2024 on behalf of osl.etsi.org
" } \ No newline at end of file -- GitLab From 690aa8f60486a6312df846a5867a62463c26a2c3 Mon Sep 17 00:00:00 2001 From: Kostis Trantzas Date: Mon, 18 Nov 2024 19:19:49 +0200 Subject: [PATCH 4/7] Resource Inventory Notes overflow fix (#22) --- .../preview-resource/preview-resource.component.html | 2 +- .../preview-resource/preview-resource.component.scss | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html b/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html index bdf2699..5dab83e 100644 --- a/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html +++ b/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html @@ -146,7 +146,7 @@ {{ note.text }}
written by {{ note.author }} @ - {{ note.date | date: "d MMM y, h:mm a" }} + {{ note.date | date: "d MMM y, h:mm:ss a" }}
diff --git a/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.scss b/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.scss index 3cf0233..bc0591a 100644 --- a/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.scss +++ b/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.scss @@ -14,3 +14,8 @@ .tab-pane > .card:nth-child(1) { min-height: max(350px, 20vh); } + +.notes-container { + max-height: 265px; + overflow-y: auto; +} \ No newline at end of file -- GitLab From 3b104cb052db99454abd67f3ba3878fb4b92dc45 Mon Sep 17 00:00:00 2001 From: Kostis Trantzas Date: Thu, 21 Nov 2024 18:24:50 +0200 Subject: [PATCH 5/7] Fix for #24 - A non-admin user must not be able to change a Service Order & Service state --- .../preview-service-order.component.html | 12 ++++++------ .../preview-service/preview-service.component.html | 12 ++++++------ .../preview-service/preview-service.component.ts | 2 ++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html index 92974ea..950134d 100644 --- a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html +++ b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html @@ -155,12 +155,12 @@ -->
- +
State

{{serviceOrder?.state}}

 - + State @@ -181,7 +181,7 @@
- +
Starting Date

{{serviceOrder?.startDate | date:'d MMM y, h:mm a'}} - Local Time

@@ -189,7 +189,7 @@
- + Starting Date @@ -200,7 +200,7 @@
- +
Expected Completion Date

{{serviceOrder?.expectedCompletionDate | date:'d MMM y, h:mm a'}} - Local Time

@@ -209,7 +209,7 @@ - + Expected Completion Date diff --git a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html index 7296ad1..fc1630d 100644 --- a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html +++ b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html @@ -61,13 +61,13 @@
- +
State

{{service?.state}}

 - + State
- +
Starting Date

@@ -127,7 +127,7 @@ UTC

 - Starting Date
- +
Ending Date

{{service?.endDate | date:'d MMM y, h:mm a'}} - Local @@ -152,7 +152,7 @@ UTC

 - Ending Date Date: Tue, 14 Jan 2025 16:20:26 +0200 Subject: [PATCH 6/7] Preparing the 2024Q4_RC: - Remove -SNAPSHOT from config.prod.default.json - Remove -SNAPSHOT from config.theming.default.json - Updating the copyright date at config.theming.default.json --- src/assets/config/config.prod.default.json | 2 +- src/assets/config/config.theming.default.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assets/config/config.prod.default.json b/src/assets/config/config.prod.default.json index 99eba47..8acbcb4 100644 --- a/src/assets/config/config.prod.default.json +++ b/src/assets/config/config.prod.default.json @@ -1,6 +1,6 @@ { "TITLE": "OpenSlice by ETSI", - "PORTALVERSION":"2024Q4-SNAPSHOT", + "PORTALVERSION":"2024Q4", "WIKI": "https://osl.etsi.org/documentation", "BUGZILLA": "{BASEURL}/bugzilla/", "STATUS": "{BASEURL}/healthstatus/", diff --git a/src/assets/config/config.theming.default.json b/src/assets/config/config.theming.default.json index b4b14d6..312428f 100644 --- a/src/assets/config/config.theming.default.json +++ b/src/assets/config/config.theming.default.json @@ -3,7 +3,7 @@ "DEPLOYMENT_LOGO_PATH":"assets/images/logo_clear.png", "DEFAULT_SERVICE_LOGO_PATH":"assets/images/logo_icon_original.png", "FAVICON_PATH":"favicon.ico", - "WHO_WE_ARE_HTML":"
ETSI SDG OpenSlice|https://osl.etsi.org
The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network Slice as a Service (NSaaS).
OpenSlice by ETSI|http://portal.openslice.io
A portal that allows 5G experimenters to design and deploy network services towards the infrastructure.
OpenSlice by ETSI wiki|https://osl.etsi.org/documentation
A wiki containing OpenSlice software documentation.
", + "WHO_WE_ARE_HTML":"
ETSI SDG OpenSlice|https://osl.etsi.org
The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network as a Service (NaaS).
OpenSlice by ETSI|http://portal.openslice.eu
A portal that allows 5G experimenters to design and deploy network services towards the infrastructure.
OpenSlice by ETSI wiki|https://osl.etsi.org/documentation
A wiki containing OpenSlice software documentation.
", "CONNECT_WITH_US_HTML":"
", - "FOOTER_HTML":"
OpenSlice has received funding from various projects under European Programmes for research, technological development and demonstration. You may refer to our extensive ecosystem for further details.
Openslice by ETSI running OSL version 2024Q4-SNAPSHOT | Terms and Conditions | © 2024 on behalf of osl.etsi.org
" + "FOOTER_HTML":"
OpenSlice has received funding from various projects under European Programmes for research, technological development and demonstration. You may refer to our extensive ecosystem for further details.
Openslice by ETSI running OSL version 2024Q4 | Terms and Conditions | © 2025 on behalf of osl.etsi.org
" } \ No newline at end of file -- GitLab From b8e18fe9b9ed15fd98b51b9544a4c75fd752a566 Mon Sep 17 00:00:00 2001 From: trantzas Date: Tue, 14 Jan 2025 14:52:16 +0000 Subject: [PATCH 7/7] Preparing the 2024Q4_RC: - Matching contact.component.html code with config.theming.default.json --- src/app/shared/components/contact/contact.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/components/contact/contact.component.html b/src/app/shared/components/contact/contact.component.html index c496ccb..d7c57ae 100644 --- a/src/app/shared/components/contact/contact.component.html +++ b/src/app/shared/components/contact/contact.component.html @@ -6,7 +6,7 @@

Who we are

ETSI SDG OpenSlice | https://osl.etsi.org
The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network Slice as a Service (NSaaS).
+ href='https://osl.etsi.org/' class='text-white'>https://osl.etsi.org
The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network as a Service (NaaS).
{{config.TITLE}} | {{config.WEBURL}}
A portal that allows 5G experimenters to design and deploy network services towards the infrastructure.
-- GitLab