Skip to content
This repository has been archived by the owner on Oct 2, 2019. It is now read-only.

Fixes for build in production mode #212

Merged
merged 5 commits into from
Mar 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"karma-jasmine-html-reporter": "^0.2.2",
"karma-spec-reporter": "^0.0.32",
"protractor": "~5.2.0",
"source-map-explorer": "^1.5.0",
"ts-node": "~3.3.0",
"tslint": "~5.8.0",
"typescript": "~2.6.1"
Expand Down
6 changes: 3 additions & 3 deletions src/app/model/services/beol.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ export class BeolService {

const bookTemplate = `
PREFIX knora-api: <http://api.knora.org/ontology/knora-api/simple/v2#>
PREFIX biblio: <${environment.api}/ontology/biblio/simple/v2#>
PREFIX beol: <${environment.api}/ontology/0801/beol/simple/v2#>
PREFIX biblio: <${environment.apiExternal}/ontology/biblio/simple/v2#>
PREFIX beol: <${environment.apiExternal}/ontology/0801/beol/simple/v2#>

CONSTRUCT {

Expand Down Expand Up @@ -102,7 +102,7 @@ export class BeolService {
}

const correspondenceTemplate = `
PREFIX beol: <${environment.api}/ontology/0801/beol/simple/v2#>
PREFIX beol: <${environment.apiExternal}/ontology/0801/beol/simple/v2#>
PREFIX knora-api: <http://api.knora.org/ontology/knora-api/simple/v2#>

CONSTRUCT {
Expand Down
28 changes: 14 additions & 14 deletions src/app/model/webapi/knora/v2/read-property-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export class ReadTextValueAsString implements ReadPropertyItem {
};

getClassName(): string {
return this.constructor.name;
return AppConfig.ReadTextValueAsString;
}
}

Expand Down Expand Up @@ -113,7 +113,7 @@ export class ReadTextValueAsHtml implements ReadPropertyItem {
}

getClassName():string {
return this.constructor.name;
return AppConfig.ReadTextValueAsHtml;
}

}
Expand All @@ -136,7 +136,7 @@ export class ReadTextValueAsXml implements ReadPropertyItem {
};

getClassName(): string {
return this.constructor.name;
return AppConfig.ReadTextValueAsXml;
}

}
Expand Down Expand Up @@ -192,7 +192,7 @@ export class ReadDateValue implements ReadPropertyItem {
};

getClassName():string {
return this.constructor.name;
return AppConfig.ReadDateValue;
}
}

Expand Down Expand Up @@ -228,7 +228,7 @@ export class ReadLinkValue implements ReadPropertyItem {
}

getClassName():string {
return this.constructor.name;
return AppConfig.ReadLinkValue;
}
}

Expand All @@ -248,7 +248,7 @@ export class ReadIntegerValue implements ReadPropertyItem {
};

getClassName():string {
return this.constructor.name;
return AppConfig.ReadIntegerValue;
}

}
Expand All @@ -269,7 +269,7 @@ export class ReadDecimalValue implements ReadPropertyItem {
};

getClassName():string {
return this.constructor.name;
return AppConfig.ReadDecimalValue;
}
}

Expand Down Expand Up @@ -307,7 +307,7 @@ export class ReadStillImageFileValue implements ReadPropertyItem {
};

getClassName():string {
return this.constructor.name;
return AppConfig.ReadStillImageFileValue;
}
}

Expand All @@ -327,7 +327,7 @@ export class ReadColorValue implements ReadPropertyItem {
};

getClassName():string {
return this.constructor.name;
return AppConfig.ReadColorValue;
}
}

Expand Down Expand Up @@ -390,7 +390,7 @@ export class ReadGeomValue implements ReadPropertyItem {
};

getClassName():string {
return this.constructor.name;
return AppConfig.ReadGeomValue;
}
}

Expand All @@ -410,7 +410,7 @@ export class ReadUriValue implements ReadPropertyItem {
};

getClassName():string {
return this.constructor.name;
return AppConfig.ReadUriValue;
}

}
Expand All @@ -431,7 +431,7 @@ export class ReadBooleanValue implements ReadPropertyItem {
}

getClassName():string {
return this.constructor.name;
return AppConfig.ReadBooleanValue;
}

}
Expand All @@ -452,7 +452,7 @@ export class ReadIntervalValue implements ReadPropertyItem {
}

getClassName():string {
return this.constructor.name;
return AppConfig.ReadIntervalValue;
}

}
Expand All @@ -473,7 +473,7 @@ export class ReadListValue implements ReadPropertyItem {
}

getClassName():string {
return this.constructor.name;
return AppConfig.ReadListValue;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class Equals implements ComparisonOperator {
}

getClassName() {
return this.constructor.name;
return 'Equals';
};
}

Expand All @@ -41,7 +41,7 @@ export class NotEquals implements ComparisonOperator {
}

getClassName() {
return this.constructor.name;
return 'NotEquals';
};
}

Expand All @@ -54,7 +54,7 @@ export class GreaterThanEquals implements ComparisonOperator {
}

getClassName() {
return this.constructor.name;
return 'GreaterThanEquals';
};
}

Expand All @@ -67,7 +67,7 @@ export class GreaterThan implements ComparisonOperator {
}

getClassName() {
return this.constructor.name;
return 'GreaterThan';
};
}

Expand All @@ -80,7 +80,7 @@ export class LessThan implements ComparisonOperator {
}

getClassName() {
return this.constructor.name;
return 'LessThan';
};
}

Expand All @@ -93,7 +93,7 @@ export class LessThanEquals implements ComparisonOperator {
}

getClassName() {
return this.constructor.name;
return 'LessThanEquals';
};
}

Expand All @@ -106,7 +106,7 @@ export class Exists implements ComparisonOperator {
}

getClassName() {
return this.constructor.name;
return 'Exists';
};
}

Expand All @@ -119,7 +119,7 @@ export class Like implements ComparisonOperator {
}

getClassName() {
return this.constructor.name;
return 'Like';
};

}
Expand All @@ -133,7 +133,7 @@ export class Match implements ComparisonOperator {
}

getClassName() {
return this.constructor.name;
return 'Match';
};

}
Expand Down
1 change: 1 addition & 0 deletions src/environments/environment.integration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const environment = {
type: 'integration',
production: false,
media: 'http://localhost:1024/knora', // perhaps we have to rename it into sipi?
apiExternal: 'http://0.0.0.0:3333',
api: 'http://localhost:3333', // perhaps we have to rename it into knora?
url: 'http://localhost:4200', // perhaps we have to rename it into guiUrl or salsah?
localData: 'data',
Expand Down
1 change: 1 addition & 0 deletions src/environments/environment.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const environment = {
type: 'mock-api',
production: false,
media: 'http://localhost/sipi_mockups',
apiExternal: 'http://0.0.0.0:3333',
api: 'http://localhost/salsah/v2/knora_mockups/v1',
url: 'http://localhost:4200',
dataPool: 'data-pool',
Expand Down
1 change: 1 addition & 0 deletions src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const environment = {
type: 'productive',
production: true,
url: 'http://salsah.local',
apiExternal: 'http://0.0.0.0:3333',
api: 'http://0.0.0.0:3333',
media: 'http://localhost:1024',
localData: 'data',
Expand Down
1 change: 1 addition & 0 deletions src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const environment = {
description: 'developer',
production: false,
media: 'http://localhost:1024/knora', // perhaps we have to rename it into sipi?
apiExternal: 'http://0.0.0.0:3333',
api: 'http://0.0.0.0:3333', // perhaps we have to rename it into knora?
url: 'http://localhost:4200', // perhaps we have to rename it into guiUrl or salsah?
localData: 'data',
Expand Down
42 changes: 41 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1149,6 +1149,10 @@ browserslist@^2.11.3:
caniuse-lite "^1.0.30000792"
electron-to-chromium "^1.3.30"

btoa@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.1.2.tgz#3e40b81663f81d2dd6596a4cb714a8dc16cfabe0"

buffer-indexof@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
Expand Down Expand Up @@ -2187,6 +2191,10 @@ dns-txt@^2.0.2:
dependencies:
buffer-indexof "^1.0.0"

docopt@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz#b28e9e2220da5ec49f7ea5bb24a47787405eeb11"

dom-converter@~0.1:
version "0.1.4"
resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
Expand Down Expand Up @@ -5390,6 +5398,10 @@ onetime@^2.0.0:
dependencies:
mimic-fn "^1.0.0"

[email protected]:
version "0.0.5"
resolved "https://registry.yarnpkg.com/open/-/open-0.0.5.tgz#42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"

opencollective@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
Expand Down Expand Up @@ -6686,6 +6698,10 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.
dependencies:
glob "^7.0.5"

rimraf@~2.2.6:
version "2.2.8"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"

ripemd160@^2.0.0, ripemd160@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
Expand Down Expand Up @@ -7170,6 +7186,19 @@ source-list-map@~0.1.7:
version "0.1.8"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"

source-map-explorer@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-1.5.0.tgz#654e2ba0db158fecfc99b9cefdf891b755b767d1"
dependencies:
btoa "^1.1.2"
convert-source-map "^1.1.1"
docopt "^0.6.2"
glob "^7.1.2"
open "0.0.5"
source-map "^0.5.1"
temp "^0.8.3"
underscore "^1.8.3"

source-map-resolve@^0.5.0:
version "0.5.1"
resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
Expand Down Expand Up @@ -7202,7 +7231,7 @@ [email protected]:
dependencies:
amdefine ">=0.0.4"

[email protected], source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.3:
[email protected], source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.3:
version "0.5.7"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"

Expand Down Expand Up @@ -7555,6 +7584,13 @@ tar@^2.0.0, tar@^2.2.1:
fstream "^1.0.2"
inherits "2"

temp@^0.8.3:
version "0.8.3"
resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
dependencies:
os-tmpdir "^1.0.0"
rimraf "~2.2.6"

through2-filter@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
Expand Down Expand Up @@ -7874,6 +7910,10 @@ umd@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e"

underscore@^1.8.3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"

underscore@~1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
Expand Down