Commit 848c1624 authored by Florent POITTEVIN's avatar Florent POITTEVIN
Browse files

fix: [DLCM-1901] remove override and overrideProperty to use new typescript override feature

parent f7e2c9c9
......@@ -11,10 +11,7 @@ import {
} from "@angular/core";
import {AbstractMainToolbarPresentational} from "@app/components/presentationals/main-toolbar/abstract-main-toolbar/abstract-main-toolbar.presentational";
import {AppUtil} from "@app/shared/utils/app.util";
import {
OAuth2Service,
Override,
} from "solidify-frontend";
import {OAuth2Service} from "solidify-frontend";
@Component({
selector: "dlcm-main-toolbar-mobile",
......@@ -38,20 +35,17 @@ export class MainToolbarMobilePresentational extends AbstractMainToolbarPresenta
super(oauth);
}
@Override()
navigate(path: string): void {
override navigate(path: string): void {
super.navigate(path);
this.toggleMenu();
}
@Override()
logout(): void {
override logout(): void {
super.logout();
this.toggleMenu();
}
@Override()
login(): void {
override login(): void {
super.login();
this.toggleMenu();
}
......
......@@ -22,7 +22,6 @@ import {
AbstractFormPresentational,
EnumUtil,
isNullOrUndefined,
Override,
PropertyName,
SolidifyValidator,
} from "solidify-frontend";
......@@ -87,8 +86,7 @@ export class UserFormPresentational extends AbstractFormPresentational<User> {
return this.form.controls.applicationRoles.value as FormArray;
}
@Override()
protected disableSpecificField(): void {
protected override disableSpecificField(): void {
this.form.get(this.formDefinition.homeOrganization).disable();
}
}
......
......@@ -40,8 +40,7 @@ export class AdminFundingAgenciesCreateRoutable extends AbstractCreateRoutable<F
@Select(AdminFundingAgenciesState.isReadyToBeDisplayedInCreateMode) isReadyToBeDisplayedInCreateModeObs: Observable<boolean>;
listOrgUnitsObs: Observable<OrganizationalUnit[]> = MemoizedUtil.list(this._store, SharedOrganizationalUnitState);
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedFundingAgencyActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedFundingAgencyActionNameSpace;
constructor(protected readonly _store: Store,
protected readonly _actions$: Actions,
......
......@@ -29,7 +29,6 @@ import {Observable} from "rxjs";
import {
AbstractDetailEditCommonRoutable,
MemoizedUtil,
OverrideProperty,
ResourceNameSpace,
} from "solidify-frontend";
......@@ -45,8 +44,7 @@ export class AdminFundingAgenciesDetailEditRoutable extends AbstractDetailEditCo
listOrgUnitsObs: Observable<OrganizationalUnit[]> = MemoizedUtil.list(this._store, SharedOrganizationalUnitState);
selectedOrgUnitsObs: Observable<OrganizationalUnit[]> = MemoizedUtil.selected(this._store, AdminFundingAgenciesOrganizationalUnitState);
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedFundingAgencyActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedFundingAgencyActionNameSpace;
readonly KEY_PARAM_NAME: keyof FundingAgency & string = "name";
......
......@@ -43,8 +43,7 @@ export class AdminIndexFieldAliasCreateRoutable extends AbstractCreateRoutable<I
listOrgUnitsObs: Observable<OrganizationalUnit[]> = MemoizedUtil.list(this._store, SharedOrganizationalUnitState);
languagesObs: Observable<Language[]> = MemoizedUtil.list(this._store, SharedLanguageState);
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedIndexFieldAliasActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedIndexFieldAliasActionNameSpace;
constructor(protected readonly _store: Store,
protected readonly _actions$: Actions,
......
......@@ -43,8 +43,7 @@ export class AdminIndexFieldAliasDetailEditRoutable extends AbstractDetailEditCo
languagesObs: Observable<Language[]> = MemoizedUtil.list(this._store, SharedLanguageState);
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedIndexFieldAliasActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedIndexFieldAliasActionNameSpace;
readonly KEY_PARAM_NAME: keyof IndexFieldAlias & string = "alias";
......
......@@ -37,8 +37,7 @@ export class AdminInstitutionCreateRoutable extends AbstractCreateRoutable<Insti
@Select(AdminInstitutionState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(AdminInstitutionState.isReadyToBeDisplayedInCreateMode) isReadyToBeDisplayedInCreateModeObs: Observable<boolean>;
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedInstitutionActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedInstitutionActionNameSpace;
@ViewChild("formPresentational")
readonly formPresentational: AbstractFormPresentational<Institution>;
......
......@@ -36,8 +36,7 @@ export class AdminInstitutionDetailEditRoutable extends AbstractDetailEditCommon
@Select(AdminInstitutionState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(AdminInstitutionState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>;
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedInstitutionActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedInstitutionActionNameSpace;
readonly KEY_PARAM_NAME: keyof Institution & string = "name";
......
......@@ -21,7 +21,6 @@ import {
} from "rxjs/operators";
import {
AbstractFormPresentational,
Override,
PropertyName,
SolidifyValidator,
} from "solidify-frontend";
......@@ -71,8 +70,7 @@ export class AdminLanguageFormPresentational extends AbstractFormPresentational<
});
}
@Override()
onSubmit(): void {
override onSubmit(): void {
const model = this.treatmentBeforeSubmit(this.form.value as Language);
this._submitBS.next({
model: model,
......
......@@ -95,8 +95,7 @@ export class AdminLanguageListRoutable extends AbstractListRoutable<Language, Ad
];
}
@Override()
create(element: ElementRef): void {
override create(element: ElementRef): void {
this.subscribe(DialogUtil.open(this._dialog, AdminLanguageCreateEditDialog, {
current: undefined,
}, {
......@@ -115,11 +114,9 @@ export class AdminLanguageListRoutable extends AbstractListRoutable<Language, Ad
}));
}
@Override()
goToEdit(model: Language): void {
override goToEdit(model: Language): void {
}
@Override()
showDetail(model: Language): void {
override showDetail(model: Language): void {
}
}
......@@ -36,8 +36,7 @@ export class AdminLicenseCreateRoutable extends AbstractCreateRoutable<License,
@Select(AdminLicenseState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(AdminLicenseState.isReadyToBeDisplayedInCreateMode) isReadyToBeDisplayedInCreateModeObs: Observable<boolean>;
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedLicenseActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedLicenseActionNameSpace;
@ViewChild("formPresentational")
readonly formPresentational: AbstractFormPresentational<License>;
......
......@@ -36,8 +36,7 @@ export class AdminLicenseDetailEditRoutable extends AbstractDetailEditCommonRout
@Select(AdminLicenseState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(AdminLicenseState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>;
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedLicenseActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedLicenseActionNameSpace;
readonly KEY_PARAM_NAME: keyof License & string = "title";
......
......@@ -36,8 +36,7 @@ export class AdminMetadataTypeCreateRoutable extends AbstractCreateRoutable<Meta
@Select(AdminMetadataTypeState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(AdminMetadataTypeState.isReadyToBeDisplayedInCreateMode) isReadyToBeDisplayedInCreateModeObs: Observable<boolean>;
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedMetadataTypeActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedMetadataTypeActionNameSpace;
@ViewChild("formPresentational")
readonly formPresentational: AbstractFormPresentational<MetadataType>;
......
......@@ -46,8 +46,7 @@ export class AdminMetadataTypeDetailEditRoutable extends AbstractDetailEditCommo
@Select(AdminMetadataTypeState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(AdminMetadataTypeState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>;
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedMetadataTypeActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedMetadataTypeActionNameSpace;
readonly KEY_PARAM_NAME: keyof MetadataType & string = "name";
readonly files: string = "files";
......
......@@ -54,13 +54,10 @@ export class AdminNotificationDetailEditRoutable extends AbstractDetailEditCommo
queryParametersObs: Observable<QueryParameters> = MemoizedUtil.select(this._store, AdminNotificationStatusHistoryState, state => state.queryParameters);
listRoleObs: Observable<Role[]> = MemoizedUtil.list(this._store, SharedRoleState);
@OverrideProperty()
readonly editAvailable: boolean = false;
@OverrideProperty()
readonly deleteAvailable: boolean = false;
override readonly editAvailable: boolean = false;
override readonly deleteAvailable: boolean = false;
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedNotificationActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedNotificationActionNameSpace;
readonly KEY_PARAM_NAME: keyof NotificationDlcm & string = "notificationType";
......
......@@ -36,8 +36,7 @@ export class AdminOaiSetCreateRoutable extends AbstractCreateRoutable<OaiSet, Ad
@Select(AdminOaiSetState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(AdminOaiSetState.isReadyToBeDisplayedInCreateMode) isReadyToBeDisplayedInCreateModeObs: Observable<boolean>;
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedOaiSetActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedOaiSetActionNameSpace;
@ViewChild("formPresentational")
readonly formPresentational: AbstractFormPresentational<OaiSet>;
......
......@@ -36,8 +36,7 @@ export class AdminOaiSetDetailEditRoutable extends AbstractDetailEditCommonRouta
@Select(AdminOaiSetState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(AdminOaiSetState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>;
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedOaiSetActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedOaiSetActionNameSpace;
readonly KEY_PARAM_NAME: keyof OaiSet & string = "name";
......
......@@ -37,8 +37,7 @@ export class AdminOauth2ClientCreateRoutable extends AbstractCreateRoutable<Oaut
@Select(AdminOAuth2ClientState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(AdminOAuth2ClientState.isReadyToBeDisplayedInCreateMode) isReadyToBeDisplayedInCreateModeObs: Observable<boolean>;
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedOauth2ClientActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedOauth2ClientActionNameSpace;
@ViewChild("formPresentational")
readonly formPresentational: AbstractFormPresentational<Oauth2Client>;
......
......@@ -36,8 +36,7 @@ export class AdminOauth2ClientDetailEditRoutable extends AbstractDetailEditCommo
@Select(AdminOAuth2ClientState.isLoadingWithDependency) isLoadingWithDependencyObs: Observable<boolean>;
@Select(AdminOAuth2ClientState.isReadyToBeDisplayed) isReadyToBeDisplayedObs: Observable<boolean>;
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedOauth2ClientActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedOauth2ClientActionNameSpace;
readonly KEY_PARAM_NAME: keyof Oauth2Client & string = "name";
......
......@@ -67,8 +67,7 @@ export class AdminOrganizationalUnitCreateRoutable extends AbstractCreateRoutabl
systemPropertyObs: Observable<SystemProperty> = MemoizedUtil.select(this._store, AppSystemPropertyState, state => state.current);
currentLanguageObs: Observable<Enums.Language.LanguageEnum> = MemoizedUtil.select(this._store, AppState, state => state.appLanguage);
@OverrideProperty()
checkAvailableResourceNameSpace: ResourceNameSpace = sharedOrganizationalUnitActionNameSpace;
override checkAvailableResourceNameSpace: ResourceNameSpace = sharedOrganizationalUnitActionNameSpace;
selectedPersonRole: PersonRole[] = [
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment