diff --git a/package-lock.json b/package-lock.json index 502b67d6e7..1d886e43bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@angular/platform-browser-dynamic": "^11.2.9", "@angular/router": "^11.2.9", "@ckeditor/ckeditor5-angular": "^1.2.3", - "@dasch-swiss/dsp-js": "^2.4.0", + "@dasch-swiss/dsp-js": "^2.5.0", "@dasch-swiss/dsp-ui": "^1.6.0", "@ngx-translate/core": "^12.1.2", "@ngx-translate/http-loader": "5.0.0", @@ -75,6 +75,19 @@ "typescript": "4.0.7" } }, + ".yalc/@dasch-swiss/dsp-js": { + "version": "2.4.0", + "extraneous": true, + "license": "AGPL-3.0", + "dependencies": { + "@types/jsonld": "^1.5.0", + "json2typescript": "1.4.1", + "jsonld": "^5.2.0" + }, + "peerDependencies": { + "rxjs": "6.x" + } + }, "node_modules/@angular-devkit/architect": { "version": "0.1102.14", "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.14.tgz", @@ -2245,9 +2258,9 @@ } }, "node_modules/@dasch-swiss/dsp-js": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-js/-/dsp-js-2.4.0.tgz", - "integrity": "sha512-anHm+SP0qAqDpTcUHCSED37Wtalo1XWSLFFVcN2JYn7hMUFbXHGrdsw50UuK+RWMEDjEAbUwLomDxjxzry3opw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-js/-/dsp-js-2.5.0.tgz", + "integrity": "sha512-Zd13732lmd/yS/LrfkJj2KJ1TnGWOuXsvffTMXMYpiYtTxdWl90GyFtgbt7IVtdcPyOaGrg8gZpTVssslUSMBw==", "dependencies": { "@types/jsonld": "^1.5.0", "json2typescript": "1.4.1", @@ -22048,9 +22061,9 @@ } }, "@dasch-swiss/dsp-js": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-js/-/dsp-js-2.4.0.tgz", - "integrity": "sha512-anHm+SP0qAqDpTcUHCSED37Wtalo1XWSLFFVcN2JYn7hMUFbXHGrdsw50UuK+RWMEDjEAbUwLomDxjxzry3opw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-js/-/dsp-js-2.5.0.tgz", + "integrity": "sha512-Zd13732lmd/yS/LrfkJj2KJ1TnGWOuXsvffTMXMYpiYtTxdWl90GyFtgbt7IVtdcPyOaGrg8gZpTVssslUSMBw==", "requires": { "@types/jsonld": "^1.5.0", "json2typescript": "1.4.1", diff --git a/package.json b/package.json index ce29b8d553..3a37f4ec9c 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ }, "private": true, "dependencies": { + "3d-force-graph": "^1.60.12", "@angular/animations": "^11.2.9", "@angular/cdk": "^11.2.5", "@angular/common": "11.2.9", @@ -33,11 +34,10 @@ "@angular/platform-browser-dynamic": "^11.2.9", "@angular/router": "^11.2.9", "@ckeditor/ckeditor5-angular": "^1.2.3", - "@dasch-swiss/dsp-js": "^2.4.0", + "@dasch-swiss/dsp-js": "^2.5.0", "@dasch-swiss/dsp-ui": "^1.6.0", "@ngx-translate/core": "^12.1.2", "@ngx-translate/http-loader": "5.0.0", - "3d-force-graph": "^1.60.12", "angular-split": "^4.0.0", "ckeditor5-custom-build": "github:dasch-swiss/ckeditor_custom_build", "core-js": "^3.6.5", diff --git a/src/app/project/ontology/default-data/default-properties.ts b/src/app/project/ontology/default-data/default-properties.ts index eb344755a5..6a386df196 100644 --- a/src/app/project/ontology/default-data/default-properties.ts +++ b/src/app/project/ontology/default-data/default-properties.ts @@ -43,7 +43,7 @@ export class DefaultProperties { description: 'Short text such as title or name', subPropOf: Constants.HasValue, objectType: Constants.TextValue, - guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'SimpleText', // 'Input', + guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'SimpleText', // better element would be: 'Input', group: 'Text' // redundant information, but otherwise we don't get the main group name after selecting type }, { @@ -75,27 +75,9 @@ export class DefaultProperties { description: 'Dropdown menu with values from predefined list', subPropOf: Constants.HasValue, objectType: Constants.ListValue, - guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'List', // 'Pulldown' + guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'List', // better element would be: 'Pulldown' or 'Select' group: 'List' } - // { - // icon: 'check_box', - // label: 'Checkboxes', - // description: 'Select multiple values from predefined short list', - // subPropOf: Constants.HasValue, - // objectType: Constants.ListValue, - // guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'Checkbox', - // group: 'List' - // }, - // { - // icon: 'radio_button_checked', - // label: 'Multiple choice', - // description: 'Select only one value from predefined short list', - // subPropOf: Constants.HasValue, - // objectType: Constants.ListValue, - // guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'Radio', - // group: 'List' - // } ] }, { @@ -118,21 +100,21 @@ export class DefaultProperties { { icon: 'calendar_today', label: 'Date', - description: 'A date picker with day, month and year', - subPropOf: Constants.HasValue, - objectType: Constants.DateValue, - guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'Date', - group: 'Date / Time' - }, - { - icon: 'date_range', - label: 'Period', - description: 'A period of time between two dates', + description: 'A date field with day, month and year', subPropOf: Constants.HasValue, objectType: Constants.DateValue, guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'Date', group: 'Date / Time' }, + // { + // icon: 'date_range', + // label: 'Period', + // description: 'A period of time between two dates', + // subPropOf: Constants.HasValue, + // objectType: Constants.DateValue, + // guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'Date', + // group: 'Date / Time' + // }, { icon: 'access_time', label: 'Timestamp', @@ -147,7 +129,7 @@ export class DefaultProperties { label: 'Time sequence', description: 'A time sequence with start and end point on a timeline', subPropOf: Constants.HasValue, - objectType: Constants.TimeValue, + objectType: Constants.IntervalValue, guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'Interval', group: 'Date / Time' } @@ -188,22 +170,6 @@ export class DefaultProperties { guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'Searchbox', // 'Autocomplete', group: 'Link / Relation' }, - // { - // icon: 'picture_in_picture', - // label: 'Part of resource class', - // subPropOf: Constants.KnoraApiV2 + Constants.HashDelimiter + 'isPartOf', - // objectType: Constants.LinkValue, - // guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'Searchbox', // 'Autocomplete', - // group: 'Link' - // }, - // { - // icon: 'compare_arrows', - // label: 'External resource', - // subPropOf: Constants.HasValue, - // objectType: Constants.UriValue, - // guiEle: Constants.SalsahGui + Constants.HashDelimiter + 'SimpleText', - // group: 'Link' - // }, { icon: 'language', label: 'External URL', diff --git a/src/app/project/ontology/property-form/property-form.component.html b/src/app/project/ontology/property-form/property-form.component.html index 5a3140653b..323eca7746 100644 --- a/src/app/project/ontology/property-form/property-form.component.html +++ b/src/app/project/ontology/property-form/property-form.component.html @@ -3,9 +3,9 @@ -->