Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(app-state-service): move Application State Service to a library #1120

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 0 additions & 37 deletions apps/dsp-app/src/app/main/cache/aplication-state.service.spec.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { MatDialogModule } from '@angular/material/dialog';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { TestConfig } from './../../../test.config';
import { ApplicationStateService } from '../cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import {
DspApiConfigToken,
DspApiConnectionToken,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Inject, Injectable } from '@angular/core';
import { ApiResponseError, KnoraApiConnection } from '@dasch-swiss/dsp-js';
import { ApplicationStateService } from '../cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { ErrorHandlerService } from '../services/error-handler.service';
import { DatadogRumService } from './datadog-rum.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
} from '@dasch-swiss/vre/shared/app-session';
import { ProjectService } from '@dsp-app/src/app/workspace/resource/services/project.service';
import { AddUserComponent } from './add-user/add-user.component';
import { ApplicationStateService } from '../../main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';

@Component({
selector: 'app-collaboration',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
GroupsResponse,
KnoraApiConnection,
} from '@dasch-swiss/dsp-js';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { ErrorHandlerService } from '@dsp-app/src/app/main/services/error-handler.service';
import { AutocompleteItem } from '@dsp-app/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/operator';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import { MatInputModule } from '@angular/material/input';
import { By } from '@angular/platform-browser';
import { MatButtonHarness } from '@angular/material/button/testing';
import { AjaxResponse } from 'rxjs/ajax';
import { ApplicationStateService } from '../../main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';

@Component({
template: '<app-description #description></app-description>',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
SessionService,
} from '@dasch-swiss/vre/shared/app-session';
import { ProjectService } from '@dsp-app/src/app/workspace/resource/services/project.service';
import { ApplicationStateService } from '../../main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';

@Component({
selector: 'app-description',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { of } from 'rxjs';
import { AjaxResponse } from 'rxjs/ajax';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ProgressIndicatorComponent } from '@dsp-app/src/app/main/action/progress-indicator/progress-indicator.component';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { ProjectService } from '@dsp-app/src/app/workspace/resource/services/project.service';
import { EditListItemComponent } from './edit-list-item.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import {
Session,
SessionService,
} from '@dasch-swiss/vre/shared/app-session';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';

/**
* test host component to simulate parent component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
Session,
SessionService,
} from '@dasch-swiss/vre/shared/app-session';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';

export class ListNodeOperation {
operation: 'create' | 'insert' | 'update' | 'delete' | 'reposition';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
Session,
SessionService,
} from '@dasch-swiss/vre/shared/app-session';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';

/**
* test host component to simulate parent component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
Session,
SessionService,
} from '@dasch-swiss/vre/shared/app-session';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';

@Component({
selector: 'app-list-item',
Expand Down
2 changes: 1 addition & 1 deletion apps/dsp-app/src/app/project/list/list.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { of } from 'rxjs';
import { AjaxResponse } from 'rxjs/ajax';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { DialogHeaderComponent } from '@dsp-app/src/app/main/dialog/dialog-header/dialog-header.component';
import { DialogComponent } from '@dsp-app/src/app/main/dialog/dialog.component';
Expand Down
2 changes: 1 addition & 1 deletion apps/dsp-app/src/app/project/list/list.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
} from '@dasch-swiss/dsp-js';
import { AppGlobal } from '@dsp-app/src/app/app-global';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { DialogComponent } from '@dsp-app/src/app/main/dialog/dialog.component';
import { ErrorHandlerService } from '@dsp-app/src/app/main/services/error-handler.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
UserResponse,
} from '@dasch-swiss/dsp-js';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { ErrorHandlerService } from '@dsp-app/src/app/main/services/error-handler.service';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { KnoraApiConnection, MockProjects } from '@dasch-swiss/dsp-js';
import { TranslateModule } from '@ngx-translate/core';
import { of } from 'rxjs';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import {
DspApiConfigToken,
DspApiConnectionToken,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
ReadProject,
UpdateOntologyMetadata,
} from '@dasch-swiss/dsp-js';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { existingNamesValidator } from '@dsp-app/src/app/main/directive/existing-name/existing-name.directive';
import { ErrorHandlerService } from '@dsp-app/src/app/main/services/error-handler.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import {
import { of } from 'rxjs';
import { AjaxResponse } from 'rxjs/ajax';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import {
DspApiConfigToken,
DspApiConnectionToken,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
UpdateOntology,
UserResponse,
} from '@dasch-swiss/dsp-js';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { DialogComponent } from '@dsp-app/src/app/main/dialog/dialog.component';
import { ErrorHandlerService } from '@dsp-app/src/app/main/services/error-handler.service';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { TestBed } from '@angular/core/testing';
import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import {
DspApiConfigToken,
DspApiConnectionToken,
Expand Down
2 changes: 1 addition & 1 deletion apps/dsp-app/src/app/project/ontology/ontology.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
ResourcePropertyDefinitionWithAllLanguages,
} from '@dasch-swiss/dsp-js';
import { Observable, of } from 'rxjs';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConfigToken } from '@dasch-swiss/vre/shared/app-config';
import {
DefaultProperties,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
import { TranslateModule } from '@ngx-translate/core';
import { of } from 'rxjs';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import {
DspApiConfigToken,
DspApiConnectionToken,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
UpdateResourcePropertyGuiElement,
UpdateResourcePropertyLabel,
} from '@dasch-swiss/dsp-js';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { existingNamesValidator } from '@dsp-app/src/app/main/directive/existing-name/existing-name.directive';
import { ErrorHandlerService } from '@dsp-app/src/app/main/services/error-handler.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
} from '@dasch-swiss/dsp-js';
import { of } from 'rxjs';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import {
DspApiConfigToken,
DspApiConnectionToken,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
ReadProject,
ResourcePropertyDefinitionWithAllLanguages,
} from '@dasch-swiss/dsp-js';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { ErrorHandlerService } from '@dsp-app/src/app/main/services/error-handler.service';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
import { TranslateModule } from '@ngx-translate/core';
import { of } from 'rxjs';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import {
DspApiConfigToken,
DspApiConnectionToken,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
} from '@dasch-swiss/dsp-js';
import { StringLiteralV2 } from '@dasch-swiss/dsp-js/src/models/v2/string-literal-v2';
import { AppGlobal } from '@dsp-app/src/app/app-global';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { existingNamesValidator } from '@dsp-app/src/app/main/directive/existing-name/existing-name.directive';
import { ErrorHandlerService } from '@dsp-app/src/app/main/services/error-handler.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
} from '@dasch-swiss/dsp-js';
import { of } from 'rxjs';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import {
DspApiConfigToken,
DspApiConnectionToken,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
UpdateOntology,
UpdateResourceClassCardinality,
} from '@dasch-swiss/dsp-js';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { DialogComponent } from '@dsp-app/src/app/main/dialog/dialog.component';
import { ErrorHandlerService } from '@dsp-app/src/app/main/services/error-handler.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
} from '@dasch-swiss/dsp-js';
import { of } from 'rxjs';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import {
DspApiConfigToken,
DspApiConnectionToken,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
UpdateOntology,
UpdateResourceClassCardinality,
} from '@dasch-swiss/dsp-js';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { ErrorHandlerService } from '@dsp-app/src/app/main/services/error-handler.service';
import { DefaultProperty } from '../../default-data/default-properties';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
} from '@dasch-swiss/dsp-js';
import { of } from 'rxjs';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import {
DspApiConfigToken,
DspApiConnectionToken,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
ReadGroup,
ReadProject,
} from '@dasch-swiss/dsp-js';
import { ApplicationStateService } from '@dsp-app/src/app/main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { ErrorHandlerService } from '@dsp-app/src/app/main/services/error-handler.service';
import {
Expand Down Expand Up @@ -104,7 +104,7 @@ export class PermissionComponent implements OnInit {
// referesh the component
this.loading = true;
// update the application state
this._applicationStateService.del('members_of_' + this.projectUuid);
this._applicationStateService.delete('members_of_' + this.projectUuid);

this.initList();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { ErrorHandlerService } from '@dsp-app/src/app/main/services/error-handle
import { NotificationService } from '@dsp-app/src/app/main/services/notification.service';
import { SessionService } from '@dasch-swiss/vre/shared/app-session';
import { ProjectService } from '@dsp-app/src/app/workspace/resource/services/project.service';
import { ApplicationStateService } from '../../main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';

@Component({
selector: 'app-project-form',
Expand Down Expand Up @@ -568,7 +568,7 @@ export class ProjectFormComponent implements OnInit {
// refresh the component
this.loading = true;
// update the application state
this._applicationStateService.del(this._projectService.iriToUuid(this.projectIri));
this._applicationStateService.delete(this._projectService.iriToUuid(this.projectIri));
this._dspApiConnection.admin.projectsEndpoint
.getProjectByIri(this.projectIri)
.subscribe(
Expand Down
2 changes: 1 addition & 1 deletion apps/dsp-app/src/app/project/project.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {
import { of } from 'rxjs';
import { AjaxResponse } from 'rxjs/ajax';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '../main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { DialogComponent } from '../main/dialog/dialog.component';
import { Session, SessionService } from '@dasch-swiss/vre/shared/app-session';
Expand Down
2 changes: 1 addition & 1 deletion apps/dsp-app/src/app/project/project.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
} from '@dasch-swiss/dsp-js';
import { AppGlobal } from '../app-global';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ApplicationStateService } from '../main/cache/application-state.service';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { MenuItem } from '../main/declarations/menu-item';
import { ErrorHandlerService } from '../main/services/error-handler.service';
Expand Down