Skip to content

Commit 849482c

Browse files
committed
#422765 - Adapt contract negotiation. Fixed some bugs from other sections. Refactor for project name
1 parent f881e90 commit 849482c

File tree

44 files changed

+492
-456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+492
-456
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN npm run build
99
# Stage 2: Serve app with nginx
1010
FROM nginx:alpine
1111
COPY --from=build /app/deployment/nginx.conf /etc/nginx/nginx.conf
12-
COPY --from=build /app/dist/connector-management-interface /usr/share/nginx/html
12+
COPY --from=build /app/dist/inesdata-connector-interface /usr/share/nginx/html
1313
COPY --from=build /app/src/assets /usr/share/nginx/html/assets
1414
EXPOSE 80
1515

angular.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": 1,
44
"newProjectRoot": "projects",
55
"projects": {
6-
"connector-management-interface": {
6+
"inesdata-connector-interface": {
77
"projectType": "application",
88
"schematics": {
99
"@schematics/angular:component": {
@@ -20,8 +20,8 @@
2020
"build": {
2121
"builder": "@angular-devkit/build-angular:browser",
2222
"options": {
23-
"baseHref": "/connector-management-interface/",
24-
"outputPath": "dist/connector-management-interface",
23+
"baseHref": "/inesdata-connector-interface/",
24+
"outputPath": "dist/inesdata-connector-interface",
2525
"index": "src/index.html",
2626
"main": "src/main.ts",
2727
"polyfills": "src/polyfills.ts",
@@ -78,10 +78,10 @@
7878
"builder": "@angular-devkit/build-angular:dev-server",
7979
"configurations": {
8080
"production": {
81-
"buildTarget": "connector-management-interface:build:production"
81+
"buildTarget": "inesdata-connector-interface:build:production"
8282
},
8383
"development": {
84-
"buildTarget": "connector-management-interface:build:development"
84+
"buildTarget": "inesdata-connector-interface:build:development"
8585
}
8686
},
8787
"options": {
@@ -92,7 +92,7 @@
9292
"extract-i18n": {
9393
"builder": "@angular-devkit/build-angular:extract-i18n",
9494
"options": {
95-
"buildTarget": "connector-management-interface:build"
95+
"buildTarget": "inesdata-connector-interface:build"
9696
}
9797
},
9898
"test": {

docker/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ RUN npm install &&\
1515
FROM nginx:alpine
1616

1717
ENV NGINX_HOME=/usr/share/nginx
18-
RUN mkdir ${NGINX_HOME}/html/connector-management-interface
19-
RUN chmod 755 ${NGINX_HOME}/html/connector-management-interface
20-
ENV DOCUMENT_ROOT=${NGINX_HOME}/html/connector-management-interface
18+
RUN mkdir ${NGINX_HOME}/html/inesdata-connector-interface
19+
RUN chmod 755 ${NGINX_HOME}/html/inesdata-connector-interface
20+
ENV DOCUMENT_ROOT=${NGINX_HOME}/html/inesdata-connector-interface
2121

2222
# copy static contents of project to nginx html
23-
COPY --from=builder /app/dist/connector-management-interface ${DOCUMENT_ROOT}
23+
COPY --from=builder /app/dist/inesdata-connector-interface ${DOCUMENT_ROOT}
2424

2525
COPY ./docker/assets/scripts/docker-entrypoint.sh ${NGINX_HOME}
2626

karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module.exports = function (config) {
2525
suppressAll: true // removes the duplicated traces
2626
},
2727
coverageReporter: {
28-
dir: require('path').join(__dirname, './coverage/connector-management-interface'),
28+
dir: require('path').join(__dirname, './coverage/inesdata-connector-interface'),
2929
subdir: '.',
3030
reporters: [
3131
{ type: 'html' },

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "connector-management-interface",
2+
"name": "inesdata-connector-interface",
33
"version": "0.2.0-SNAPSHOT",
44
"project": "com.gmv.inesdata",
55
"scripts": {

src/app/app-routing.module.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ import {NgModule} from '@angular/core';
22
import {RouterModule, Routes} from '@angular/router';
33

44
export const routes: Routes = [
5-
{
6-
path: 'introduction',
7-
data: {title: 'Getting Started', icon: 'info_outline'},
8-
loadChildren: () => import('./pages/introduction/introduction.module').then(m => m.IntroductionModule)
9-
},
105
{
116
path: 'catalog',
127
data: {title: 'Catalog Browser', icon: 'sim_card'},
@@ -38,7 +33,7 @@ export const routes: Routes = [
3833
loadChildren: () => import('./pages/assets/assets.module').then(m => m.AssetsModule)
3934
},
4035
{
41-
path: '', redirectTo: 'introduction', pathMatch: 'full'
36+
path: '', redirectTo: 'assets', pathMatch: 'full'
4237
}
4338
];
4439

src/app/pages/assets/asset-viewer/asset-viewer.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</button>
1616
</div>
1717

18-
<div fxLayout="row wrap" fxLayoutAlign="start start">
19-
<mat-card *ngFor="let asset of assets" class="asset-card">
18+
<div fxLayout="row wrap" fxLayoutGap="15px" fxLayoutAlign="start start">
19+
<mat-card *ngFor="let asset of assets">
2020
<mat-card-header>
2121
<mat-icon mat-card-avatar>upload</mat-icon>
2222
<mat-card-title>{{asset.id}}</mat-card-title>

src/app/pages/assets/asset-viewer/asset-viewer.component.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
margin: 20px;
33
}
44

5-
.asset-card {
6-
width: 500px;
7-
margin-right: 15px;
8-
margin-bottom: 15px;
9-
}
10-
115
.main-property-icon {
126
font-size: 12px;
137
}

src/app/pages/assets/asset-viewer/asset-viewer.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export class AssetViewerComponent implements OnInit {
3737
switchMap(() => {
3838
const assets$ = this.assetService.requestAssets();
3939
return !!this.searchText
40-
? assets$.pipe(map(assets => assets.filter(asset => asset.properties.optionalValue<string>('edc', 'name')?.includes(this.searchText))))
40+
? assets$.pipe(map(assets => assets.filter(asset => asset.id.toLowerCase().includes(this.searchText))))
4141
: assets$;
4242
}));
4343
}

0 commit comments

Comments
 (0)