diff --git a/src/app/core/helpers/relation-2-tiers-action.helper.ts b/src/app/core/helpers/relation-2-tiers-action.helper.ts
index 9c0aea939abdfffb61105c81a8619e70ea5f3daa..bdab531d4b9987534a7952f26375474d1e411bd1 100644
--- a/src/app/core/helpers/relation-2-tiers-action.helper.ts
+++ b/src/app/core/helpers/relation-2-tiers-action.helper.ts
@@ -1,52 +1,52 @@
import {Relation2TiersAction} from "@app/core/stores/relation-2-tiers/relation-2-tiers.action";
-import {Relation2TiersNamespaceModel} from "@app/core/stores/relation-2-tiers/relation-2-tiers-namespace.model";
+import {Relation2TiersNamespace} from "@app/core/stores/relation-2-tiers/relation2-tiers.namespace";
export class Relation2TiersActionHelper {
- static getAllSubResource(crudTwoTiersNameSpace: Relation2TiersNamespaceModel, ...args: ConstructorParameters<typeof Relation2TiersAction.GetAllSubResource>): Relation2TiersAction.GetAllSubResource {
+ static getAllSubResource(crudTwoTiersNameSpace: Relation2TiersNamespace, ...args: ConstructorParameters<typeof Relation2TiersAction.GetAllSubResource>): Relation2TiersAction.GetAllSubResource {
return new crudTwoTiersNameSpace.GetAllSubResource(...args);
}
- static getAllSubResourceSuccess<T>(crudTwoTiersNameSpace: Relation2TiersNamespaceModel, ...args: ConstructorParameters<typeof Relation2TiersAction.GetAllSubResourceSuccess>): Relation2TiersAction.GetAllSubResourceSuccess<T> {
+ static getAllSubResourceSuccess<T>(crudTwoTiersNameSpace: Relation2TiersNamespace, ...args: ConstructorParameters<typeof Relation2TiersAction.GetAllSubResourceSuccess>): Relation2TiersAction.GetAllSubResourceSuccess<T> {
return new crudTwoTiersNameSpace.GetAllSubResourceSuccess(...args);
}
- static getAllSubResourceFail(crudTwoTiersNameSpace: Relation2TiersNamespaceModel, ...args: ConstructorParameters<typeof Relation2TiersAction.GetAllSubResourceFail>): Relation2TiersAction.GetAllSubResourceFail {
+ static getAllSubResourceFail(crudTwoTiersNameSpace: Relation2TiersNamespace, ...args: ConstructorParameters<typeof Relation2TiersAction.GetAllSubResourceFail>): Relation2TiersAction.GetAllSubResourceFail {
return new crudTwoTiersNameSpace.GetAllSubResourceFail(...args);
}
- static createSubResource(crudTwoTiersNameSpace: Relation2TiersNamespaceModel, ...args: ConstructorParameters<typeof Relation2TiersAction.CreateSubResource>): Relation2TiersAction.CreateSubResource {
+ static createSubResource(crudTwoTiersNameSpace: Relation2TiersNamespace, ...args: ConstructorParameters<typeof Relation2TiersAction.CreateSubResource>): Relation2TiersAction.CreateSubResource {
return new crudTwoTiersNameSpace.CreateSubResource(...args);
}
- static createSubResourceSuccess(crudTwoTiersNameSpace: Relation2TiersNamespaceModel, ...args: ConstructorParameters<typeof Relation2TiersAction.CreateSubResourceSuccess>): Relation2TiersAction.CreateSubResourceSuccess {
+ static createSubResourceSuccess(crudTwoTiersNameSpace: Relation2TiersNamespace, ...args: ConstructorParameters<typeof Relation2TiersAction.CreateSubResourceSuccess>): Relation2TiersAction.CreateSubResourceSuccess {
return new crudTwoTiersNameSpace.CreateSubResourceSuccess(...args);
}
- static createSubResourceFail(crudTwoTiersNameSpace: Relation2TiersNamespaceModel, ...args: ConstructorParameters<typeof Relation2TiersAction.CreateSubResourceFail>): Relation2TiersAction.CreateSubResourceFail {
+ static createSubResourceFail(crudTwoTiersNameSpace: Relation2TiersNamespace, ...args: ConstructorParameters<typeof Relation2TiersAction.CreateSubResourceFail>): Relation2TiersAction.CreateSubResourceFail {
return new crudTwoTiersNameSpace.CreateSubResourceFail(...args);
}
- static deleteSubResource(crudTwoTiersNameSpace: Relation2TiersNamespaceModel, ...args: ConstructorParameters<typeof Relation2TiersAction.DeleteSubResource>): Relation2TiersAction.DeleteSubResource {
+ static deleteSubResource(crudTwoTiersNameSpace: Relation2TiersNamespace, ...args: ConstructorParameters<typeof Relation2TiersAction.DeleteSubResource>): Relation2TiersAction.DeleteSubResource {
return new crudTwoTiersNameSpace.DeleteSubResource(...args);
}
- static deleteSubResourceSuccess(crudTwoTiersNameSpace: Relation2TiersNamespaceModel, ...args: ConstructorParameters<typeof Relation2TiersAction.DeleteSubResourceSuccess>): Relation2TiersAction.DeleteSubResourceSuccess {
+ static deleteSubResourceSuccess(crudTwoTiersNameSpace: Relation2TiersNamespace, ...args: ConstructorParameters<typeof Relation2TiersAction.DeleteSubResourceSuccess>): Relation2TiersAction.DeleteSubResourceSuccess {
return new crudTwoTiersNameSpace.DeleteSubResourceSuccess(...args);
}
- static deleteSubResourceFail(crudTwoTiersNameSpace: Relation2TiersNamespaceModel, ...args: ConstructorParameters<typeof Relation2TiersAction.DeleteSubResourceFail>): Relation2TiersAction.DeleteSubResourceFail {
+ static deleteSubResourceFail(crudTwoTiersNameSpace: Relation2TiersNamespace, ...args: ConstructorParameters<typeof Relation2TiersAction.DeleteSubResourceFail>): Relation2TiersAction.DeleteSubResourceFail {
return new crudTwoTiersNameSpace.DeleteSubResourceFail(...args);
}
- static updateSubResource(crudTwoTiersNameSpace: Relation2TiersNamespaceModel, ...args: ConstructorParameters<typeof Relation2TiersAction.UpdateSubResource>): Relation2TiersAction.UpdateSubResource {
+ static updateSubResource(crudTwoTiersNameSpace: Relation2TiersNamespace, ...args: ConstructorParameters<typeof Relation2TiersAction.UpdateSubResource>): Relation2TiersAction.UpdateSubResource {
return new crudTwoTiersNameSpace.UpdateSubResource(...args);
}
- static updateSubResourceSuccess(crudTwoTiersNameSpace: Relation2TiersNamespaceModel, ...args: ConstructorParameters<typeof Relation2TiersAction.UpdateSubResourceSuccess>): Relation2TiersAction.UpdateSubResourceSuccess {
+ static updateSubResourceSuccess(crudTwoTiersNameSpace: Relation2TiersNamespace, ...args: ConstructorParameters<typeof Relation2TiersAction.UpdateSubResourceSuccess>): Relation2TiersAction.UpdateSubResourceSuccess {
return new crudTwoTiersNameSpace.UpdateSubResourceSuccess(...args);
}
- static updateSubResourceFail(crudTwoTiersNameSpace: Relation2TiersNamespaceModel, ...args: ConstructorParameters<typeof Relation2TiersAction.UpdateSubResourceFail>): Relation2TiersAction.UpdateSubResourceFail {
+ static updateSubResourceFail(crudTwoTiersNameSpace: Relation2TiersNamespace, ...args: ConstructorParameters<typeof Relation2TiersAction.UpdateSubResourceFail>): Relation2TiersAction.UpdateSubResourceFail {
return new crudTwoTiersNameSpace.UpdateSubResourceFail(...args);
}
}
diff --git a/src/app/core/helpers/resource-action.helper.ts b/src/app/core/helpers/resource-action.helper.ts
index ddcffeff51a122749c675b9a5f7f9e647e285f4d..779f4351db4241f7b8e338117896cdd0917cd2df 100644
--- a/src/app/core/helpers/resource-action.helper.ts
+++ b/src/app/core/helpers/resource-action.helper.ts
@@ -1,80 +1,80 @@
import {ResourceAction} from "@app/core/stores/resource/resource.action";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../stores/resource/resource.namespace";
export class ResourceActionHelper {
- static loadResource(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.LoadResource>): ResourceAction.LoadResource {
+ static loadResource(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.LoadResource>): ResourceAction.LoadResource {
return new crudNameSpace.LoadResource(...args);
}
- static loadResourceSuccess(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.LoadResourceSuccess>): ResourceAction.LoadResourceSuccess {
+ static loadResourceSuccess(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.LoadResourceSuccess>): ResourceAction.LoadResourceSuccess {
return new crudNameSpace.LoadResourceSuccess(...args);
}
- static loadResourceFail(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.LoadResourceFail>): ResourceAction.LoadResourceFail {
+ static loadResourceFail(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.LoadResourceFail>): ResourceAction.LoadResourceFail {
return new crudNameSpace.LoadResourceFail(...args);
}
- static changeQueryParameters(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.ChangeQueryParameters>): ResourceAction.ChangeQueryParameters {
+ static changeQueryParameters(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.ChangeQueryParameters>): ResourceAction.ChangeQueryParameters {
return new crudNameSpace.ChangeQueryParameters(...args);
}
- static getAll(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.GetAll>): ResourceAction.GetAll {
+ static getAll(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.GetAll>): ResourceAction.GetAll {
return new crudNameSpace.GetAll(...args);
}
- static getAllSuccess<T>(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.GetAllSuccess>): ResourceAction.GetAllSuccess<T> {
+ static getAllSuccess<T>(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.GetAllSuccess>): ResourceAction.GetAllSuccess<T> {
return new crudNameSpace.GetAllSuccess(...args);
}
- static getAllFail(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.GetAllFail>): ResourceAction.GetAllFail {
+ static getAllFail(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.GetAllFail>): ResourceAction.GetAllFail {
return new crudNameSpace.GetAllFail(...args);
}
- static getById(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.GetById>): ResourceAction.GetById {
+ static getById(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.GetById>): ResourceAction.GetById {
return new crudNameSpace.GetById(...args);
}
- static getByIdSuccess<T>(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.GetByIdSuccess>): ResourceAction.GetByIdSuccess<T> {
+ static getByIdSuccess<T>(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.GetByIdSuccess>): ResourceAction.GetByIdSuccess<T> {
return new crudNameSpace.GetByIdSuccess(...args);
}
- static getByIdFail(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.GetByIdFail>): ResourceAction.GetByIdFail {
+ static getByIdFail(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.GetByIdFail>): ResourceAction.GetByIdFail {
return new crudNameSpace.GetByIdFail(...args);
}
- static create<T>(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.Create>): ResourceAction.Create<T> {
+ static create<T>(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.Create>): ResourceAction.Create<T> {
return new crudNameSpace.Create(...args);
}
- static createSuccess(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.CreateSuccess>): ResourceAction.CreateSuccess {
+ static createSuccess(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.CreateSuccess>): ResourceAction.CreateSuccess {
return new crudNameSpace.CreateSuccess(...args);
}
- static createFail(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.CreateFail>): ResourceAction.CreateFail {
+ static createFail(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.CreateFail>): ResourceAction.CreateFail {
return new crudNameSpace.CreateFail(...args);
}
- static update<T>(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.Update>): ResourceAction.Update<T> {
+ static update<T>(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.Update>): ResourceAction.Update<T> {
return new crudNameSpace.Update(...args);
}
- static updateSuccess(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.UpdateSuccess>): ResourceAction.UpdateSuccess {
+ static updateSuccess(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.UpdateSuccess>): ResourceAction.UpdateSuccess {
return new crudNameSpace.UpdateSuccess(...args);
}
- static updateFail(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.UpdateFail>): ResourceAction.UpdateFail {
+ static updateFail(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.UpdateFail>): ResourceAction.UpdateFail {
return new crudNameSpace.UpdateFail(...args);
}
- static delete(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.Delete>): ResourceAction.Delete {
+ static delete(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.Delete>): ResourceAction.Delete {
return new crudNameSpace.Delete(...args);
}
- static deleteSuccess(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.DeleteSuccess>): ResourceAction.DeleteSuccess {
+ static deleteSuccess(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.DeleteSuccess>): ResourceAction.DeleteSuccess {
return new crudNameSpace.DeleteSuccess(...args);
}
- static deleteFail(crudNameSpace: ResourceNamespaceModel, ...args: ConstructorParameters<typeof ResourceAction.DeleteFail>): ResourceAction.DeleteFail {
+ static deleteFail(crudNameSpace: ResourceNamespace, ...args: ConstructorParameters<typeof ResourceAction.DeleteFail>): ResourceAction.DeleteFail {
return new crudNameSpace.DeleteFail(...args);
}
}
diff --git a/src/app/core/stores/relation-2-tiers/relation-2-tiers.action.ts b/src/app/core/stores/relation-2-tiers/relation-2-tiers.action.ts
index 6b2287fe53401e9b2bf8670a49cd5f2e022cf882..da3312406830b342e4052b4041b043b54eab7305 100644
--- a/src/app/core/stores/relation-2-tiers/relation-2-tiers.action.ts
+++ b/src/app/core/stores/relation-2-tiers/relation-2-tiers.action.ts
@@ -1,4 +1,4 @@
-import {Relation2TiersNamespaceModel} from "@app/core/stores/relation-2-tiers/relation-2-tiers-namespace.model";
+import {Relation2TiersNamespace} from "@app/core/stores/relation-2-tiers/relation2-tiers.namespace";
import {CollectionTypedModel} from "@app/shared/models/collection-typed.model";
import {QueryParametersModel} from "@app/shared/models/query-parameters.model";
@@ -80,4 +80,4 @@ export namespace Relation2TiersAction {
}
}
-export const relation2TiersActionNameSpace: Relation2TiersNamespaceModel = Relation2TiersAction;
+export const relation2TiersActionNameSpace: Relation2TiersNamespace = Relation2TiersAction;
diff --git a/src/app/core/stores/relation-2-tiers/relation-2-tiers.state.ts b/src/app/core/stores/relation-2-tiers/relation-2-tiers.state.ts
index c585d91fd06ff903cbc1218e707a9fd93d3f7e8d..9d4719ffdd30f57c22eef9fb154d6316d698f090 100644
--- a/src/app/core/stores/relation-2-tiers/relation-2-tiers.state.ts
+++ b/src/app/core/stores/relation-2-tiers/relation-2-tiers.state.ts
@@ -1,7 +1,7 @@
import {ApiService} from "@app/core/http/api.service";
import {NotificationService} from "@app/core/services/notification.service";
import {Relation2TiersAction} from "@app/core/stores/relation-2-tiers/relation-2-tiers.action";
-import {Relation2TiersNamespaceModel} from "@app/core/stores/relation-2-tiers/relation-2-tiers-namespace.model";
+import {Relation2TiersNamespace} from "@app/core/stores/relation-2-tiers/relation2-tiers.namespace";
import {Relation2TiersActionHelper} from "@app/core/helpers/relation-2-tiers-action.helper";
import {StoreUtil} from "@app/core/utils/stores/store.util";
import {BaseResourceState} from "@app/core/models/stores/base-resource.state";
@@ -32,49 +32,49 @@ export const defaultRelation2TiersStateInitValue: Relation2TiersStateModel<any>
export abstract class Relation2TiersState<T> {
protected readonly state: StateEnum;
- protected readonly crudTwoTiersNameSpace: Relation2TiersNamespaceModel;
+ protected readonly relation2TiersNameSpace: Relation2TiersNamespace;
protected readonly urlResource: ResourceApiEnum;
- private readonly subResource: ApiResourceNameEnum;
+ private readonly subResourceName: ApiResourceNameEnum;
protected constructor(protected apiService: ApiService,
protected store: Store,
protected notificationService: NotificationService) {
this.urlResource = this.defineUrlResource();
this.state = this.defineState();
- this.crudTwoTiersNameSpace = this.defineCrudNameSpace();
- this.subResource = this.defineSubResource();
- StoreUtil.initState(Relation2TiersState, this.constructor, this.crudTwoTiersNameSpace);
+ this.relation2TiersNameSpace = this.defineCrudNameSpace();
+ this.subResourceName = this.defineSubResource();
+ StoreUtil.initState(Relation2TiersState, this.constructor, this.relation2TiersNameSpace);
}
abstract defineUrlResource(): ResourceApiEnum;
abstract defineState(): StateEnum;
- abstract defineCrudNameSpace(): Relation2TiersNamespaceModel;
+ abstract defineCrudNameSpace(): Relation2TiersNamespace;
abstract defineSubResource(): ApiResourceNameEnum;
private evaluateSubResourceUrl(parentId: string): string {
- return this.urlResource + urlSeparator + parentId + urlSeparator + this.subResource;
+ return this.urlResource + urlSeparator + parentId + urlSeparator + this.subResourceName;
}
- @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespaceModel) => relation2TiersNameSpace.GetAllSubResource)
+ @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespace) => relation2TiersNameSpace.GetAllSubResource)
getAll<U>(ctx: StateContext<Relation2TiersStateModel<T>>, action: Relation2TiersAction.GetAllSubResource): Observable<CollectionTypedModel<U>> {
const queryParameters = StoreUtil.getQueryParametersToApply(action.queryParameters, ctx);
const url = this.evaluateSubResourceUrl(action.parentId);
return this.apiService.get<U>(url, queryParameters)
.pipe(
tap((collection: CollectionTypedModel<U>) => {
- ctx.dispatch(Relation2TiersActionHelper.getAllSubResourceSuccess<U>(this.crudTwoTiersNameSpace, collection));
+ ctx.dispatch(Relation2TiersActionHelper.getAllSubResourceSuccess<U>(this.relation2TiersNameSpace, collection));
}),
catchError(error => {
- ctx.dispatch(Relation2TiersActionHelper.getAllSubResourceFail(this.crudTwoTiersNameSpace));
+ ctx.dispatch(Relation2TiersActionHelper.getAllSubResourceFail(this.relation2TiersNameSpace));
throw error;
}),
);
}
- @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespaceModel) => relation2TiersNameSpace.GetAllSubResourceSuccess)
+ @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespace) => relation2TiersNameSpace.GetAllSubResourceSuccess)
getAllSuccess(ctx: StateContext<Relation2TiersStateModel<T>>, action: Relation2TiersAction.GetAllSubResourceSuccess<T>): void {
ctx.patchState({
selected: action.list._data,
@@ -82,14 +82,14 @@ export abstract class Relation2TiersState<T> {
});
}
- @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespaceModel) => relation2TiersNameSpace.GetAllSubResourceFail)
+ @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespace) => relation2TiersNameSpace.GetAllSubResourceFail)
getAllFail(ctx: StateContext<Relation2TiersStateModel<T>>, action: Relation2TiersAction.GetAllSubResourceFail): void {
ctx.patchState({
isLoading: false,
});
}
- @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespaceModel) => relation2TiersNameSpace.CreateSubResource)
+ @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespace) => relation2TiersNameSpace.CreateSubResource)
create(ctx: StateContext<Relation2TiersStateModel<T>>, action: Relation2TiersAction.CreateSubResource): Observable<string[]> {
if (action.listResId.length === 0) {
return;
@@ -98,16 +98,16 @@ export abstract class Relation2TiersState<T> {
return this.apiService.post<string[]>(url, action.listResId)
.pipe(
tap(() => {
- ctx.dispatch(Relation2TiersActionHelper.createSubResourceSuccess(this.crudTwoTiersNameSpace));
+ ctx.dispatch(Relation2TiersActionHelper.createSubResourceSuccess(this.relation2TiersNameSpace));
}),
catchError(error => {
- ctx.dispatch(Relation2TiersActionHelper.createSubResourceFail(this.crudTwoTiersNameSpace));
+ ctx.dispatch(Relation2TiersActionHelper.createSubResourceFail(this.relation2TiersNameSpace));
throw error;
}),
);
}
- @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespaceModel) => relation2TiersNameSpace.DeleteSubResource)
+ @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespace) => relation2TiersNameSpace.DeleteSubResource)
delete(ctx: StateContext<Relation2TiersStateModel<T>>, action: Relation2TiersAction.DeleteSubResource): Observable<string[]> {
if (action.listResId.length === 0) {
return;
@@ -116,43 +116,43 @@ export abstract class Relation2TiersState<T> {
return this.apiService.delete<string[]>(url, action.listResId)
.pipe(
tap(() => {
- ctx.dispatch(Relation2TiersActionHelper.deleteSubResourceSuccess(this.crudTwoTiersNameSpace));
+ ctx.dispatch(Relation2TiersActionHelper.deleteSubResourceSuccess(this.relation2TiersNameSpace));
}),
catchError(error => {
- ctx.dispatch(Relation2TiersActionHelper.deleteSubResourceFail(this.crudTwoTiersNameSpace));
+ ctx.dispatch(Relation2TiersActionHelper.deleteSubResourceFail(this.relation2TiersNameSpace));
throw error;
}),
);
}
- @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespaceModel) => relation2TiersNameSpace.UpdateSubResource)
+ @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespace) => relation2TiersNameSpace.UpdateSubResource)
update(ctx: StateContext<Relation2TiersStateModel<T>>, action: Relation2TiersAction.UpdateSubResource): void {
const subResourceUpdate: SubResourceUpdateModel = this.determineSubResourceChange(action.oldResId, action.newResId);
const createAndUpdateActions = this.computeUpdatesActionsToDispatch(subResourceUpdate, action.parentId);
ctx.dispatch(createAndUpdateActions);
}
- @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespaceModel) => relation2TiersNameSpace.UpdateSubResourceSuccess)
+ @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespace) => relation2TiersNameSpace.UpdateSubResourceSuccess)
updateSuccess(ctx: StateContext<Relation2TiersStateModel<T>>, action: Relation2TiersAction.UpdateSubResourceSuccess): void {
ctx.patchState({
isLoading: false,
});
- ctx.dispatch(Relation2TiersActionHelper.getAllSubResource(this.crudTwoTiersNameSpace, action.parentId));
+ ctx.dispatch(Relation2TiersActionHelper.getAllSubResource(this.relation2TiersNameSpace, action.parentId));
}
- @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespaceModel) => relation2TiersNameSpace.UpdateSubResourceFail)
+ @RegisterDefaultAction((relation2TiersNameSpace: Relation2TiersNamespace) => relation2TiersNameSpace.UpdateSubResourceFail)
updateFail(ctx: StateContext<Relation2TiersStateModel<T>>, action: Relation2TiersAction.UpdateSubResourceFail): void {
ctx.patchState({
isLoading: false,
});
- ctx.dispatch(Relation2TiersActionHelper.getAllSubResource(this.crudTwoTiersNameSpace, action.parentId));
+ ctx.dispatch(Relation2TiersActionHelper.getAllSubResource(this.relation2TiersNameSpace, action.parentId));
}
private computeUpdatesActionsToDispatch(subResourceUpdate: SubResourceUpdateModel, parentId: string): Relation2TiersAction.CreateSubResource[] | Relation2TiersAction.DeleteSubResource[] {
const actions = [];
- const deleteAction = Relation2TiersActionHelper.deleteSubResource(this.crudTwoTiersNameSpace, parentId, subResourceUpdate.resourceToRemoved);
+ const deleteAction = Relation2TiersActionHelper.deleteSubResource(this.relation2TiersNameSpace, parentId, subResourceUpdate.resourceToRemoved);
actions.push(deleteAction);
- const createAction = Relation2TiersActionHelper.createSubResource(this.crudTwoTiersNameSpace, parentId, subResourceUpdate.resourceToAdd);
+ const createAction = Relation2TiersActionHelper.createSubResource(this.relation2TiersNameSpace, parentId, subResourceUpdate.resourceToAdd);
actions.push(createAction);
return actions;
}
diff --git a/src/app/core/stores/relation-2-tiers/relation-2-tiers-namespace.model.ts b/src/app/core/stores/relation-2-tiers/relation2-tiers.namespace.ts
similarity index 90%
rename from src/app/core/stores/relation-2-tiers/relation-2-tiers-namespace.model.ts
rename to src/app/core/stores/relation-2-tiers/relation2-tiers.namespace.ts
index f95b8faa0cf9436526d593714299671aa5183071..ed62c5b30b6aa836bf360c6d7fb9bd798ae69703 100644
--- a/src/app/core/stores/relation-2-tiers/relation-2-tiers-namespace.model.ts
+++ b/src/app/core/stores/relation-2-tiers/relation2-tiers.namespace.ts
@@ -1,7 +1,7 @@
import {StoreActionClass} from "@app/core/models/stores/state-action.model";
import {BaseStoreNameSpace} from "@app/core/models/stores/base-store-namespace.model";
-export interface Relation2TiersNamespaceModel extends BaseStoreNameSpace {
+export interface Relation2TiersNamespace extends BaseStoreNameSpace {
GetAllSubResource: StoreActionClass;
GetAllSubResourceSuccess: StoreActionClass;
GetAllSubResourceFail: StoreActionClass;
diff --git a/src/app/core/stores/resource/resource.action.ts b/src/app/core/stores/resource/resource.action.ts
index 1dfa8fe9b94ed02597d7e0078d6dae43d9d6859d..c8b2aad0844fd66ac11daadecdcdef61b2bc6f67 100644
--- a/src/app/core/stores/resource/resource.action.ts
+++ b/src/app/core/stores/resource/resource.action.ts
@@ -1,4 +1,4 @@
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "./resource.namespace";
import {CollectionTypedModel} from "@app/shared/models/collection-typed.model";
import {QueryParametersModel} from "@app/shared/models/query-parameters.model";
@@ -104,4 +104,4 @@ export namespace ResourceAction {
}
}
-export const crudActionNameSpace: ResourceNamespaceModel = ResourceAction;
+export const crudActionNameSpace: ResourceNamespace = ResourceAction;
diff --git a/src/app/core/stores/resource/resource-namespace.model.ts b/src/app/core/stores/resource/resource.namespace.ts
similarity index 92%
rename from src/app/core/stores/resource/resource-namespace.model.ts
rename to src/app/core/stores/resource/resource.namespace.ts
index 1d1bd84aa6623592ccdccd5430aeda3694c4b77c..c08b072ac0f8267a8ed93bc0169c00466f96db61 100644
--- a/src/app/core/stores/resource/resource-namespace.model.ts
+++ b/src/app/core/stores/resource/resource.namespace.ts
@@ -1,7 +1,7 @@
import {StoreActionClass} from "@app/core/models/stores/state-action.model";
import {BaseStoreNameSpace} from "@app/core/models/stores/base-store-namespace.model";
-export interface ResourceNamespaceModel extends BaseStoreNameSpace {
+export interface ResourceNamespace extends BaseStoreNameSpace {
LoadResource: StoreActionClass;
LoadResourceSuccess: StoreActionClass;
LoadResourceFail: StoreActionClass;
diff --git a/src/app/core/stores/resource/resource.state.ts b/src/app/core/stores/resource/resource.state.ts
index b02ced7dc2f78e42718c9aef98a76762eb079d27..e6399261f69022eae6b9980a1f69d4b2baceebaf 100644
--- a/src/app/core/stores/resource/resource.state.ts
+++ b/src/app/core/stores/resource/resource.state.ts
@@ -1,23 +1,23 @@
+import {ResourceActionHelper} from "@app/core/helpers/resource-action.helper";
import {ApiService} from "@app/core/http/api.service";
-import {NotificationService} from "@app/core/services/notification.service";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
import {BaseResourceState} from "@app/core/models/stores/base-resource.state";
+import {NotificationService} from "@app/core/services/notification.service";
import {ResourceAction} from "@app/core/stores/resource/resource.action";
+import {StoreRouteUtil} from "@app/core/utils/stores/store-route.util";
+import {StoreUtil} from "@app/core/utils/stores/store.util";
+import {TRANSLATE} from "@app/core/utils/translate.util";
import {RegisterDefaultAction} from "@app/shared/decorators/store.decorator";
import {ResourceApiEnum} from "@app/shared/enums/api.enum";
import {ModelAttributeEnum} from "@app/shared/enums/model-attribute.enum";
import {StateEnum} from "@app/shared/enums/state.enum";
import {CollectionTypedModel} from "@app/shared/models/collection-typed.model";
import {QueryParametersModel} from "@app/shared/models/query-parameters.model";
-import {ResourceActionHelper} from "@app/core/helpers/resource-action.helper";
-import {StoreRouteUtil} from "@app/core/utils/stores/store-route.util";
-import {StoreUtil} from "@app/core/utils/stores/store.util";
-import {TRANSLATE} from "@app/core/utils/translate.util";
import {Navigate} from "@ngxs/router-plugin";
import {StateContext, Store} from "@ngxs/store";
import {Observable} from "rxjs";
import {catchError} from "rxjs/internal/operators/catchError";
import {tap} from "rxjs/operators";
+import {ResourceNamespace} from "./resource.namespace";
export interface ResourceStateModel<T> extends BaseResourceState {
list: T[];
@@ -34,7 +34,7 @@ export const defaultResourceStateInitValue: ResourceStateModel<any> = {
export abstract class ResourceState<T> {
protected readonly state: StateEnum;
- protected readonly resourceNameSpace: ResourceNamespaceModel;
+ protected readonly resourceNameSpace: ResourceNamespace;
protected readonly urlResource: ResourceApiEnum;
protected constructor(protected apiService: ApiService,
@@ -50,9 +50,9 @@ export abstract class ResourceState<T> {
abstract defineState(): StateEnum;
- abstract defineResourceNameSpace(): ResourceNamespaceModel;
+ abstract defineResourceNameSpace(): ResourceNamespace;
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.ChangeQueryParameters)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.ChangeQueryParameters)
changeQueryParameters(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.ChangeQueryParameters): void {
ctx.patchState({
queryParameters: action.queryParameters,
@@ -60,7 +60,7 @@ export abstract class ResourceState<T> {
ctx.dispatch(ResourceActionHelper.getAll(this.resourceNameSpace));
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.GetAll, {cancelUncompleted: true})
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.GetAll, {cancelUncompleted: true})
getAll(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.GetAll): Observable<CollectionTypedModel<T>> {
ctx.patchState({
@@ -81,7 +81,7 @@ export abstract class ResourceState<T> {
);
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.GetAllSuccess)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.GetAllSuccess)
getAllSuccess(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.GetAllSuccess<T>): void {
const queryParameters = StoreUtil.updateQueryParameters(ctx, action.list);
@@ -93,14 +93,14 @@ export abstract class ResourceState<T> {
});
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.GetAllFail)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.GetAllFail)
getAllFail(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.GetAllFail): void {
ctx.patchState({
isLoading: false,
});
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.GetById)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.GetById)
getById(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.GetById): Observable<T> {
ctx.patchState({
isLoading: true,
@@ -119,7 +119,7 @@ export abstract class ResourceState<T> {
);
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.GetByIdSuccess)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.GetByIdSuccess)
getByIdSuccess(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.GetByIdSuccess<T>): void {
ctx.patchState({
current: action.model,
@@ -127,14 +127,14 @@ export abstract class ResourceState<T> {
});
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.GetByIdFail)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.GetByIdFail)
getByIdFail(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.GetByIdFail): void {
ctx.patchState({
isLoading: false,
});
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.Create)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.Create)
create(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.Create<T>): Observable<T> {
ctx.patchState({
isLoading: true,
@@ -152,7 +152,7 @@ export abstract class ResourceState<T> {
);
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.CreateSuccess)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.CreateSuccess)
createSuccess(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.CreateSuccess): void {
ctx.patchState({
isLoading: false,
@@ -163,14 +163,14 @@ export abstract class ResourceState<T> {
this.notificationService.showSuccess(TRANSLATE("notification.crud.create"), true);
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.CreateFail)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.CreateFail)
createFail(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.CreateFail): void {
ctx.patchState({
isLoading: false,
});
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.Update)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.Update)
update(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.Update<T>): Observable<T> {
ctx.patchState({
isLoading: true,
@@ -188,7 +188,7 @@ export abstract class ResourceState<T> {
);
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.UpdateSuccess)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.UpdateSuccess)
updateSuccess(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.UpdateSuccess): void {
ctx.patchState({
isLoading: false,
@@ -199,14 +199,14 @@ export abstract class ResourceState<T> {
this.notificationService.showSuccess(TRANSLATE("notification.crud.update"), true);
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.UpdateFail)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.UpdateFail)
updateFail(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.UpdateFail): void {
ctx.patchState({
isLoading: false,
});
}
- @RegisterDefaultAction((crudNameSpace: ResourceNamespaceModel) => crudNameSpace.Delete)
+ @RegisterDefaultAction((crudNameSpace: ResourceNamespace) => crudNameSpace.Delete)
delete(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.Delete): Observable<T> {
ctx.patchState({
isLoading: true,
@@ -224,7 +224,7 @@ export abstract class ResourceState<T> {
);
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.DeleteSuccess)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.DeleteSuccess)
deleteSuccess(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.DeleteSuccess): void {
ctx.patchState({
isLoading: false,
@@ -235,7 +235,7 @@ export abstract class ResourceState<T> {
this.notificationService.showSuccess(TRANSLATE("notification.crud.delete"), true);
}
- @RegisterDefaultAction((resourceNameSpace: ResourceNamespaceModel) => resourceNameSpace.DeleteFail)
+ @RegisterDefaultAction((resourceNameSpace: ResourceNamespace) => resourceNameSpace.DeleteFail)
deleteFail(ctx: StateContext<ResourceStateModel<T>>, action: ResourceAction.DeleteFail): void {
ctx.patchState({
isLoading: false,
diff --git a/src/app/deposit/stores/deposit.action.ts b/src/app/deposit/stores/deposit.action.ts
index 350efd688f84565ea8a50636fb42ba6ddf8a4dde..5976a087429227aef057063a6ecc25717d07def1 100644
--- a/src/app/deposit/stores/deposit.action.ts
+++ b/src/app/deposit/stores/deposit.action.ts
@@ -1,7 +1,7 @@
import {DepositDataFileModel} from "@app/deposit/models/deposit-data-file.model";
import {DepositsModel} from "@app/generated-api";
import {ResourceAction} from "@app/core/stores/resource/resource.action";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../core/stores/resource/resource.namespace";
import {TypeDefaultAction} from "@app/shared/decorators/type-default-action.decorator";
import {StateEnum} from "@app/shared/enums/state.enum";
@@ -127,4 +127,4 @@ export namespace DepositAction {
}
}
-export const depositActionNameSpace: ResourceNamespaceModel = DepositAction;
+export const depositActionNameSpace: ResourceNamespace = DepositAction;
diff --git a/src/app/deposit/stores/deposit.state.ts b/src/app/deposit/stores/deposit.state.ts
index 41d9ccdaa41dcba5107a4d8a78be673fb147c2d4..f1386ab7973fca3a7207bbdebda4622abbd93118 100644
--- a/src/app/deposit/stores/deposit.state.ts
+++ b/src/app/deposit/stores/deposit.state.ts
@@ -7,7 +7,7 @@ import {DepositDataFileModel} from "@app/deposit/models/deposit-data-file.model"
import {UploadFileStatusModel} from "@app/deposit/models/upload-file-status.model";
import {DepositsModel} from "@app/generated-api";
import {Relation2TiersAction} from "@app/core/stores/relation-2-tiers/relation-2-tiers.action";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../core/stores/resource/resource.namespace";
import {ResourceState, ResourceStateModel, defaultResourceStateInitValue} from "@app/core/stores/resource/resource.state";
import {ApiActionEnum} from "@app/shared/enums/api-action.enum";
import {ApiResourceNameEnum} from "@app/shared/enums/api-resource-name.enum";
@@ -51,7 +51,7 @@ export class DepositState extends ResourceState<DepositsModel> {
return PreIngestResourceApiEnum.deposits;
}
- defineResourceNameSpace(): ResourceNamespaceModel {
+ defineResourceNameSpace(): ResourceNamespace {
return depositActionNameSpace;
}
diff --git a/src/app/shared/dialogs/abstract-delete/abstract-delete.dialog.ts b/src/app/shared/dialogs/abstract-delete/abstract-delete.dialog.ts
index d8e823d18d6be237bc51ca598e758f13afcd38e8..1b24dd9b24a1188410a9aaf9afa0f8cbc60b27e5 100644
--- a/src/app/shared/dialogs/abstract-delete/abstract-delete.dialog.ts
+++ b/src/app/shared/dialogs/abstract-delete/abstract-delete.dialog.ts
@@ -1,7 +1,7 @@
import {Inject, OnInit} from "@angular/core";
import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material";
import {AbstractComponent} from "@app/shared/components/abstract/abstract.component";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {ResourceStateModel} from "@app/core/stores/resource/resource.state";
import {StateEnum} from "@app/shared/enums/state.enum";
import {DeleteDialogModel} from "@app/shared/models/delete-dialog.model";
@@ -20,7 +20,7 @@ export abstract class AbstractDeleteDialog<T, U extends ResourceStateModel<T>> e
protected dialogRef: MatDialogRef<AbstractDeleteDialog<T, U>>,
@Inject(MAT_DIALOG_DATA) public data: DeleteDialogModel,
protected state: StateEnum,
- private crudActionNameSpace: ResourceNamespaceModel) {
+ private crudActionNameSpace: ResourceNamespace) {
super();
}
diff --git a/src/app/shared/stores/language/language.action.ts b/src/app/shared/stores/language/language.action.ts
index 5bcc02b53749aaca927a943bb537e05b9c62e972..bd1bdd2d670cb38cb9bda74b859d0ca8b94180de 100644
--- a/src/app/shared/stores/language/language.action.ts
+++ b/src/app/shared/stores/language/language.action.ts
@@ -1,4 +1,4 @@
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {ResourceAction} from "@app/core/stores/resource/resource.action";
import {DepositsModel} from "@app/generated-api";
import {TypeDefaultAction} from "@app/shared/decorators/type-default-action.decorator";
@@ -84,4 +84,4 @@ export namespace LanguageAction {
}
}
-export const languageActionNameSpace: ResourceNamespaceModel = LanguageAction;
+export const languageActionNameSpace: ResourceNamespace = LanguageAction;
diff --git a/src/app/shared/stores/language/language.state.ts b/src/app/shared/stores/language/language.state.ts
index 33ecc7a82619af37a45a351a1c4765b3e5786121..9f48b7748e99a54ffdcd154626dcf14ed66e88c5 100644
--- a/src/app/shared/stores/language/language.state.ts
+++ b/src/app/shared/stores/language/language.state.ts
@@ -1,5 +1,5 @@
import {LanguagesModel} from "@app/generated-api";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {ResourceState, ResourceStateModel, defaultResourceStateInitValue} from "@app/core/stores/resource/resource.state";
import {ApiResourceNameEnum} from "@app/shared/enums/api-resource-name.enum";
import {AdminResourceApiEnum, ResourceApiEnum} from "@app/shared/enums/api.enum";
@@ -30,7 +30,7 @@ export class LanguageState extends ResourceState<LanguagesModel> {
return StateEnum.language;
}
- defineResourceNameSpace(): ResourceNamespaceModel {
+ defineResourceNameSpace(): ResourceNamespace {
return languageActionNameSpace;
}
diff --git a/src/app/shared/stores/license/license.action.ts b/src/app/shared/stores/license/license.action.ts
index 75c9a11330e8036f6e0169c9adf5832dfbf7a8ed..34fe7c09c3e0a581605de4ab34db7ac5bbf5dd39 100644
--- a/src/app/shared/stores/license/license.action.ts
+++ b/src/app/shared/stores/license/license.action.ts
@@ -1,6 +1,6 @@
import {DepositsModel} from "@app/generated-api";
import {ResourceAction} from "@app/core/stores/resource/resource.action";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {TypeDefaultAction} from "@app/shared/decorators/type-default-action.decorator";
import {StateEnum} from "@app/shared/enums/state.enum";
@@ -85,4 +85,4 @@ export namespace LicenseAction {
}
-export const licenseActionNameSpace: ResourceNamespaceModel = LicenseAction;
+export const licenseActionNameSpace: ResourceNamespace = LicenseAction;
diff --git a/src/app/shared/stores/license/license.state.ts b/src/app/shared/stores/license/license.state.ts
index 445386670b4c693cfd2bda72ef7cc4afd874bb09..2ec3f3ef646ef5ff1e255d5cf6c1f1beb0c5a844 100644
--- a/src/app/shared/stores/license/license.state.ts
+++ b/src/app/shared/stores/license/license.state.ts
@@ -1,5 +1,5 @@
import {LicensesModel} from "@app/generated-api";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {ResourceState, ResourceStateModel, defaultResourceStateInitValue} from "@app/core/stores/resource/resource.state";
import {ApiResourceNameEnum} from "@app/shared/enums/api-resource-name.enum";
import {AdminResourceApiEnum, ResourceApiEnum} from "@app/shared/enums/api.enum";
@@ -31,7 +31,7 @@ export class LicenseState extends ResourceState<LicensesModel> {
return StateEnum.license;
}
- defineResourceNameSpace(): ResourceNamespaceModel {
+ defineResourceNameSpace(): ResourceNamespace {
return licenseActionNameSpace;
}
diff --git a/src/app/shared/stores/organizational-unit/organizational-unit.action.ts b/src/app/shared/stores/organizational-unit/organizational-unit.action.ts
index e714db0812e12f0cd722fda3b785d9c0aa85a481..7a67b4f6767ef1d787a5602da270597adbcb6347 100644
--- a/src/app/shared/stores/organizational-unit/organizational-unit.action.ts
+++ b/src/app/shared/stores/organizational-unit/organizational-unit.action.ts
@@ -1,6 +1,6 @@
import {DepositsModel} from "@app/generated-api";
import {ResourceAction} from "@app/core/stores/resource/resource.action";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {TypeDefaultAction} from "@app/shared/decorators/type-default-action.decorator";
import {StateEnum} from "@app/shared/enums/state.enum";
@@ -84,4 +84,4 @@ export namespace OrgUnitAction {
}
}
-export const orgUnitActionNameSpace: ResourceNamespaceModel = OrgUnitAction;
+export const orgUnitActionNameSpace: ResourceNamespace = OrgUnitAction;
diff --git a/src/app/shared/stores/organizational-unit/organizational-unit.state.ts b/src/app/shared/stores/organizational-unit/organizational-unit.state.ts
index 5bcfb9c0bf2cd102aee23339a262383caa7cec06..26f5f83819c3baa6b40a994019a296c7cf68f98d 100644
--- a/src/app/shared/stores/organizational-unit/organizational-unit.state.ts
+++ b/src/app/shared/stores/organizational-unit/organizational-unit.state.ts
@@ -4,7 +4,7 @@ import {ApiService} from "@app/core/http/api.service";
import {NotificationService} from "@app/core/services/notification.service";
import {DepositStateModel} from "@app/deposit/stores/deposit.state";
import {OrganizationalUnitsModel} from "@app/generated-api";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {ResourceState, ResourceStateModel, defaultResourceStateInitValue} from "@app/core/stores/resource/resource.state";
import {OverrideDefaultAction} from "@app/shared/decorators/store.decorator";
import {AccessResourceApiEnum, AdminResourceApiEnum, ResourceApiEnum} from "@app/shared/enums/api.enum";
@@ -55,7 +55,7 @@ export class OrganizationalUnitState extends ResourceState<OrganizationalUnitsMo
return AccessResourceApiEnum.organizationalUnits;
}
- defineResourceNameSpace(): ResourceNamespaceModel {
+ defineResourceNameSpace(): ResourceNamespace {
return orgUnitActionNameSpace;
}
diff --git a/src/app/shared/stores/organizational-unit/submission-policy/organizational-unit-submission-policy.action.ts b/src/app/shared/stores/organizational-unit/submission-policy/organizational-unit-submission-policy.action.ts
index 39fcc9777fcd604054651a88a8b9b1c240ef13ac..f1ecbb328b67012e24a0694ce2f2f1162b357cb9 100644
--- a/src/app/shared/stores/organizational-unit/submission-policy/organizational-unit-submission-policy.action.ts
+++ b/src/app/shared/stores/organizational-unit/submission-policy/organizational-unit-submission-policy.action.ts
@@ -1,4 +1,4 @@
-import {Relation2TiersNamespaceModel} from "@app/core/stores/relation-2-tiers/relation-2-tiers-namespace.model";
+import {Relation2TiersNamespace} from "@app/core/stores/relation-2-tiers/relation2-tiers.namespace";
import {SubmissionPoliciesModel} from "@app/generated-api";
import {Relation2TiersAction} from "@app/core/stores/relation-2-tiers/relation-2-tiers.action";
import {TypeDefaultAction} from "@app/shared/decorators/type-default-action.decorator";
@@ -57,4 +57,4 @@ export namespace OrgUnitSubmissionPolicyAction {
}
}
-export const orgUnitSubmissionPolicyActionNameSpace: Relation2TiersNamespaceModel = OrgUnitSubmissionPolicyAction;
+export const orgUnitSubmissionPolicyActionNameSpace: Relation2TiersNamespace = OrgUnitSubmissionPolicyAction;
diff --git a/src/app/shared/stores/organizational-unit/submission-policy/organizational-unit-submission-policy.state.ts b/src/app/shared/stores/organizational-unit/submission-policy/organizational-unit-submission-policy.state.ts
index c4927c0453a15bd8aa6a08ff1c2ec5c861bc80fe..4b029a18f3c2b5f39bfce599935cad5710ea2549 100644
--- a/src/app/shared/stores/organizational-unit/submission-policy/organizational-unit-submission-policy.state.ts
+++ b/src/app/shared/stores/organizational-unit/submission-policy/organizational-unit-submission-policy.state.ts
@@ -1,7 +1,7 @@
import {AppStateModel} from "@app/stores/app.state";
import {ApiService} from "@app/core/http/api.service";
import {NotificationService} from "@app/core/services/notification.service";
-import {Relation2TiersNamespaceModel} from "@app/core/stores/relation-2-tiers/relation-2-tiers-namespace.model";
+import {Relation2TiersNamespace} from "@app/core/stores/relation-2-tiers/relation2-tiers.namespace";
import {OrganizationalUnitsModel, SubmissionPoliciesModel} from "@app/generated-api";
import {Relation2TiersState, Relation2TiersStateModel, defaultRelation2TiersStateInitValue} from "@app/core/stores/relation-2-tiers/relation-2-tiers.state";
import {ApiResourceNameEnum} from "@app/shared/enums/api-resource-name.enum";
@@ -59,7 +59,7 @@ export class OrganizationalUnitSubmissionPolicyState extends Relation2TiersState
return StateEnum.organizationalUnit;
}
- defineCrudNameSpace(): Relation2TiersNamespaceModel {
+ defineCrudNameSpace(): Relation2TiersNamespace {
return orgUnitSubmissionPolicyActionNameSpace;
}
diff --git a/src/app/shared/stores/preservation-policy/preservation-policy.action.ts b/src/app/shared/stores/preservation-policy/preservation-policy.action.ts
index 351dc59f4418700087fbfc42f43467f74fc3c2f5..4b66b1222667b46220733714e8428f9eb767cbd0 100644
--- a/src/app/shared/stores/preservation-policy/preservation-policy.action.ts
+++ b/src/app/shared/stores/preservation-policy/preservation-policy.action.ts
@@ -1,5 +1,5 @@
import {ResourceAction} from "@app/core/stores/resource/resource.action";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {DepositsModel} from "@app/generated-api";
import {TypeDefaultAction} from "@app/shared/decorators/type-default-action.decorator";
import {StateEnum} from "@app/shared/enums/state.enum";
@@ -84,4 +84,4 @@ export namespace PreservationPolicyAction {
}
}
-export const preservationPolicyActionNameSpace: ResourceNamespaceModel = PreservationPolicyAction;
+export const preservationPolicyActionNameSpace: ResourceNamespace = PreservationPolicyAction;
diff --git a/src/app/shared/stores/preservation-policy/preservation-policy.state.ts b/src/app/shared/stores/preservation-policy/preservation-policy.state.ts
index b972d701725f7a97ef23b235995785554bb5cd04..e9076aeea864956fb3686ec79d74e0db32e2c925 100644
--- a/src/app/shared/stores/preservation-policy/preservation-policy.state.ts
+++ b/src/app/shared/stores/preservation-policy/preservation-policy.state.ts
@@ -1,6 +1,6 @@
import {ApiService} from "@app/core/http/api.service";
import {NotificationService} from "@app/core/services/notification.service";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {defaultResourceStateInitValue, ResourceState, ResourceStateModel} from "@app/core/stores/resource/resource.state";
import {PreservationPoliciesModel} from "@app/generated-api";
import {AdminResourceApiEnum, ResourceApiEnum} from "@app/shared/enums/api.enum";
@@ -28,7 +28,7 @@ export class PreservationPolicyState extends ResourceState<PreservationPoliciesM
return StateEnum.preservationPolicy;
}
- defineResourceNameSpace(): ResourceNamespaceModel {
+ defineResourceNameSpace(): ResourceNamespace {
return preservationPolicyActionNameSpace;
}
diff --git a/src/app/shared/stores/submission-policy/submission-policy.action.ts b/src/app/shared/stores/submission-policy/submission-policy.action.ts
index 75e548c4f2ade9108d3639ec3cb81d0914f8edbf..d303a130bf88ae443d129962cdb9d4aae71fd795 100644
--- a/src/app/shared/stores/submission-policy/submission-policy.action.ts
+++ b/src/app/shared/stores/submission-policy/submission-policy.action.ts
@@ -1,5 +1,5 @@
import {ResourceAction} from "@app/core/stores/resource/resource.action";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {DepositsModel} from "@app/generated-api";
import {TypeDefaultAction} from "@app/shared/decorators/type-default-action.decorator";
import {StateEnum} from "@app/shared/enums/state.enum";
@@ -84,4 +84,4 @@ export namespace SubmissionPolicyAction {
}
}
-export const submissionPolicyActionNameSpace: ResourceNamespaceModel = SubmissionPolicyAction;
+export const submissionPolicyActionNameSpace: ResourceNamespace = SubmissionPolicyAction;
diff --git a/src/app/shared/stores/submission-policy/submission-policy.state.ts b/src/app/shared/stores/submission-policy/submission-policy.state.ts
index cd3756ebdb7b557abdc58205aefb2d23e7dfdd8d..7cba3493f152e6acf9d909cc8ddfa83de4daaa82 100644
--- a/src/app/shared/stores/submission-policy/submission-policy.state.ts
+++ b/src/app/shared/stores/submission-policy/submission-policy.state.ts
@@ -1,4 +1,4 @@
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {SubmissionPoliciesModel} from "@app/generated-api";
import {ResourceState, ResourceStateModel, defaultResourceStateInitValue} from "@app/core/stores/resource/resource.state";
import {ApiResourceNameEnum} from "@app/shared/enums/api-resource-name.enum";
@@ -34,7 +34,7 @@ export class SubmissionPolicyState extends ResourceState<SubmissionPoliciesModel
return StateEnum.submissionPolicy;
}
- defineResourceNameSpace(): ResourceNamespaceModel {
+ defineResourceNameSpace(): ResourceNamespace {
return submissionPolicyActionNameSpace;
}
}
diff --git a/src/app/shared/views/abstract-create/abstract-create.view.ts b/src/app/shared/views/abstract-create/abstract-create.view.ts
index 135979377c99f1e23be1a125409a2e9c7e4abd94..be20764a7a74482500e9baef612cd2f6238f0671 100644
--- a/src/app/shared/views/abstract-create/abstract-create.view.ts
+++ b/src/app/shared/views/abstract-create/abstract-create.view.ts
@@ -1,6 +1,6 @@
import {OnInit} from "@angular/core";
import {ResourceActionHelper} from "@app/core/helpers/resource-action.helper";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {ResourceStateModel} from "@app/core/stores/resource/resource.state";
import {AbstractComponent} from "@app/shared/components/abstract/abstract.component";
import {StateEnum} from "@app/shared/enums/state.enum";
@@ -9,7 +9,7 @@ import {Store} from "@ngxs/store";
export abstract class AbstractCreateView<T, U extends ResourceStateModel<T>> extends AbstractComponent implements OnInit {
protected constructor(protected store: Store,
private state: StateEnum,
- private resourceActionNameSpace: ResourceNamespaceModel) {
+ private resourceActionNameSpace: ResourceNamespace) {
super();
}
diff --git a/src/app/shared/views/abstract-detail/abstract-detail.view.ts b/src/app/shared/views/abstract-detail/abstract-detail.view.ts
index d470fea9543e814c5540439e02629e51400899e2..6211b9d4af064881ad64652b7facbbde09c505e1 100644
--- a/src/app/shared/views/abstract-detail/abstract-detail.view.ts
+++ b/src/app/shared/views/abstract-detail/abstract-detail.view.ts
@@ -2,7 +2,7 @@ import {ComponentType} from "@angular/cdk/portal";
import {OnInit} from "@angular/core";
import {MatDialog} from "@angular/material";
import {ActivatedRoute} from "@angular/router";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {AbstractComponent} from "@app/shared/components/abstract/abstract.component";
import {ResourceStateModel} from "@app/core/stores/resource/resource.state";
import {AbstractDeleteDialog} from "@app/shared/dialogs/abstract-delete/abstract-delete.dialog";
@@ -32,7 +32,7 @@ export abstract class AbstractDetailView<T, U extends ResourceStateModel<T>> ext
protected route: ActivatedRoute,
public dialog: MatDialog,
private state: StateEnum,
- private resourceNameSpace: ResourceNamespaceModel) {
+ private resourceNameSpace: ResourceNamespace) {
super();
this.isLoading$ = this.store.select(s => (s[state] as U).isLoading);
this.current$ = this.store.select(s => (s[state] as U).current);
diff --git a/src/app/shared/views/abstract-edit/abstract-edit.view.ts b/src/app/shared/views/abstract-edit/abstract-edit.view.ts
index 9c1b374b9d4d1e3ff67604252798be6986f61be2..d2f36ff08cd80bcacd0d95c659fc88ace4a75671 100644
--- a/src/app/shared/views/abstract-edit/abstract-edit.view.ts
+++ b/src/app/shared/views/abstract-edit/abstract-edit.view.ts
@@ -1,7 +1,7 @@
import {OnInit} from "@angular/core";
import {ActivatedRoute} from "@angular/router";
import {ResourceActionHelper} from "@app/core/helpers/resource-action.helper";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {ResourceStateModel} from "@app/core/stores/resource/resource.state";
import {AbstractComponent} from "@app/shared/components/abstract/abstract.component";
import {StateEnum} from "@app/shared/enums/state.enum";
@@ -17,7 +17,7 @@ export abstract class AbstractEditView<T, U extends ResourceStateModel<T>> exten
protected constructor(protected store: Store,
protected route: ActivatedRoute,
private state: StateEnum,
- private resourceNameSpace: ResourceNamespaceModel) {
+ private resourceNameSpace: ResourceNamespace) {
super();
this.isLoading$ = this.store.select(s => (s[state] as U).isLoading);
this.current$ = this.store.select(s => (s[state] as U).current);
diff --git a/src/app/shared/views/abstract-list/abstract-list.view.ts b/src/app/shared/views/abstract-list/abstract-list.view.ts
index fbf5e0b4a55cf88bf40ee4dec8bd9fe108e5a38d..177729dfe760c27492eb51b864578c2a4646a329 100644
--- a/src/app/shared/views/abstract-list/abstract-list.view.ts
+++ b/src/app/shared/views/abstract-list/abstract-list.view.ts
@@ -1,5 +1,5 @@
import {OnInit} from "@angular/core";
-import {ResourceNamespaceModel} from "@app/core/stores/resource/resource-namespace.model";
+import {ResourceNamespace} from "../../../core/stores/resource/resource.namespace";
import {AbstractComponent} from "@app/shared/components/abstract/abstract.component";
import {ResourceStateModel} from "@app/core/stores/resource/resource.state";
import {ModelAttributeEnum} from "@app/shared/enums/model-attribute.enum";
@@ -23,7 +23,7 @@ export abstract class AbstractListView<T, U extends ResourceStateModel<T>> exten
abstract readonly KEY_CREATE_BUTTON: string;
abstract readonly KEY_REFRESH_BUTTON: string;
- protected constructor(protected store: Store, private state: StateEnum, private resourceNameSpace: ResourceNamespaceModel) {
+ protected constructor(protected store: Store, private state: StateEnum, private resourceNameSpace: ResourceNamespace) {
super();
this.isLoading$ = this.store.select(s => (s[state] as U).isLoading);
this.list$ = this.store.select(s => (s[state] as U).list);