From 43888a67497e3aa93b5031f00c2bc719221eca8c Mon Sep 17 00:00:00 2001 From: mdelez <60604010+mdelez@users.noreply.github.com> Date: Wed, 8 Sep 2021 12:33:40 +0200 Subject: [PATCH] refactor: update remaining dsp-ui imports (DSP-1891) (#526) * refactor: replaces AppInitService import from dsp-ui with the one from dsp-app * refactor(properties): replace dsp-ui imports * test(properties): changes selectors from dsp to app * refactor: updates FilteredResources import * chore: update package-lock.json * refactor: updates SearchParams import * refactor: updates AutocompleteItem and existingNamesValidator imports * refactor: updates SortingService imports * refactor: updates remaining imports * refactor: removes dsp-ui package --- package-lock.json | 232 +++++------------- package.json | 1 - src/app/app.component.spec.ts | 2 +- src/app/main/dialog/dialog.component.ts | 2 +- src/app/main/header/header.component.ts | 2 +- src/app/main/help/help.component.spec.ts | 2 +- src/app/main/main.component.spec.ts | 2 +- src/app/project/board/board.component.spec.ts | 2 +- .../add-user/add-user.component.spec.ts | 2 +- .../add-user/add-user.component.ts | 3 +- .../collaboration.component.spec.ts | 2 +- .../select-group.component.spec.ts | 2 +- .../select-group/select-group.component.ts | 2 +- .../edit-list-item.component.spec.ts | 2 +- .../ontology-form.component.spec.ts | 2 +- .../ontology-form/ontology-form.component.ts | 2 +- .../ontology-visualizer.component.spec.ts | 2 +- .../project/ontology/ontology.component.ts | 2 +- .../property-form/property-form.component.ts | 2 +- .../permission/permission.component.spec.ts | 2 +- .../project-form.component.spec.ts | 2 +- .../project-form/project-form.component.ts | 2 +- src/app/project/project.component.spec.ts | 2 +- .../groups-list/groups-list.component.ts | 4 +- .../projects-list.component.spec.ts | 2 +- .../projects-list/projects-list.component.ts | 2 +- .../projects/projects.component.spec.ts | 2 +- .../users-list/users-list.component.spec.ts | 2 +- .../users/users-list/users-list.component.ts | 2 +- src/app/system/users/users.component.spec.ts | 2 +- .../user/account/account.component.spec.ts | 2 +- .../dashboard/dashboard.component.spec.ts | 2 +- .../membership/membership.component.spec.ts | 2 +- .../user/membership/membership.component.ts | 2 +- .../user/profile/profile.component.spec.ts | 2 +- .../password-form.component.spec.ts | 2 +- .../password-form/password-form.component.ts | 6 +- .../user-form/user-form.component.spec.ts | 2 +- src/app/user/user-form/user-form.component.ts | 2 +- .../user-menu/user-menu.component.spec.ts | 2 +- src/app/user/user.component.spec.ts | 2 +- .../comparison/comparison.component.ts | 2 +- .../intermediate.component.spec.ts | 2 +- .../intermediate/intermediate.component.ts | 2 +- src/app/workspace/resource/dsp-resource.ts | 2 +- .../properties/properties.component.spec.ts | 15 +- .../representation/file-representation.ts | 2 +- .../resource-instance-form.component.spec.ts | 4 +- .../resource-link-form.component.ts | 2 +- .../resource/resource.component.spec.ts | 2 +- .../workspace/resource/resource.component.ts | 3 +- .../results/results.component.spec.ts | 2 +- .../workspace/results/results.component.ts | 2 +- src/styles.scss | 1 - 54 files changed, 127 insertions(+), 232 deletions(-) diff --git a/package-lock.json b/package-lock.json index ebacdb6a78..8c8510d418 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "dsp-app", "version": "5.3.0", "dependencies": { "@angular/animations": "^11.2.9", @@ -19,7 +20,6 @@ "@angular/router": "^11.2.9", "@ckeditor/ckeditor5-angular": "^1.2.3", "@dasch-swiss/dsp-js": "^4.0.0", - "@dasch-swiss/dsp-ui": "^1.8.0", "@ngx-translate/core": "^12.1.2", "@ngx-translate/http-loader": "5.0.0", "3d-force-graph": "^1.60.12", @@ -641,7 +641,6 @@ }, "node_modules/@babel/code-frame": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/highlight": "^7.14.5" @@ -659,7 +658,6 @@ }, "node_modules/@babel/core": { "version": "7.12.10", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.10.4", @@ -688,7 +686,6 @@ }, "node_modules/@babel/core/node_modules/semver": { "version": "5.7.1", - "dev": true, "license": "ISC", "bin": { "semver": "bin/semver" @@ -696,7 +693,6 @@ }, "node_modules/@babel/core/node_modules/source-map": { "version": "0.5.7", - "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -704,7 +700,6 @@ }, "node_modules/@babel/generator": { "version": "7.12.11", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.12.11", @@ -714,7 +709,6 @@ }, "node_modules/@babel/generator/node_modules/source-map": { "version": "0.5.7", - "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -806,7 +800,6 @@ }, "node_modules/@babel/helper-function-name": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-get-function-arity": "^7.14.5", @@ -819,7 +812,6 @@ }, "node_modules/@babel/helper-function-name/node_modules/@babel/template": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.14.5", @@ -832,7 +824,6 @@ }, "node_modules/@babel/helper-get-function-arity": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.14.5" @@ -843,7 +834,6 @@ }, "node_modules/@babel/helper-hoist-variables": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.14.5" @@ -854,7 +844,6 @@ }, "node_modules/@babel/helper-member-expression-to-functions": { "version": "7.14.7", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.14.5" @@ -865,7 +854,6 @@ }, "node_modules/@babel/helper-module-imports": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.14.5" @@ -876,7 +864,6 @@ }, "node_modules/@babel/helper-module-transforms": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.14.5", @@ -894,7 +881,6 @@ }, "node_modules/@babel/helper-module-transforms/node_modules/@babel/template": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.14.5", @@ -907,7 +893,6 @@ }, "node_modules/@babel/helper-optimise-call-expression": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.14.5" @@ -939,7 +924,6 @@ }, "node_modules/@babel/helper-replace-supers": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-member-expression-to-functions": "^7.14.5", @@ -953,7 +937,6 @@ }, "node_modules/@babel/helper-simple-access": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.14.5" @@ -975,7 +958,6 @@ }, "node_modules/@babel/helper-split-export-declaration": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.14.5" @@ -986,7 +968,6 @@ }, "node_modules/@babel/helper-validator-identifier": { "version": "7.14.5", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -1028,7 +1009,6 @@ }, "node_modules/@babel/helpers": { "version": "7.14.6", - "dev": true, "license": "MIT", "dependencies": { "@babel/template": "^7.14.5", @@ -1041,7 +1021,6 @@ }, "node_modules/@babel/helpers/node_modules/@babel/template": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.14.5", @@ -1054,7 +1033,6 @@ }, "node_modules/@babel/highlight": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.14.5", @@ -1067,7 +1045,6 @@ }, "node_modules/@babel/parser": { "version": "7.14.7", - "dev": true, "license": "MIT", "bin": { "parser": "bin/babel-parser.js" @@ -2010,7 +1987,6 @@ }, "node_modules/@babel/template": { "version": "7.12.7", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.10.4", @@ -2020,7 +1996,6 @@ }, "node_modules/@babel/traverse": { "version": "7.14.7", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.14.5", @@ -2039,7 +2014,6 @@ }, "node_modules/@babel/traverse/node_modules/@babel/generator": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.14.5", @@ -2052,7 +2026,6 @@ }, "node_modules/@babel/traverse/node_modules/source-map": { "version": "0.5.7", - "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -2060,7 +2033,6 @@ }, "node_modules/@babel/types": { "version": "7.14.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.14.5", @@ -2112,29 +2084,6 @@ "rxjs": "6.x" } }, - "node_modules/@dasch-swiss/dsp-ui": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-ui/-/dsp-ui-1.8.0.tgz", - "integrity": "sha512-finJFf2vHfEh91rm+wDdSufSg8+d77ItZYF/kjJbNgZUp90zn9CMF9shdbvyb8LWMvIsLV8yMBdAPr3w2PYQHw==", - "dependencies": { - "tslib": "^2.0.0" - }, - "peerDependencies": { - "@angular/cdk": "^11.2.5", - "@angular/common": "~11.2.6", - "@angular/core": "~11.2.6", - "@angular/material": "^11.2.5", - "@ckeditor/ckeditor5-angular": "^1.2.3", - "@dasch-swiss/dsp-js": "^3.0.0", - "angular-split": "^4.0.0", - "ckeditor5-custom-build": "github:dasch-swiss/ckeditor_custom_build", - "jdnconvertiblecalendar": "^0.0.7", - "jdnconvertiblecalendardateadapter": "^0.0.17", - "ngx-color-picker": "^11.0.0", - "openseadragon": "^2.4.2", - "svg-overlay": "github:openseadragon/svg-overlay" - } - }, "node_modules/@digitalbazaar/http-client": { "version": "1.1.0", "license": "BSD-3-Clause", @@ -3698,7 +3647,6 @@ }, "node_modules/ansi-styles": { "version": "3.2.1", - "dev": true, "license": "MIT", "dependencies": { "color-convert": "^1.9.0" @@ -4620,7 +4568,6 @@ }, "node_modules/chalk": { "version": "2.4.2", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", @@ -4913,6 +4860,7 @@ "version": "9.0.0", "dev": true, "license": "MIT", + "peer": true, "peerDependencies": { "tslib": "^1.10.0" } @@ -4921,6 +4869,7 @@ "version": "9.0.0", "dev": true, "license": "MIT", + "peer": true, "peerDependencies": { "rxjs": "^6.5.3", "tslib": "^1.10.0", @@ -4954,7 +4903,6 @@ }, "node_modules/color-convert": { "version": "1.9.3", - "dev": true, "license": "MIT", "dependencies": { "color-name": "1.1.3" @@ -4962,7 +4910,6 @@ }, "node_modules/color-name": { "version": "1.1.3", - "dev": true, "license": "MIT" }, "node_modules/colord": { @@ -5175,7 +5122,6 @@ }, "node_modules/convert-source-map": { "version": "1.8.0", - "dev": true, "license": "MIT", "dependencies": { "safe-buffer": "~5.1.1" @@ -6162,7 +6108,6 @@ }, "node_modules/debug": { "version": "4.3.1", - "dev": true, "license": "MIT", "dependencies": { "ms": "2.1.2" @@ -6779,7 +6724,6 @@ }, "node_modules/escape-string-regexp": { "version": "1.0.5", - "dev": true, "license": "MIT", "engines": { "node": ">=0.8.0" @@ -8120,7 +8064,6 @@ }, "node_modules/gensync": { "version": "1.0.0-beta.2", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -8206,7 +8149,6 @@ }, "node_modules/globals": { "version": "11.12.0", - "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -8309,7 +8251,6 @@ }, "node_modules/has-flag": { "version": "3.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -9758,7 +9699,6 @@ }, "node_modules/js-tokens": { "version": "4.0.0", - "dev": true, "license": "MIT" }, "node_modules/js-yaml": { @@ -9791,7 +9731,6 @@ }, "node_modules/jsesc": { "version": "2.5.2", - "dev": true, "license": "MIT", "bin": { "jsesc": "bin/jsesc" @@ -9840,7 +9779,6 @@ }, "node_modules/json5": { "version": "2.2.0", - "dev": true, "license": "MIT", "dependencies": { "minimist": "^1.2.5" @@ -10364,7 +10302,6 @@ }, "node_modules/lodash": { "version": "4.17.21", - "dev": true, "license": "MIT" }, "node_modules/lodash-es": { @@ -10833,7 +10770,6 @@ }, "node_modules/minimist": { "version": "1.2.5", - "dev": true, "license": "MIT" }, "node_modules/minipass": { @@ -11015,7 +10951,6 @@ }, "node_modules/ms": { "version": "2.1.2", - "dev": true, "license": "MIT" }, "node_modules/multicast-dns": { @@ -12304,6 +12239,7 @@ "node_modules/pdfjs-dist": { "version": "2.7.570", "license": "Apache-2.0", + "peer": true, "peerDependencies": { "worker-loader": "^3.0.7" } @@ -14115,7 +14051,6 @@ }, "node_modules/safe-buffer": { "version": "5.1.2", - "dev": true, "license": "MIT" }, "node_modules/safe-regex": { @@ -15674,7 +15609,6 @@ }, "node_modules/supports-color": { "version": "5.5.0", - "dev": true, "license": "MIT", "dependencies": { "has-flag": "^3.0.0" @@ -16062,7 +15996,6 @@ }, "node_modules/to-fast-properties": { "version": "2.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -19090,7 +19023,6 @@ }, "@babel/code-frame": { "version": "7.14.5", - "dev": true, "requires": { "@babel/highlight": "^7.14.5" } @@ -19100,7 +19032,6 @@ }, "@babel/core": { "version": "7.12.10", - "dev": true, "requires": { "@babel/code-frame": "^7.10.4", "@babel/generator": "^7.12.10", @@ -19120,18 +19051,15 @@ }, "dependencies": { "semver": { - "version": "5.7.1", - "dev": true + "version": "5.7.1" }, "source-map": { - "version": "0.5.7", - "dev": true + "version": "0.5.7" } } }, "@babel/generator": { "version": "7.12.11", - "dev": true, "requires": { "@babel/types": "^7.12.11", "jsesc": "^2.5.1", @@ -19139,8 +19067,7 @@ }, "dependencies": { "source-map": { - "version": "0.5.7", - "dev": true + "version": "0.5.7" } } }, @@ -19197,7 +19124,6 @@ }, "@babel/helper-function-name": { "version": "7.14.5", - "dev": true, "requires": { "@babel/helper-get-function-arity": "^7.14.5", "@babel/template": "^7.14.5", @@ -19206,7 +19132,6 @@ "dependencies": { "@babel/template": { "version": "7.14.5", - "dev": true, "requires": { "@babel/code-frame": "^7.14.5", "@babel/parser": "^7.14.5", @@ -19217,35 +19142,30 @@ }, "@babel/helper-get-function-arity": { "version": "7.14.5", - "dev": true, "requires": { "@babel/types": "^7.14.5" } }, "@babel/helper-hoist-variables": { "version": "7.14.5", - "dev": true, "requires": { "@babel/types": "^7.14.5" } }, "@babel/helper-member-expression-to-functions": { "version": "7.14.7", - "dev": true, "requires": { "@babel/types": "^7.14.5" } }, "@babel/helper-module-imports": { "version": "7.14.5", - "dev": true, "requires": { "@babel/types": "^7.14.5" } }, "@babel/helper-module-transforms": { "version": "7.14.5", - "dev": true, "requires": { "@babel/helper-module-imports": "^7.14.5", "@babel/helper-replace-supers": "^7.14.5", @@ -19259,7 +19179,6 @@ "dependencies": { "@babel/template": { "version": "7.14.5", - "dev": true, "requires": { "@babel/code-frame": "^7.14.5", "@babel/parser": "^7.14.5", @@ -19270,7 +19189,6 @@ }, "@babel/helper-optimise-call-expression": { "version": "7.14.5", - "dev": true, "requires": { "@babel/types": "^7.14.5" } @@ -19290,7 +19208,6 @@ }, "@babel/helper-replace-supers": { "version": "7.14.5", - "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "^7.14.5", "@babel/helper-optimise-call-expression": "^7.14.5", @@ -19300,7 +19217,6 @@ }, "@babel/helper-simple-access": { "version": "7.14.5", - "dev": true, "requires": { "@babel/types": "^7.14.5" } @@ -19314,14 +19230,12 @@ }, "@babel/helper-split-export-declaration": { "version": "7.14.5", - "dev": true, "requires": { "@babel/types": "^7.14.5" } }, "@babel/helper-validator-identifier": { - "version": "7.14.5", - "dev": true + "version": "7.14.5" }, "@babel/helper-validator-option": { "version": "7.14.5" @@ -19349,7 +19263,6 @@ }, "@babel/helpers": { "version": "7.14.6", - "dev": true, "requires": { "@babel/template": "^7.14.5", "@babel/traverse": "^7.14.5", @@ -19358,7 +19271,6 @@ "dependencies": { "@babel/template": { "version": "7.14.5", - "dev": true, "requires": { "@babel/code-frame": "^7.14.5", "@babel/parser": "^7.14.5", @@ -19369,7 +19281,6 @@ }, "@babel/highlight": { "version": "7.14.5", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.5", "chalk": "^2.0.0", @@ -19377,8 +19288,7 @@ } }, "@babel/parser": { - "version": "7.14.7", - "dev": true + "version": "7.14.7" }, "@babel/plugin-proposal-async-generator-functions": { "version": "7.14.7", @@ -19934,7 +19844,6 @@ }, "@babel/template": { "version": "7.12.7", - "dev": true, "requires": { "@babel/code-frame": "^7.10.4", "@babel/parser": "^7.12.7", @@ -19943,7 +19852,6 @@ }, "@babel/traverse": { "version": "7.14.7", - "dev": true, "requires": { "@babel/code-frame": "^7.14.5", "@babel/generator": "^7.14.5", @@ -19958,7 +19866,6 @@ "dependencies": { "@babel/generator": { "version": "7.14.5", - "dev": true, "requires": { "@babel/types": "^7.14.5", "jsesc": "^2.5.1", @@ -19966,14 +19873,12 @@ } }, "source-map": { - "version": "0.5.7", - "dev": true + "version": "0.5.7" } } }, "@babel/types": { "version": "7.14.5", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.5", "to-fast-properties": "^2.0.0" @@ -20008,14 +19913,6 @@ "jsonld": "^5.2.0" } }, - "@dasch-swiss/dsp-ui": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-ui/-/dsp-ui-1.8.0.tgz", - "integrity": "sha512-finJFf2vHfEh91rm+wDdSufSg8+d77ItZYF/kjJbNgZUp90zn9CMF9shdbvyb8LWMvIsLV8yMBdAPr3w2PYQHw==", - "requires": { - "tslib": "^2.0.0" - } - }, "@digitalbazaar/http-client": { "version": "1.1.0", "requires": { @@ -20053,10 +19950,12 @@ } }, "@ngx-translate/core": { - "version": "12.1.2" + "version": "12.1.2", + "requires": {} }, "@ngx-translate/http-loader": { - "version": "5.0.0" + "version": "5.0.0", + "requires": {} }, "@nodelib/fs.scandir": { "version": "2.1.5", @@ -20958,7 +20857,8 @@ }, "acorn-jsx": { "version": "5.3.1", - "dev": true + "dev": true, + "requires": {} }, "adjust-sourcemap-loader": { "version": "4.0.0", @@ -21008,11 +20908,13 @@ }, "ajv-errors": { "version": "1.0.1", - "dev": true + "dev": true, + "requires": {} }, "ajv-keywords": { "version": "3.5.2", - "dev": true + "dev": true, + "requires": {} }, "alphanum-sort": { "version": "1.0.2", @@ -21052,7 +20954,6 @@ }, "ansi-styles": { "version": "3.2.1", - "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -21698,7 +21599,6 @@ }, "chalk": { "version": "2.4.2", - "dev": true, "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -21741,7 +21641,8 @@ }, "circular-dependency-plugin": { "version": "5.2.2", - "dev": true + "dev": true, + "requires": {} }, "ckeditor5-custom-build": { "version": "git+ssh://git@github.com/dasch-swiss/ckeditor_custom_build.git#c3c67816fd7fa7e7dfd9295ef99a5e49ca431876", @@ -21873,8 +21774,6 @@ "version": "6.0.2", "dev": true, "requires": { - "@angular/compiler": "9.0.0", - "@angular/core": "9.0.0", "app-root-path": "^3.0.0", "aria-query": "^3.0.0", "axobject-query": "2.0.2", @@ -21891,11 +21790,15 @@ "dependencies": { "@angular/compiler": { "version": "9.0.0", - "dev": true + "dev": true, + "peer": true, + "requires": {} }, "@angular/core": { "version": "9.0.0", - "dev": true + "dev": true, + "peer": true, + "requires": {} }, "source-map": { "version": "0.5.7", @@ -21917,14 +21820,12 @@ }, "color-convert": { "version": "1.9.3", - "dev": true, "requires": { "color-name": "1.1.3" } }, "color-name": { - "version": "1.1.3", - "dev": true + "version": "1.1.3" }, "colord": { "version": "2.1.0", @@ -22084,7 +21985,6 @@ }, "convert-source-map": { "version": "1.8.0", - "dev": true, "requires": { "safe-buffer": "~5.1.1" } @@ -22531,7 +22431,8 @@ }, "cssnano-utils": { "version": "2.0.1", - "dev": true + "dev": true, + "requires": {} }, "csso": { "version": "4.2.0", @@ -22807,7 +22708,6 @@ }, "debug": { "version": "4.3.1", - "dev": true, "requires": { "ms": "2.1.2" } @@ -23249,8 +23149,7 @@ "dev": true }, "escape-string-regexp": { - "version": "1.0.5", - "dev": true + "version": "1.0.5" }, "eslint": { "version": "6.8.0", @@ -24184,8 +24083,7 @@ } }, "gensync": { - "version": "1.0.0-beta.2", - "dev": true + "version": "1.0.0-beta.2" }, "get-caller-file": { "version": "2.0.5", @@ -24238,8 +24136,7 @@ } }, "globals": { - "version": "11.12.0", - "dev": true + "version": "11.12.0" }, "globby": { "version": "11.0.4", @@ -24304,8 +24201,7 @@ "dev": true }, "has-flag": { - "version": "3.0.0", - "dev": true + "version": "3.0.0" }, "has-symbols": { "version": "1.0.2", @@ -24634,7 +24530,8 @@ }, "icss-utils": { "version": "5.1.0", - "dev": true + "dev": true, + "requires": {} }, "ieee754": { "version": "1.2.1", @@ -25233,8 +25130,7 @@ } }, "js-tokens": { - "version": "4.0.0", - "dev": true + "version": "4.0.0" }, "js-yaml": { "version": "3.14.1", @@ -25253,8 +25149,7 @@ "dev": true }, "jsesc": { - "version": "2.5.2", - "dev": true + "version": "2.5.2" }, "json-parse-better-errors": { "version": "1.0.2", @@ -25289,7 +25184,6 @@ }, "json5": { "version": "2.2.0", - "dev": true, "requires": { "minimist": "^1.2.5" } @@ -25449,7 +25343,8 @@ }, "karma-jasmine-html-reporter": { "version": "1.6.0", - "dev": true + "dev": true, + "requires": {} }, "karma-source-map-support": { "version": "1.4.0", @@ -25638,8 +25533,7 @@ } }, "lodash": { - "version": "4.17.21", - "dev": true + "version": "4.17.21" }, "lodash-es": { "version": "4.17.21" @@ -25953,8 +25847,7 @@ } }, "minimist": { - "version": "1.2.5", - "dev": true + "version": "1.2.5" }, "minipass": { "version": "3.1.3", @@ -26077,8 +25970,7 @@ } }, "ms": { - "version": "2.1.2", - "dev": true + "version": "2.1.2" }, "multicast-dns": { "version": "6.2.3", @@ -26157,7 +26049,6 @@ "ng2-pdf-viewer": { "version": "7.0.1", "requires": { - "pdfjs-dist": "~2.7.570", "tslib": "^2.0.0" } }, @@ -26960,7 +26851,9 @@ } }, "pdfjs-dist": { - "version": "2.7.570" + "version": "2.7.570", + "peer": true, + "requires": {} }, "performance-now": { "version": "2.1.0", @@ -27091,19 +26984,23 @@ }, "postcss-discard-comments": { "version": "5.0.1", - "dev": true + "dev": true, + "requires": {} }, "postcss-discard-duplicates": { "version": "5.0.1", - "dev": true + "dev": true, + "requires": {} }, "postcss-discard-empty": { "version": "5.0.1", - "dev": true + "dev": true, + "requires": {} }, "postcss-discard-overridden": { "version": "5.0.1", - "dev": true + "dev": true, + "requires": {} }, "postcss-import": { "version": "14.0.0", @@ -27200,7 +27097,8 @@ }, "postcss-modules-extract-imports": { "version": "3.0.0", - "dev": true + "dev": true, + "requires": {} }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -27227,7 +27125,8 @@ }, "postcss-normalize-charset": { "version": "5.0.1", - "dev": true + "dev": true, + "requires": {} }, "postcss-normalize-display-values": { "version": "5.0.1", @@ -28067,8 +27966,7 @@ } }, "safe-buffer": { - "version": "5.1.2", - "dev": true + "version": "5.1.2" }, "safe-regex": { "version": "1.1.0", @@ -29155,7 +29053,6 @@ }, "supports-color": { "version": "5.5.0", - "dev": true, "requires": { "has-flag": "^3.0.0" } @@ -29353,7 +29250,8 @@ } }, "three-spritetext": { - "version": "1.6.2" + "version": "1.6.2", + "requires": {} }, "through": { "version": "2.3.8", @@ -29419,8 +29317,7 @@ "dev": true }, "to-fast-properties": { - "version": "2.0.0", - "dev": true + "version": "2.0.0" }, "to-object-path": { "version": "0.3.0", @@ -31211,7 +31108,8 @@ }, "ws": { "version": "7.4.6", - "dev": true + "dev": true, + "requires": {} }, "xml2js": { "version": "0.4.23", diff --git a/package.json b/package.json index b148574b57..16ddd6be0e 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ "@angular/router": "^11.2.9", "@ckeditor/ckeditor5-angular": "^1.2.3", "@dasch-swiss/dsp-js": "^4.0.0", - "@dasch-swiss/dsp-ui": "^1.8.0", "@ngx-translate/core": "^12.1.2", "@ngx-translate/http-loader": "5.0.0", "3d-force-graph": "^1.60.12", diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index fa0da4ce04..76011b4dbe 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -8,9 +8,9 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatToolbarModule } from '@angular/material/toolbar'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { TranslateModule } from '@ngx-translate/core'; import { TestConfig } from 'test.config'; +import { AppInitService } from './app-init.service'; import { AppComponent } from './app.component'; import { DspApiConfigToken, DspApiConnectionToken } from './main/declarations/dsp-api-tokens'; import { HeaderComponent } from './main/header/header.component'; diff --git a/src/app/main/dialog/dialog.component.ts b/src/app/main/dialog/dialog.component.ts index a89926f6d7..f1b770cbce 100644 --- a/src/app/main/dialog/dialog.component.ts +++ b/src/app/main/dialog/dialog.component.ts @@ -1,7 +1,7 @@ import { Component, Inject, OnInit, ViewChild } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { FilteredResources } from '@dasch-swiss/dsp-ui'; import { PropertyInfoObject } from 'src/app/project/ontology/default-data/default-properties'; +import { FilteredResources } from 'src/app/workspace/results/list-view/list-view.component'; export interface DialogData { mode: string; // switch mode diff --git a/src/app/main/header/header.component.ts b/src/app/main/header/header.component.ts index 03147a0b5a..b3af7f3243 100644 --- a/src/app/main/header/header.component.ts +++ b/src/app/main/header/header.component.ts @@ -3,10 +3,10 @@ import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; import { MatIconRegistry } from '@angular/material/icon'; import { DomSanitizer } from '@angular/platform-browser'; import { NavigationStart, Router } from '@angular/router'; -import { SearchParams } from '@dasch-swiss/dsp-ui'; import { Subscription } from 'rxjs'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ComponentCommunicationEventService, Events } from 'src/app/main/services/component-communication-event.service'; +import { SearchParams } from 'src/app/workspace/results/list-view/list-view.component'; import { NotificationService } from '../services/notification.service'; import { SessionService } from '../services/session.service'; diff --git a/src/app/main/help/help.component.spec.ts b/src/app/main/help/help.component.spec.ts index 02f669c32a..0ed1dfd6db 100644 --- a/src/app/main/help/help.component.spec.ts +++ b/src/app/main/help/help.component.spec.ts @@ -6,7 +6,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; +import { AppInitService } from 'src/app/app-init.service'; import { TestConfig } from 'test.config'; import { DspApiConfigToken, DspApiConnectionToken } from '../declarations/dsp-api-tokens'; import { DialogComponent } from '../dialog/dialog.component'; diff --git a/src/app/main/main.component.spec.ts b/src/app/main/main.component.spec.ts index 061f250b9a..3407d79635 100644 --- a/src/app/main/main.component.spec.ts +++ b/src/app/main/main.component.spec.ts @@ -10,9 +10,9 @@ import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { of } from 'rxjs'; import { TestConfig } from 'test.config'; +import { AppInitService } from '../app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from './declarations/dsp-api-tokens'; import { DialogComponent } from './dialog/dialog.component'; import { ErrorComponent } from './error/error.component'; diff --git a/src/app/project/board/board.component.spec.ts b/src/app/project/board/board.component.spec.ts index 71874f1b4c..f31604110c 100644 --- a/src/app/project/board/board.component.spec.ts +++ b/src/app/project/board/board.component.spec.ts @@ -8,8 +8,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { of } from 'rxjs'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/project/collaboration/add-user/add-user.component.spec.ts b/src/app/project/collaboration/add-user/add-user.component.spec.ts index 6cce042ee7..7ad876f818 100644 --- a/src/app/project/collaboration/add-user/add-user.component.spec.ts +++ b/src/app/project/collaboration/add-user/add-user.component.spec.ts @@ -8,8 +8,8 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { TranslateModule } from '@ngx-translate/core'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/project/collaboration/add-user/add-user.component.ts b/src/app/project/collaboration/add-user/add-user.component.ts index 73c78105de..81fc431e1c 100644 --- a/src/app/project/collaboration/add-user/add-user.component.ts +++ b/src/app/project/collaboration/add-user/add-user.component.ts @@ -11,13 +11,14 @@ import { UserResponse, UsersResponse } from '@dasch-swiss/dsp-js'; -import { AutocompleteItem, existingNamesValidator } from '@dasch-swiss/dsp-ui'; import { Observable } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; import { CacheService } from 'src/app/main/cache/cache.service'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; +import { existingNamesValidator } from 'src/app/main/directive/existing-name/existing-name.directive'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; +import { AutocompleteItem } from 'src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/operator'; @Component({ selector: 'app-add-user', diff --git a/src/app/project/collaboration/collaboration.component.spec.ts b/src/app/project/collaboration/collaboration.component.spec.ts index 8229951588..fb65f89f83 100644 --- a/src/app/project/collaboration/collaboration.component.spec.ts +++ b/src/app/project/collaboration/collaboration.component.spec.ts @@ -13,9 +13,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/project/collaboration/select-group/select-group.component.spec.ts b/src/app/project/collaboration/select-group/select-group.component.spec.ts index ab5a200610..1e68cbe165 100644 --- a/src/app/project/collaboration/select-group/select-group.component.spec.ts +++ b/src/app/project/collaboration/select-group/select-group.component.spec.ts @@ -7,7 +7,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/project/collaboration/select-group/select-group.component.ts b/src/app/project/collaboration/select-group/select-group.component.ts index de811b5009..c487cca5e4 100644 --- a/src/app/project/collaboration/select-group/select-group.component.ts +++ b/src/app/project/collaboration/select-group/select-group.component.ts @@ -1,10 +1,10 @@ import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core'; import { FormControl } from '@angular/forms'; import { ApiResponseData, ApiResponseError, GroupsResponse, KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AutocompleteItem } from '@dasch-swiss/dsp-ui'; import { CacheService } from 'src/app/main/cache/cache.service'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; +import { AutocompleteItem } from 'src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/operator'; @Component({ selector: 'app-select-group', diff --git a/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts b/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts index c4f4e09137..d3124c32b8 100644 --- a/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts +++ b/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts @@ -5,10 +5,10 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ApiResponseData, CreateChildNodeRequest, ListNodeInfoResponse, ListsEndpointAdmin, UpdateChildNodeRequest } from '@dasch-swiss/dsp-js'; -import { ProgressIndicatorComponent } from '@dasch-swiss/dsp-ui'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { AjaxResponse } from 'rxjs/ajax'; +import { ProgressIndicatorComponent } from 'src/app/main/action/progress-indicator/progress-indicator.component'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { EditListItemComponent } from './edit-list-item.component'; diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts b/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts index ca15f88e2f..fabc09eba0 100644 --- a/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts +++ b/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts @@ -9,9 +9,9 @@ import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection, MockProjects } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; +import { AppInitService } from 'src/app/app-init.service'; import { CacheService } from 'src/app/main/cache/cache.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { TestConfig } from 'test.config'; diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.ts b/src/app/project/ontology/ontology-form/ontology-form.component.ts index aa31094264..d2096a8fb2 100644 --- a/src/app/project/ontology/ontology-form/ontology-form.component.ts +++ b/src/app/project/ontology/ontology-form/ontology-form.component.ts @@ -9,9 +9,9 @@ import { ReadProject, UpdateOntologyMetadata } from '@dasch-swiss/dsp-js'; -import { existingNamesValidator } from '@dasch-swiss/dsp-ui'; import { CacheService } from 'src/app/main/cache/cache.service'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; +import { existingNamesValidator } from 'src/app/main/directive/existing-name/existing-name.directive'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; import { OntologyService } from '../ontology.service'; diff --git a/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.spec.ts b/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.spec.ts index 4afaa8adf9..2e3c961e76 100644 --- a/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.spec.ts +++ b/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.spec.ts @@ -11,7 +11,7 @@ import { ResourceClassDefinition, ResourcePropertyDefinition } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { ErrorComponent } from 'src/app/main/error/error.component'; import { TestConfig } from 'test.config'; diff --git a/src/app/project/ontology/ontology.component.ts b/src/app/project/ontology/ontology.component.ts index 0563717bcb..e3fb9f99aa 100644 --- a/src/app/project/ontology/ontology.component.ts +++ b/src/app/project/ontology/ontology.component.ts @@ -21,12 +21,12 @@ import { ReadProject, UpdateOntology } from '@dasch-swiss/dsp-js'; -import { SortingService } from '@dasch-swiss/dsp-ui'; import { CacheService } from 'src/app/main/cache/cache.service'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; import { Session, SessionService } from 'src/app/main/services/session.service'; +import { SortingService } from 'src/app/main/services/sorting.service'; import { DefaultProperties, PropertyCategory, PropertyInfoObject } from './default-data/default-properties'; import { DefaultClass, DefaultResourceClasses } from './default-data/default-resource-classes'; import { OntologyService } from './ontology.service'; diff --git a/src/app/project/ontology/property-form/property-form.component.ts b/src/app/project/ontology/property-form/property-form.component.ts index 7783000c85..6ef5ee9156 100644 --- a/src/app/project/ontology/property-form/property-form.component.ts +++ b/src/app/project/ontology/property-form/property-form.component.ts @@ -18,10 +18,10 @@ import { UpdateResourcePropertyGuiElement, UpdateResourcePropertyLabel } from '@dasch-swiss/dsp-js'; -import { AutocompleteItem } from '@dasch-swiss/dsp-ui'; import { CacheService } from 'src/app/main/cache/cache.service'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; +import { AutocompleteItem } from 'src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/operator'; import { DefaultProperties, DefaultProperty, PropertyCategory, PropertyInfoObject } from '../default-data/default-properties'; import { OntologyService } from '../ontology.service'; diff --git a/src/app/project/permission/permission.component.spec.ts b/src/app/project/permission/permission.component.spec.ts index e495b7b22e..d690aa5811 100644 --- a/src/app/project/permission/permission.component.spec.ts +++ b/src/app/project/permission/permission.component.spec.ts @@ -7,8 +7,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { of } from 'rxjs'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/project/project-form/project-form.component.spec.ts b/src/app/project/project-form/project-form.component.spec.ts index f9145c1eb1..a2ec4fd919 100644 --- a/src/app/project/project-form/project-form.component.spec.ts +++ b/src/app/project/project-form/project-form.component.spec.ts @@ -8,8 +8,8 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { TranslateModule } from '@ngx-translate/core'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/project/project-form/project-form.component.ts b/src/app/project/project-form/project-form.component.ts index 18420ff2e5..f624ffe846 100644 --- a/src/app/project/project-form/project-form.component.ts +++ b/src/app/project/project-form/project-form.component.ts @@ -15,8 +15,8 @@ import { UpdateProjectRequest, UserResponse } from '@dasch-swiss/dsp-js'; -import { existingNamesValidator } from '@dasch-swiss/dsp-ui'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; +import { existingNamesValidator } from 'src/app/main/directive/existing-name/existing-name.directive'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; import { SessionService } from 'src/app/main/services/session.service'; import { CacheService } from '../../main/cache/cache.service'; diff --git a/src/app/project/project.component.spec.ts b/src/app/project/project.component.spec.ts index ab1a59e3ec..a3e3e8444f 100644 --- a/src/app/project/project.component.spec.ts +++ b/src/app/project/project.component.spec.ts @@ -6,8 +6,8 @@ import { MatTabsModule } from '@angular/material/tabs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { TestConfig } from 'test.config'; +import { AppInitService } from '../app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from '../main/declarations/dsp-api-tokens'; import { DialogComponent } from '../main/dialog/dialog.component'; import { ErrorComponent } from '../main/error/error.component'; diff --git a/src/app/system/groups/groups-list/groups-list.component.ts b/src/app/system/groups/groups-list/groups-list.component.ts index 9485067eed..099b9cc5eb 100644 --- a/src/app/system/groups/groups-list/groups-list.component.ts +++ b/src/app/system/groups/groups-list/groups-list.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { DspMessageData } from '@dasch-swiss/dsp-ui'; +import { AppMessageData } from 'src/app/main/action/message/message.component'; @Component({ selector: 'app-groups-list', @@ -8,7 +8,7 @@ import { DspMessageData } from '@dasch-swiss/dsp-ui'; }) export class GroupsListComponent implements OnInit { - message: DspMessageData = { + message: AppMessageData = { status: 200, statusText: 'The list of permission groups is not yet implemented. But we are working on it.' }; diff --git a/src/app/system/projects/projects-list/projects-list.component.spec.ts b/src/app/system/projects/projects-list/projects-list.component.spec.ts index e9699ab698..2c5cbb76ab 100644 --- a/src/app/system/projects/projects-list/projects-list.component.spec.ts +++ b/src/app/system/projects/projects-list/projects-list.component.spec.ts @@ -8,7 +8,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/system/projects/projects-list/projects-list.component.ts b/src/app/system/projects/projects-list/projects-list.component.ts index 2ca5e50266..f61a69654e 100644 --- a/src/app/system/projects/projects-list/projects-list.component.ts +++ b/src/app/system/projects/projects-list/projects-list.component.ts @@ -10,12 +10,12 @@ import { StoredProject, UpdateProjectRequest } from '@dasch-swiss/dsp-js'; -import { SortingService } from '@dasch-swiss/dsp-ui'; import { CacheService } from 'src/app/main/cache/cache.service'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; import { Session, SessionService } from 'src/app/main/services/session.service'; +import { SortingService } from 'src/app/main/services/sorting.service'; @Component({ selector: 'app-projects-list', diff --git a/src/app/system/projects/projects.component.spec.ts b/src/app/system/projects/projects.component.spec.ts index bef9d1db37..2c4ded5dd4 100644 --- a/src/app/system/projects/projects.component.spec.ts +++ b/src/app/system/projects/projects.component.spec.ts @@ -8,7 +8,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/system/users/users-list/users-list.component.spec.ts b/src/app/system/users/users-list/users-list.component.spec.ts index adf0422552..edd540bfb9 100644 --- a/src/app/system/users/users-list/users-list.component.spec.ts +++ b/src/app/system/users/users-list/users-list.component.spec.ts @@ -11,8 +11,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { of } from 'rxjs'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/system/users/users-list/users-list.component.ts b/src/app/system/users/users-list/users-list.component.ts index 7097d6df1b..5980ce8bce 100644 --- a/src/app/system/users/users-list/users-list.component.ts +++ b/src/app/system/users/users-list/users-list.component.ts @@ -12,12 +12,12 @@ import { ReadUser, UserResponse } from '@dasch-swiss/dsp-js'; -import { SortingService } from '@dasch-swiss/dsp-ui'; import { CacheService } from 'src/app/main/cache/cache.service'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; import { Session, SessionService } from 'src/app/main/services/session.service'; +import { SortingService } from 'src/app/main/services/sorting.service'; @Component({ selector: 'app-users-list', diff --git a/src/app/system/users/users.component.spec.ts b/src/app/system/users/users.component.spec.ts index 892da10f69..84315c9158 100644 --- a/src/app/system/users/users.component.spec.ts +++ b/src/app/system/users/users.component.spec.ts @@ -10,7 +10,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/user/account/account.component.spec.ts b/src/app/user/account/account.component.spec.ts index bc9d49aa03..e94c274979 100644 --- a/src/app/user/account/account.component.spec.ts +++ b/src/app/user/account/account.component.spec.ts @@ -9,8 +9,8 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { TranslateModule } from '@ngx-translate/core'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/user/dashboard/dashboard.component.spec.ts b/src/app/user/dashboard/dashboard.component.spec.ts index 48091dbf4c..0ff8eee395 100644 --- a/src/app/user/dashboard/dashboard.component.spec.ts +++ b/src/app/user/dashboard/dashboard.component.spec.ts @@ -8,7 +8,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/user/membership/membership.component.spec.ts b/src/app/user/membership/membership.component.spec.ts index 7a89aad94a..82c0074054 100644 --- a/src/app/user/membership/membership.component.spec.ts +++ b/src/app/user/membership/membership.component.spec.ts @@ -10,7 +10,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/user/membership/membership.component.ts b/src/app/user/membership/membership.component.ts index 3aa96d2233..0f760f9106 100644 --- a/src/app/user/membership/membership.component.ts +++ b/src/app/user/membership/membership.component.ts @@ -11,11 +11,11 @@ import { UserResponse } from '@dasch-swiss/dsp-js'; import { PermissionsData } from '@dasch-swiss/dsp-js/src/models/admin/permissions-data'; -import { AutocompleteItem } from '@dasch-swiss/dsp-ui'; import { CacheService } from 'src/app/main/cache/cache.service'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; import { Session } from 'src/app/main/services/session.service'; +import { AutocompleteItem } from 'src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/operator'; // --> TODO replace it by IPermissions from dsp-js export interface IPermissions { diff --git a/src/app/user/profile/profile.component.spec.ts b/src/app/user/profile/profile.component.spec.ts index 23a74b37e8..f42d891de0 100644 --- a/src/app/user/profile/profile.component.spec.ts +++ b/src/app/user/profile/profile.component.spec.ts @@ -7,7 +7,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/user/user-form/password-form/password-form.component.spec.ts b/src/app/user/user-form/password-form/password-form.component.spec.ts index 4468a5411e..a7edb52c43 100644 --- a/src/app/user/user-form/password-form/password-form.component.spec.ts +++ b/src/app/user/user-form/password-form/password-form.component.spec.ts @@ -8,8 +8,8 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { TranslateModule } from '@ngx-translate/core'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/user/user-form/password-form/password-form.component.ts b/src/app/user/user-form/password-form/password-form.component.ts index c36120d025..ec1a7ff675 100644 --- a/src/app/user/user-form/password-form/password-form.component.ts +++ b/src/app/user/user-form/password-form/password-form.component.ts @@ -8,7 +8,7 @@ import { ReadUser, UserResponse } from '@dasch-swiss/dsp-js'; -import { DspMessageData } from '@dasch-swiss/dsp-ui'; +import { AppMessageData } from 'src/app/main/action/message/message.component'; import { CacheService } from 'src/app/main/cache/cache.service'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; @@ -37,7 +37,7 @@ export class PasswordFormComponent implements OnInit { public readonly REGEX_PASSWORD = /^(?=.*\d)(?=.*[a-zA-Z]).{8,}$/i; // in case of updating data: was it succesful or does it failed - apiResponses: DspMessageData[] = [ + apiResponses: AppMessageData[] = [ { status: 200, statusText: 'You have successfully updated your password.' @@ -53,7 +53,7 @@ export class PasswordFormComponent implements OnInit { } ]; - showResponse: DspMessageData; + showResponse: AppMessageData; user: ReadUser; diff --git a/src/app/user/user-form/user-form.component.spec.ts b/src/app/user/user-form/user-form.component.spec.ts index 8b1604f0fd..ad5f276c4c 100644 --- a/src/app/user/user-form/user-form.component.spec.ts +++ b/src/app/user/user-form/user-form.component.spec.ts @@ -9,8 +9,8 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { TranslateModule } from '@ngx-translate/core'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/user/user-form/user-form.component.ts b/src/app/user/user-form/user-form.component.ts index 8d74b39fd0..bb37afe83b 100644 --- a/src/app/user/user-form/user-form.component.ts +++ b/src/app/user/user-form/user-form.component.ts @@ -15,9 +15,9 @@ import { UserResponse, UsersResponse } from '@dasch-swiss/dsp-js'; -import { existingNamesValidator } from '@dasch-swiss/dsp-ui'; import { AppGlobal } from 'src/app/app-global'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; +import { existingNamesValidator } from 'src/app/main/directive/existing-name/existing-name.directive'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; import { Session, SessionService } from 'src/app/main/services/session.service'; import { CacheService } from '../../main/cache/cache.service'; diff --git a/src/app/user/user-menu/user-menu.component.spec.ts b/src/app/user/user-menu/user-menu.component.spec.ts index 614d089073..555a4f3a61 100644 --- a/src/app/user/user-menu/user-menu.component.spec.ts +++ b/src/app/user/user-menu/user-menu.component.spec.ts @@ -8,7 +8,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorComponent } from 'src/app/main/error/error.component'; diff --git a/src/app/user/user.component.spec.ts b/src/app/user/user.component.spec.ts index ab55571d33..abdb6f4284 100644 --- a/src/app/user/user.component.spec.ts +++ b/src/app/user/user.component.spec.ts @@ -13,9 +13,9 @@ import { MatTabsModule } from '@angular/material/tabs'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { TranslateModule } from '@ngx-translate/core'; import { TestConfig } from 'test.config'; +import { AppInitService } from '../app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from '../main/declarations/dsp-api-tokens'; import { DialogComponent } from '../main/dialog/dialog.component'; import { ErrorComponent } from '../main/error/error.component'; diff --git a/src/app/workspace/comparison/comparison.component.ts b/src/app/workspace/comparison/comparison.component.ts index c2dea94c1e..f59b55bb77 100644 --- a/src/app/workspace/comparison/comparison.component.ts +++ b/src/app/workspace/comparison/comparison.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnChanges } from '@angular/core'; -import { ShortResInfo } from '@dasch-swiss/dsp-ui'; +import { ShortResInfo } from '../results/list-view/list-view.component'; @Component({ selector: 'app-comparison', diff --git a/src/app/workspace/intermediate/intermediate.component.spec.ts b/src/app/workspace/intermediate/intermediate.component.spec.ts index 4f4a413e11..4959e83ee2 100644 --- a/src/app/workspace/intermediate/intermediate.component.spec.ts +++ b/src/app/workspace/intermediate/intermediate.component.spec.ts @@ -7,7 +7,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatTooltipModule } from '@angular/material/tooltip'; import { By } from '@angular/platform-browser'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { TestConfig } from 'test.config'; import { FilteredResources } from '../results/list-view/list-view.component'; diff --git a/src/app/workspace/intermediate/intermediate.component.ts b/src/app/workspace/intermediate/intermediate.component.ts index 1cf66b28b4..b66f97af2a 100644 --- a/src/app/workspace/intermediate/intermediate.component.ts +++ b/src/app/workspace/intermediate/intermediate.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; -import { FilteredResources } from '@dasch-swiss/dsp-ui'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; +import { FilteredResources } from '../results/list-view/list-view.component'; @Component({ selector: 'app-intermediate', diff --git a/src/app/workspace/resource/dsp-resource.ts b/src/app/workspace/resource/dsp-resource.ts index 9d149a6675..a81b08b334 100644 --- a/src/app/workspace/resource/dsp-resource.ts +++ b/src/app/workspace/resource/dsp-resource.ts @@ -3,7 +3,7 @@ import { ReadValue, SystemPropertyDefinition } from '@dasch-swiss/dsp-js'; -import { PropertyInfoValues } from '@dasch-swiss/dsp-ui'; +import { PropertyInfoValues } from './properties/properties.component'; export class DspResource { diff --git a/src/app/workspace/resource/properties/properties.component.spec.ts b/src/app/workspace/resource/properties/properties.component.spec.ts index 407974bae0..e8ee85dada 100644 --- a/src/app/workspace/resource/properties/properties.component.spec.ts +++ b/src/app/workspace/resource/properties/properties.component.spec.ts @@ -22,20 +22,15 @@ import { ResourcePropertyDefinition, SystemPropertyDefinition } from '@dasch-swiss/dsp-js'; -import { - AppInitService, - EmitEvent, - Events, - PropertyInfoValues, - ValueOperationEventService -} from '@dasch-swiss/dsp-ui'; import { of, Subscription } from 'rxjs'; import { DspResource } from '../dsp-resource'; -import { PropertiesComponent } from './properties.component'; +import { PropertiesComponent, PropertyInfoValues } from './properties.component'; import { IncomingService } from '../incoming.service'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { UserService } from '../services/user.service'; import { MatDialogModule } from '@angular/material/dialog'; +import { AppInitService } from 'src/app/app-init.service'; +import { EmitEvent, Events, ValueOperationEventService } from '../services/value-operation-event.service'; /** * test host component to simulate parent component. @@ -103,7 +98,7 @@ class TestPropertyParentComponent implements OnInit, OnDestroy { * test host component to simulate child component, here display-edit. */ @Component({ - selector: 'dsp-display-edit', + selector: 'app-display-edit', template: '' }) class TestDisplayValueComponent { @@ -121,7 +116,7 @@ class TestDisplayValueComponent { * test host component to simulate child component, here add-value. */ @Component({ - selector: 'dsp-add-value', + selector: 'app-add-value', template: '' }) class TestAddValueComponent { diff --git a/src/app/workspace/resource/representation/file-representation.ts b/src/app/workspace/resource/representation/file-representation.ts index 97596d9498..d1b7c9f804 100644 --- a/src/app/workspace/resource/representation/file-representation.ts +++ b/src/app/workspace/resource/representation/file-representation.ts @@ -5,7 +5,7 @@ import { ReadMovingImageFileValue, ReadStillImageFileValue } from '@dasch-swiss/dsp-js'; -import { Region } from '@dasch-swiss/dsp-ui'; +import { Region } from './still-image/still-image.component'; /** * represents a file value including its annotations. diff --git a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts index 52c716d60e..43d4db8042 100644 --- a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts +++ b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts @@ -36,7 +36,6 @@ import { UsersEndpointAdmin } from '@dasch-swiss/dsp-js'; import { OntologyCache } from '@dasch-swiss/dsp-js/src/cache/ontology-cache/OntologyCache'; -import { IntValueComponent, TextValueAsStringComponent, ValueService } from '@dasch-swiss/dsp-ui'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { AjaxResponse } from 'rxjs/ajax'; @@ -44,6 +43,9 @@ import { CacheService } from 'src/app/main/cache/cache.service'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { BaseValueDirective } from 'src/app/main/directive/base-value.directive'; import { Session, SessionService } from 'src/app/main/services/session.service'; +import { ValueService } from '../services/value.service'; +import { IntValueComponent } from '../values/int-value/int-value.component'; +import { TextValueAsStringComponent } from '../values/text-value/text-value-as-string/text-value-as-string.component'; import { ResourceInstanceFormComponent } from './resource-instance-form.component'; import { SwitchPropertiesComponent } from './select-properties/switch-properties/switch-properties.component'; diff --git a/src/app/workspace/resource/resource-link-form/resource-link-form.component.ts b/src/app/workspace/resource/resource-link-form/resource-link-form.component.ts index 45e56b4664..270aeed9d6 100644 --- a/src/app/workspace/resource/resource-link-form/resource-link-form.component.ts +++ b/src/app/workspace/resource/resource-link-form/resource-link-form.component.ts @@ -11,9 +11,9 @@ import { ReadResource, StoredProject } from '@dasch-swiss/dsp-js'; -import { FilteredResources } from '@dasch-swiss/dsp-ui'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; +import { FilteredResources } from '../../results/list-view/list-view.component'; import { ProjectService } from '../project.service'; @Component({ diff --git a/src/app/workspace/resource/resource.component.spec.ts b/src/app/workspace/resource/resource.component.spec.ts index f881a9395d..984705700e 100644 --- a/src/app/workspace/resource/resource.component.spec.ts +++ b/src/app/workspace/resource/resource.component.spec.ts @@ -4,7 +4,7 @@ import { MatIconModule } from '@angular/material/icon'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { TestConfig } from 'test.config'; import { ResourceComponent } from './resource.component'; diff --git a/src/app/workspace/resource/resource.component.ts b/src/app/workspace/resource/resource.component.ts index 048787e84e..ad4dc95d03 100644 --- a/src/app/workspace/resource/resource.component.ts +++ b/src/app/workspace/resource/resource.component.ts @@ -18,7 +18,6 @@ import { ReadResourceSequence, ReadStillImageFileValue, SystemPropertyDefinition } from '@dasch-swiss/dsp-js'; -import { PropertyInfoValues, ValueOperationEventService } from '@dasch-swiss/dsp-ui'; import { Subscription } from 'rxjs'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; @@ -26,8 +25,10 @@ import { NotificationService } from 'src/app/main/services/notification.service' import { Session, SessionService } from 'src/app/main/services/session.service'; import { DspCompoundPosition, DspResource } from './dsp-resource'; import { IncomingService } from './incoming.service'; +import { PropertyInfoValues } from './properties/properties.component'; import { FileRepresentation, RepresentationConstants } from './representation/file-representation'; import { Region } from './representation/still-image/still-image.component'; +import { ValueOperationEventService } from './services/value-operation-event.service'; @Component({ selector: 'app-resource', diff --git a/src/app/workspace/results/results.component.spec.ts b/src/app/workspace/results/results.component.spec.ts index e50d1b9c8d..1dfb1772ec 100644 --- a/src/app/workspace/results/results.component.spec.ts +++ b/src/app/workspace/results/results.component.spec.ts @@ -1,8 +1,8 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { KnoraApiConnection } from '@dasch-swiss/dsp-js'; -import { AppInitService } from '@dasch-swiss/dsp-ui'; import { AngularSplitModule } from 'angular-split'; +import { AppInitService } from 'src/app/app-init.service'; import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { TestConfig } from 'test.config'; import { ResourceComponent } from '../resource/resource.component'; diff --git a/src/app/workspace/results/results.component.ts b/src/app/workspace/results/results.component.ts index bf2c784de3..3606466c08 100644 --- a/src/app/workspace/results/results.component.ts +++ b/src/app/workspace/results/results.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { Title } from '@angular/platform-browser'; import { ActivatedRoute, Params } from '@angular/router'; -import { FilteredResources, SearchParams } from '@dasch-swiss/dsp-ui'; +import { FilteredResources, SearchParams } from './list-view/list-view.component'; @Component({ selector: 'app-results', diff --git a/src/styles.scss b/src/styles.scss index b39258122a..ea2e0f5ed7 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -2,4 +2,3 @@ @import "assets/style/material-theme"; @import "assets/style/main"; -@import '@dasch-swiss/dsp-ui/src/assets/style/dsp-ui.scss';