Skip to content

Commit 43888a6

Browse files
authored
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
1 parent dd6be15 commit 43888a6

54 files changed

Lines changed: 127 additions & 232 deletions

File tree

Some content is hidden

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

‎package-lock.json‎

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

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"@angular/router": "^11.2.9",
3535
"@ckeditor/ckeditor5-angular": "^1.2.3",
3636
"@dasch-swiss/dsp-js": "^4.0.0",
37-
"@dasch-swiss/dsp-ui": "^1.8.0",
3837
"@ngx-translate/core": "^12.1.2",
3938
"@ngx-translate/http-loader": "5.0.0",
4039
"3d-force-graph": "^1.60.12",

‎src/app/app.component.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
88
import { MatToolbarModule } from '@angular/material/toolbar';
99
import { RouterTestingModule } from '@angular/router/testing';
1010
import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
11-
import { AppInitService } from '@dasch-swiss/dsp-ui';
1211
import { TranslateModule } from '@ngx-translate/core';
1312
import { TestConfig } from 'test.config';
13+
import { AppInitService } from './app-init.service';
1414
import { AppComponent } from './app.component';
1515
import { DspApiConfigToken, DspApiConnectionToken } from './main/declarations/dsp-api-tokens';
1616
import { HeaderComponent } from './main/header/header.component';

‎src/app/main/dialog/dialog.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, Inject, OnInit, ViewChild } from '@angular/core';
22
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
3-
import { FilteredResources } from '@dasch-swiss/dsp-ui';
43
import { PropertyInfoObject } from 'src/app/project/ontology/default-data/default-properties';
4+
import { FilteredResources } from 'src/app/workspace/results/list-view/list-view.component';
55

66
export interface DialogData {
77
mode: string; // switch mode

‎src/app/main/header/header.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
33
import { MatIconRegistry } from '@angular/material/icon';
44
import { DomSanitizer } from '@angular/platform-browser';
55
import { NavigationStart, Router } from '@angular/router';
6-
import { SearchParams } from '@dasch-swiss/dsp-ui';
76
import { Subscription } from 'rxjs';
87
import { DialogComponent } from 'src/app/main/dialog/dialog.component';
98
import { ComponentCommunicationEventService, Events } from 'src/app/main/services/component-communication-event.service';
9+
import { SearchParams } from 'src/app/workspace/results/list-view/list-view.component';
1010
import { NotificationService } from '../services/notification.service';
1111
import { SessionService } from '../services/session.service';
1212

‎src/app/main/help/help.component.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
66
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
77
import { RouterTestingModule } from '@angular/router/testing';
88
import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
9-
import { AppInitService } from '@dasch-swiss/dsp-ui';
9+
import { AppInitService } from 'src/app/app-init.service';
1010
import { TestConfig } from 'test.config';
1111
import { DspApiConfigToken, DspApiConnectionToken } from '../declarations/dsp-api-tokens';
1212
import { DialogComponent } from '../dialog/dialog.component';

‎src/app/main/main.component.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import { By } from '@angular/platform-browser';
1010
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
1111
import { RouterTestingModule } from '@angular/router/testing';
1212
import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
13-
import { AppInitService } from '@dasch-swiss/dsp-ui';
1413
import { of } from 'rxjs';
1514
import { TestConfig } from 'test.config';
15+
import { AppInitService } from '../app-init.service';
1616
import { DspApiConfigToken, DspApiConnectionToken } from './declarations/dsp-api-tokens';
1717
import { DialogComponent } from './dialog/dialog.component';
1818
import { ErrorComponent } from './error/error.component';

‎src/app/project/board/board.component.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
88
import { ActivatedRoute } from '@angular/router';
99
import { RouterTestingModule } from '@angular/router/testing';
1010
import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
11-
import { AppInitService } from '@dasch-swiss/dsp-ui';
1211
import { of } from 'rxjs';
12+
import { AppInitService } from 'src/app/app-init.service';
1313
import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
1414
import { DialogComponent } from 'src/app/main/dialog/dialog.component';
1515
import { ErrorComponent } from 'src/app/main/error/error.component';

‎src/app/project/collaboration/add-user/add-user.component.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
88
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
99
import { RouterTestingModule } from '@angular/router/testing';
1010
import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
11-
import { AppInitService } from '@dasch-swiss/dsp-ui';
1211
import { TranslateModule } from '@ngx-translate/core';
12+
import { AppInitService } from 'src/app/app-init.service';
1313
import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
1414
import { DialogComponent } from 'src/app/main/dialog/dialog.component';
1515
import { ErrorComponent } from 'src/app/main/error/error.component';

‎src/app/project/collaboration/add-user/add-user.component.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ import {
1111
UserResponse,
1212
UsersResponse
1313
} from '@dasch-swiss/dsp-js';
14-
import { AutocompleteItem, existingNamesValidator } from '@dasch-swiss/dsp-ui';
1514
import { Observable } from 'rxjs';
1615
import { map, startWith } from 'rxjs/operators';
1716
import { CacheService } from 'src/app/main/cache/cache.service';
1817
import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
1918
import { DialogComponent } from 'src/app/main/dialog/dialog.component';
19+
import { existingNamesValidator } from 'src/app/main/directive/existing-name/existing-name.directive';
2020
import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
21+
import { AutocompleteItem } from 'src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/operator';
2122

2223
@Component({
2324
selector: 'app-add-user',

0 commit comments

Comments
 (0)