From 8e2604eb7908ffb47faa3169124111ee375fdfd1 Mon Sep 17 00:00:00 2001 From: ThomasThelen Date: Sun, 15 Sep 2024 19:08:12 -0700 Subject: [PATCH 1/4] Fix gnis page view --- node-browser/src/app/browse/browse.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/node-browser/src/app/browse/browse.component.ts b/node-browser/src/app/browse/browse.component.ts index 3cec569..6e4b8bc 100644 --- a/node-browser/src/app/browse/browse.component.ts +++ b/node-browser/src/app/browse/browse.component.ts @@ -150,6 +150,7 @@ export class BrowseComponent implements OnInit { dataType: '', }); } + } // Check to see if the geometry can be sent to the map if ( predicate.predicate.value === @@ -176,7 +177,6 @@ export class BrowseComponent implements OnInit { }, }); } - } }); }, }); @@ -227,6 +227,9 @@ export class BrowseComponent implements OnInit { * @returns The full path of the URI */ private getFullNodePath(uri: string) { + if(uri.includes("gnis")) { + return uri + } let prefix = uri.split(':')[0]; let val = this.queryService.prefixes[prefix]; return uri.replace(prefix.concat(':'), val); From 878bc4412d965c909ae92293398948f6c36ffe26 Mon Sep 17 00:00:00 2001 From: ThomasThelen Date: Wed, 11 Dec 2024 09:01:57 -0800 Subject: [PATCH 2/4] Remove unused dev flags; optimize production build --- node-browser/angular.json | 10 ++++++---- node-browser/src/environments/environment.local.ts | 1 - node-browser/src/environments/environment.prod.ts | 3 +-- node-browser/src/environments/environment.ts | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/node-browser/angular.json b/node-browser/angular.json index 782741c..ed5f3a6 100644 --- a/node-browser/angular.json +++ b/node-browser/angular.json @@ -41,6 +41,8 @@ }, "configurations": { "production": { + "buildOptimizer": true, + "optimization": true, "fileReplacements": [ { "replace": "src/environments/environment.ts", @@ -51,12 +53,12 @@ { "type": "initial", "maximumWarning": "500kb", - "maximumError": "2mb" + "maximumError": "5mb" }, { "type": "anyComponentStyle", "maximumWarning": "2kb", - "maximumError": "2mb" + "maximumError": "5mb" } ], "outputHashing": "all" @@ -95,7 +97,7 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "configurations": { - "prod": { + "production": { "browserTarget": "node-browser:build:production" }, "local": { @@ -105,7 +107,7 @@ "browserTarget": "node-browser:build:stage" } }, - "defaultConfiguration": "prod" + "defaultConfiguration": "production" }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", diff --git a/node-browser/src/environments/environment.local.ts b/node-browser/src/environments/environment.local.ts index 3efad2f..a7911f0 100644 --- a/node-browser/src/environments/environment.local.ts +++ b/node-browser/src/environments/environment.local.ts @@ -1,5 +1,4 @@ export const environment = { baseAddress: 'localhost/', graphEndpoint: 'https://localhost/sparql', - production: false, }; diff --git a/node-browser/src/environments/environment.prod.ts b/node-browser/src/environments/environment.prod.ts index 2e54502..969e90c 100644 --- a/node-browser/src/environments/environment.prod.ts +++ b/node-browser/src/environments/environment.prod.ts @@ -1,5 +1,4 @@ export const environment = { baseAddress: 'https://stko-kwg.geog.ucsb.edu/', - graphEndpoint: 'https://stko-kwg.geog.ucsb.edu/sparql', - production: true, + graphEndpoint: 'https://stko-kwg.geog.ucsb.edu/sparql' }; diff --git a/node-browser/src/environments/environment.ts b/node-browser/src/environments/environment.ts index d16b2e4..3614e83 100644 --- a/node-browser/src/environments/environment.ts +++ b/node-browser/src/environments/environment.ts @@ -4,8 +4,7 @@ export const environment = { baseAddress: 'https://staging.knowwheregraph.org/', - graphEndpoint: 'https://staging.knowwheregraph.org/sparql', - production: false, + graphEndpoint: 'https://staging.knowwheregraph.org/sparql' }; /* From 392e5d3be8bfe5ab1c4fd95183cf2a7a7f207f42 Mon Sep 17 00:00:00 2001 From: ThomasThelen Date: Wed, 11 Dec 2024 10:06:45 -0800 Subject: [PATCH 3/4] Add stko build --- node-browser/angular.json | 39 ++++++++++++------- node-browser/docker-compose.yaml | 2 +- .../src/environments/environment.prod.ts | 2 +- .../src/environments/environment.stage.ts | 1 - node-browser/src/index.html | 2 +- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/node-browser/angular.json b/node-browser/angular.json index ed5f3a6..595f977 100644 --- a/node-browser/angular.json +++ b/node-browser/angular.json @@ -41,8 +41,12 @@ }, "configurations": { "production": { - "buildOptimizer": true, - "optimization": true, + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true, "fileReplacements": [ { "replace": "src/environments/environment.ts", @@ -63,6 +67,21 @@ ], "outputHashing": "all" }, + "stko": { + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true, + "outputHashing": "all", + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ] + }, "stage": { "buildOptimizer": false, "optimization": false, @@ -105,26 +124,18 @@ }, "stage": { "browserTarget": "node-browser:build:stage" + }, + "stko": { + "browserTarget": "node-browser:build:stko" } }, - "defaultConfiguration": "production" + "defaultConfiguration": "stko" }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { "browserTarget": "node-browser:build" } - }, - "test": { - "builder": "@angular-devkit/build-angular:karma", - "options": { - "polyfills": "src/polyfills.ts", - "tsConfig": "tsconfig.spec.json", - "inlineStyleLanguage": "scss", - "assets": ["src/favicon.ico", "src/assets"], - "styles": ["src/styles.scss"], - "scripts": [] - } } } } diff --git a/node-browser/docker-compose.yaml b/node-browser/docker-compose.yaml index d559a67..4e2c598 100644 --- a/node-browser/docker-compose.yaml +++ b/node-browser/docker-compose.yaml @@ -3,4 +3,4 @@ services: build: '.' volumes: - ./dist/:/app/dist/ - entrypoint: ["ng","build","--configuration=production"] + entrypoint: ["ng","build","--configuration=stko"] diff --git a/node-browser/src/environments/environment.prod.ts b/node-browser/src/environments/environment.prod.ts index 969e90c..af0eef7 100644 --- a/node-browser/src/environments/environment.prod.ts +++ b/node-browser/src/environments/environment.prod.ts @@ -1,4 +1,4 @@ export const environment = { baseAddress: 'https://stko-kwg.geog.ucsb.edu/', - graphEndpoint: 'https://stko-kwg.geog.ucsb.edu/sparql' + graphEndpoint: 'https://stko-kwg.geog.ucsb.edu/sparql', }; diff --git a/node-browser/src/environments/environment.stage.ts b/node-browser/src/environments/environment.stage.ts index 598c111..f4312a1 100644 --- a/node-browser/src/environments/environment.stage.ts +++ b/node-browser/src/environments/environment.stage.ts @@ -1,5 +1,4 @@ export const environment = { baseAddress: 'https://staging.knowwheregraph.org/', graphEndpoint: 'https://staging.knowwheregraph.org/sparql', - production: false, }; diff --git a/node-browser/src/index.html b/node-browser/src/index.html index 4e40697..ea56e96 100644 --- a/node-browser/src/index.html +++ b/node-browser/src/index.html @@ -2,7 +2,7 @@ - NodeBrowser + Node Browser From f606984815778f1a69af58a81a1e84bc2f546ba0 Mon Sep 17 00:00:00 2001 From: ThomasThelen Date: Wed, 11 Dec 2024 10:19:19 -0800 Subject: [PATCH 4/4] Optimize build --- node-browser/angular.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/node-browser/angular.json b/node-browser/angular.json index 595f977..3e5ebc5 100644 --- a/node-browser/angular.json +++ b/node-browser/angular.json @@ -68,13 +68,9 @@ "outputHashing": "all" }, "stko": { - "buildOptimizer": false, - "optimization": false, - "vendorChunk": true, + "buildOptimizer": true, + "optimization": true, "extractLicenses": false, - "sourceMap": true, - "namedChunks": true, - "outputHashing": "all", "fileReplacements": [ { "replace": "src/environments/environment.ts",