Merge branch 'feature/422765_adapt_contract_negotiation' into 'develop'

feature/422765_adapt_contract_negotiation

See merge request upm-inesdata/inesdata-connector-interface!6

Author: ralconada-gmv

Dockerfile

@@ -9,7 +9,7 @@ RUN npm run build
 # Stage 2: Serve app with nginx
 FROM nginx:alpine
 COPY --from=build /app/deployment/nginx.conf /etc/nginx/nginx.conf
-COPY --from=build /app/dist/connector-management-interface /usr/share/nginx/html
+COPY --from=build /app/dist/inesdata-connector-interface /usr/share/nginx/html
 COPY --from=build /app/src/assets /usr/share/nginx/html/assets
 EXPOSE 80
 

angular.json

@@ -3,7 +3,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "connector-management-interface": {
+    "inesdata-connector-interface": {
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
@@ -20,8 +20,8 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "baseHref": "/connector-management-interface/",
-            "outputPath": "dist/connector-management-interface",
+            "baseHref": "/inesdata-connector-interface/",
+            "outputPath": "dist/inesdata-connector-interface",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
@@ -78,10 +78,10 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "buildTarget": "connector-management-interface:build:production"
+              "buildTarget": "inesdata-connector-interface:build:production"
             },
             "development": {
-              "buildTarget": "connector-management-interface:build:development"
+              "buildTarget": "inesdata-connector-interface:build:development"
             }
           },
           "options": {
@@ -92,7 +92,7 @@
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "buildTarget": "connector-management-interface:build"
+            "buildTarget": "inesdata-connector-interface:build"
           }
         },
         "test": {

docker/Dockerfile

@@ -15,12 +15,12 @@ RUN npm install &&\
 FROM nginx:alpine
 
 ENV NGINX_HOME=/usr/share/nginx
-RUN mkdir ${NGINX_HOME}/html/connector-management-interface
-RUN chmod 755 ${NGINX_HOME}/html/connector-management-interface
-ENV DOCUMENT_ROOT=${NGINX_HOME}/html/connector-management-interface
+RUN mkdir ${NGINX_HOME}/html/inesdata-connector-interface
+RUN chmod 755 ${NGINX_HOME}/html/inesdata-connector-interface
+ENV DOCUMENT_ROOT=${NGINX_HOME}/html/inesdata-connector-interface
 
 # copy static contents of project to nginx html
-COPY --from=builder /app/dist/connector-management-interface ${DOCUMENT_ROOT}
+COPY --from=builder /app/dist/inesdata-connector-interface ${DOCUMENT_ROOT}
 
 COPY ./docker/assets/scripts/docker-entrypoint.sh ${NGINX_HOME}
 

karma.conf.js

@@ -25,7 +25,7 @@ module.exports = function (config) {
       suppressAll: true // removes the duplicated traces
     },
     coverageReporter: {
-      dir: require('path').join(__dirname, './coverage/connector-management-interface'),
+      dir: require('path').join(__dirname, './coverage/inesdata-connector-interface'),
       subdir: '.',
       reporters: [
         { type: 'html' },

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "connector-management-interface",
+  "name": "inesdata-connector-interface",
   "version": "0.2.0-SNAPSHOT",
   "project": "com.gmv.inesdata",
   "scripts": {

package.json

@@ -2,11 +2,6 @@ import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
 
 export const routes: Routes = [
-  {
-    path: 'introduction',
-    data: {title: 'Getting Started', icon: 'info_outline'},
-    loadChildren: () => import('./pages/introduction/introduction.module').then(m => m.IntroductionModule)
-  },
   {
     path: 'catalog',
     data: {title: 'Catalog Browser', icon: 'sim_card'},
@@ -38,7 +33,7 @@ export const routes: Routes = [
     loadChildren: () => import('./pages/assets/assets.module').then(m => m.AssetsModule)
   },
   {
-    path: '', redirectTo: 'introduction', pathMatch: 'full'
+    path: '', redirectTo: 'assets', pathMatch: 'full'
   }
 ];
 

src/app/app-routing.module.ts

@@ -6,8 +6,7 @@ import {AppConfigService} from "./app-config.service";
 
 @Component({
   selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss']
+  templateUrl: './app.component.html'
 })
 export class AppComponent implements OnInit {
 

src/app/app.component.scss

@@ -15,13 +15,12 @@ import {MAT_FORM_FIELD_DEFAULT_OPTIONS} from '@angular/material/form-field';
 import {AppConfigService} from "./app-config.service";
 import {MatSnackBarModule} from "@angular/material/snack-bar";
 import {CONNECTOR_CATALOG_API, CONNECTOR_MANAGEMENT_API, DATA_ADDRESS_TYPES} from "./shared/utils/app.constants";
-import {HTTP_INTERCEPTORS} from "@angular/common/http";
+import {HTTP_INTERCEPTORS, HttpClientModule} from "@angular/common/http";
 import {EdcApiKeyInterceptor} from "./shared/interceptors/apikey.interceptor";
 import {environment} from "../environments/environment";
 import { EdcConnectorClient } from "@think-it-labs/edc-connector-client";
 import {MatCardModule} from '@angular/material/card';
 import {SharedModule} from './shared/shared.module';
-import { HttpClientModule } from '@angular/common/http';
 
 @NgModule({
   imports: [
@@ -72,7 +71,6 @@ import { HttpClientModule } from '@angular/common/http';
     {
       provide: HTTP_INTERCEPTORS, multi: true, useFactory: () => {
         let i = new EdcApiKeyInterceptor();
-        // TODO: read this from app.config.json??
         i.apiKey = environment.apiKey
         return i;
       }, deps: [AppConfigService]