Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix for resource order management api #97

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

fix for resource order management api #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2d847f
fix for resource order management api
ctranoris Aug 17, 2023
4b04b94
theming.scss must be present otherwise the deployment build fails
ctranoris Aug 21, 2023
dab4cc4
version change
ctranoris Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,4 @@ src/assets/config/config.prod.default.json
src/assets/config/config.prod.json
src/assets/config/config.theming.json
src/assets/config/config.prod.default.json
/src/assets/config/theming.scss
/.angular
2 changes: 1 addition & 1 deletion src/app/openApis/portalRepositoryAPI/models/portal-user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export interface PortalUser {
password?: string;
passwordUnencrypted?: string;
products?: Array<Product>;
roles?: Array<'ROLE_ADMIN' | 'ROLE_EXPERIMENTER' | 'ROLE_NFV_DEVELOPER' | 'ROLE_TESTBED_PROVIDER' | 'ROLE_MENTOR'>;
roles?: Array<'ADMIN' | 'ROLE_EXPERIMENTER' | 'ROLE_NFV_DEVELOPER' | 'ROLE_TESTBED_PROVIDER' | 'ROLE_MENTOR'>;
subscribedResources?: Array<SubscribedResource>;
username?: string;
vfimages?: Array<VFImage>;
Expand Down
2 changes: 1 addition & 1 deletion src/app/openApis/resourceOrderManagement/api-configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Injectable } from '@angular/core';
providedIn: 'root',
})
export class ApiConfiguration {
rootUrl: string = '//portal.openslice.io';
rootUrl: string = '//portal.openslice.io/tmf-api';
}

export interface ApiConfigurationInterface {
Expand Down
20 changes: 10 additions & 10 deletions src/app/openApis/resourceOrderManagement/services/resource-order.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import { ResourceOrderUpdate } from '../models/resource-order-update';
providedIn: 'root',
})
class ResourceOrderService extends __BaseService {
static readonly listResourceOrderPath = '/tmf-api/resourceOrderingManagement/v4/resourceOrder';
static readonly createResourceOrderPath = '/tmf-api/resourceOrderingManagement/v4/resourceOrder';
static readonly retrieveResourceOrderPath = '/tmf-api/resourceOrderingManagement/v4/resourceOrder/{id}';
static readonly deleteResourceOrderPath = '/tmf-api/resourceOrderingManagement/v4/resourceOrder/{id}';
static readonly patchResourceOrderPath = '/tmf-api/resourceOrderingManagement/v4/resourceOrder/{id}';
static readonly listResourceOrderPath = '/resourceOrderingManagement/v4/resourceOrder';
static readonly createResourceOrderPath = '/resourceOrderingManagement/v4/resourceOrder';
static readonly retrieveResourceOrderPath = '/resourceOrderingManagement/v4/resourceOrder/{id}';
static readonly deleteResourceOrderPath = '/resourceOrderingManagement/v4/resourceOrder/{id}';
static readonly patchResourceOrderPath = '/resourceOrderingManagement/v4/resourceOrder/{id}';

constructor(
config: __Configuration,
Expand Down Expand Up @@ -51,7 +51,7 @@ class ResourceOrderService extends __BaseService {
if (params.fields != null) __params = __params.set('fields', params.fields.toString());
let req = new HttpRequest<any>(
'GET',
this.rootUrl + `/tmf-api/resourceOrderingManagement/v4/resourceOrder`,
this.rootUrl + `/resourceOrderingManagement/v4/resourceOrder`,
__body,
{
headers: __headers,
Expand Down Expand Up @@ -106,7 +106,7 @@ class ResourceOrderService extends __BaseService {
if (params.name != null) __params = __params.set('name', params.name.toString());
let req = new HttpRequest<any>(
'POST',
this.rootUrl + `/tmf-api/resourceOrderingManagement/v4/resourceOrder`,
this.rootUrl + `/resourceOrderingManagement/v4/resourceOrder`,
__body,
{
headers: __headers,
Expand Down Expand Up @@ -159,7 +159,7 @@ class ResourceOrderService extends __BaseService {
if (params.fields != null) __params = __params.set('fields', params.fields.toString());
let req = new HttpRequest<any>(
'GET',
this.rootUrl + `/tmf-api/resourceOrderingManagement/v4/resourceOrder/${encodeURIComponent(params.id)}`,
this.rootUrl + `/resourceOrderingManagement/v4/resourceOrder/${encodeURIComponent(params.id)}`,
__body,
{
headers: __headers,
Expand Down Expand Up @@ -206,7 +206,7 @@ class ResourceOrderService extends __BaseService {

let req = new HttpRequest<any>(
'DELETE',
this.rootUrl + `/tmf-api/resourceOrderingManagement/v4/resourceOrder/${encodeURIComponent(id)}`,
this.rootUrl + `/resourceOrderingManagement/v4/resourceOrder/${encodeURIComponent(id)}`,
__body,
{
headers: __headers,
Expand Down Expand Up @@ -254,7 +254,7 @@ class ResourceOrderService extends __BaseService {
__body = params.body;
let req = new HttpRequest<any>(
'PATCH',
this.rootUrl + `/tmf-api/resourceOrderingManagement/v4/resourceOrder/${encodeURIComponent(params.id)}`,
this.rootUrl + `/resourceOrderingManagement/v4/resourceOrder/${encodeURIComponent(params.id)}`,
__body,
{
headers: __headers,
Expand Down
5 changes: 4 additions & 1 deletion src/app/shared/services/app.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { ApiConfiguration as ResourceCatalogAPIconfig} from 'src/app/openApis/re
import { ApiConfiguration as ResourceInventoryAPIconfig} from 'src/app/openApis/resourceInventoryManagement/api-configuration'
import { ApiConfiguration as resourcePoolManagementAPIconfig} from 'src/app/openApis/resourcePoolManagement/api-configuration'
import { ApiConfiguration as ProductCatalogAPIconfig} from 'src/app/openApis/productCatalogManagement/api-configuration'
import { ApiConfiguration as ResourceOrderingAPIconfig} from 'src/app/openApis/resourceOrderManagement/api-configuration'

import { NavigationEnd, NavigationStart, Router } from '@angular/router';
import { filter, first } from 'rxjs/operators';
Expand All @@ -40,7 +41,8 @@ export class AppService {
private tmfResourceCatalogConfig: ResourceCatalogAPIconfig,
private tmfResourceInventoryConfig: ResourceInventoryAPIconfig,
private resourcePoolManagementAPIconfig: resourcePoolManagementAPIconfig,
private tmfProductCatalogConfig: ProductCatalogAPIconfig
private tmfProductCatalogConfig: ProductCatalogAPIconfig,
private tmfResourceOrderingAPIconfig: ResourceOrderingAPIconfig
) {
this.setAPIurls()
this.recognizePortalDomain()
Expand All @@ -64,6 +66,7 @@ export class AppService {
this.serviceTestManagementAPIconfig.rootUrl = this.config.APITMFURL
this.resourcePoolManagementAPIconfig.rootUrl = this.config.APITMFURL
this.tmfProductCatalogConfig.rootUrl = this.config.APITMFURL
this.tmfResourceOrderingAPIconfig.rootUrl = this.config.APITMFURL
}

//recognition of which portal is used (services/testing/product)
Expand Down
22 changes: 22 additions & 0 deletions src/assets/config/theming.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Default theme

$primary: #428bca;
$secondary: #6c6c6c;

// ------------------------------
// Predefined palette 1 theme

// $primary: rgba(0,45,126);
// $secondary: #6c6c6c;

// ------------------------------
// Predefined palette 2 theme

// $primary: rgba(255, 124, 0);
// $secondary: #6c6c6c;

// ------------------------------
// Predefined palette 3 theme

// $primary: rgba(247,1, 2);
// $secondary: #6c6c6c;
Loading