saherelm/xTestFrameworkClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor SDK Api Changes Side affects ...

Browse Source
This commit is contained in:
saherelm
2026-04-17 17:50:35 +03:30
parent a986295e19
commit ed8690f2be
39 changed files with 593 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/account/account.module.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { AdminGuard } from 'x-mabsut-api-sdk';
import { LoginPage } from './login/login.page';
import { RouterModule } from '@angular/router';
import { AdminGuard } from 'x-saherelm-api-sdk';
import { LogoutPage } from './logout/logout.page';
import { ProfilePage } from './profile/profile.page';
import { XCanDeactivateGuard } from 'x-framework-core';
src/app/pages/files/files-base/files-base.provider.page.ts
+66 -63
View File
@@ -4,24 +4,24 @@ import {
TemplateRef,
ChangeDetectionStrategy,
} from '@angular/core';
import {
XFileDto,
XPersonDto,
XReferenceDto,
defaultFileDto,
fileEntityToDto,
} from 'x-mabsut-api-sdk';
import {
XRef,
nameof,
XFileType,
isFunction,
getFieldNames,
isNullOrUndefined,
isNullOrEmptyString,
XResourceIdentifier,
getComponentSelector,
XFileType,
} from 'x-framework-core';
import {
XFileDto,
XPersonDto,
XReferenceDto,
defaultFileDto,
fileEntityToDto,
} from 'x-saherelm-api-sdk';
import {
XListItem,
XSlotName,
@@ -87,7 +87,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
toolbarShowSubTitle = true;
titleRes = this.ResourceIDs.app_name;
toolbarSubTitle = this.resourceProvider(
this.AppResourceIDs.files_management_page_title
this.AppResourceIDs.files_management_page_title,
);
toolbarTitle = this.resourceProvider(this.titleRes);
@@ -184,7 +184,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
this.applyTakeUntilWrapper(
this.managerService.settingsService.isMobile$
this.managerService.settingsService.isMobile$,
).subscribe((res) => {
//
if (!isNullOrUndefined(this.activeTab)) {
@@ -288,7 +288,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
type: this.ModelFieldTypes.Number,
valueProvider: (value) => {
return this.applyLocale(
this.resourceProvider(getFileTypeResourceID(value))
this.resourceProvider(getFileTypeResourceID(value)),
);
},
} as VModelFieldDescriptor<XFileType>,
@@ -467,7 +467,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
? this.LIST_OWNER_REF
: fd.template,
};
}
},
);
}
@@ -478,7 +478,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
* @returns
*/
async handleGetQueryResult(
query: XQueryDto
query: XQueryDto,
): Promise<XQueryResultDto<XFileDto>> {
//
let result: XQueryResultDto<XFileDto> = undefined;
@@ -494,7 +494,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
// Retrieve File Dto Result ...
this.dtoQueryResult = await this.getValueAsync(
this.queryModelTask(query)
this.queryModelTask(query),
);
//
@@ -603,7 +603,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
* @returns
*/
async validateAndPrepareListItems(
items: Array<XListItem<XFileDto>>
items: Array<XListItem<XFileDto>>,
): Promise<Array<XListItem<XFileDto>>> {
//
let result: Array<XListItem<XFileDto>> = [];
@@ -631,7 +631,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
*/
async requestFillingItems(
exists: Array<XFileDto>,
recieved: Array<XFileDto>
recieved: Array<XFileDto>,
): Promise<VQueryFilledItemsProcessingResult<XFileDto>> {
//
let result: VQueryFilledItemsProcessingResult<XFileDto> =
@@ -688,7 +688,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
ids.forEach((id) => {
//
const iSelector = `${selector}[${nameof<XFileDto>(
'id'
'id',
)}="${id}"][${nameof<VFileComponent>('presentType')}="${
VBaseDtoPresentType.AsView
}"]`;
@@ -744,7 +744,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
type: this.ModelFieldTypes.Number,
valueProvider: (value) => {
return this.applyLocale(
this.resourceProvider(getFileTypeResourceID(value))
this.resourceProvider(getFileTypeResourceID(value)),
);
},
} as VModelFieldDescriptor<XFileType>,
@@ -890,7 +890,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
// Since Cancel only Fired when Lock Breaked, here we do not need to handle it ...
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
this.prevTab || VQueryPresenterTabs.List
this.prevTab || VQueryPresenterTabs.List,
);
}
//
@@ -929,16 +929,16 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
// Retrieve Connection ID ...
const connectionId =
this.sharedService.mabsutAPIService.files.fileEntityPushService
this.sharedService.saherElmAPIService.files.fileEntityPushService
.connectionId;
//
// Issue Task ...
response = await this.getValueAsync(
this.sharedService.mabsutAPIService.files.fileProviderService.upload(
this.sharedService.saherElmAPIService.files.fileProviderService.upload(
[...this.filesForUpload], // Model ...
connectionId // Connection Id ...
)
connectionId, // Connection Id ...
),
);
} catch (ex) {
//
@@ -999,7 +999,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
type: this.ModelFieldTypes.Number,
valueProvider: (value) => {
return this.applyLocale(
this.resourceProvider(getFileTypeResourceID(value))
this.resourceProvider(getFileTypeResourceID(value)),
);
},
} as VModelFieldDescriptor<XFileType>,
@@ -1115,7 +1115,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
* @returns
*/
detailsFilesActionsProvider: (
f: XFileDto | File
f: XFileDto | File,
) => Array<XSimpleListItemSlideOption> = (f) => {
return [];
};
@@ -1133,7 +1133,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
// Since Cancel only Fired when Lock Breaked, here we do not need to handle it ...
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
this.prevTab || VQueryPresenterTabs.List
this.prevTab || VQueryPresenterTabs.List,
);
}
//
@@ -1191,7 +1191,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
// Retrieve Connection ID ...
const connectionId =
this.sharedService.mabsutAPIService.files.fileEntityPushService
this.sharedService.saherElmAPIService.files.fileEntityPushService
.connectionId;
//
@@ -1201,7 +1201,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
// Issue Task ...
// response = await this.getValueAsync(
// this.sharedService.mabsutAPIService.files.fileProviderService.update(
// this.sharedService.saherElmAPIService.files.fileProviderService.update(
// dtoModel.id,
// dtoModel,
// connectionId
@@ -1301,7 +1301,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
type: this.ModelFieldTypes.Number,
valueProvider: (value) => {
return this.applyLocale(
this.resourceProvider(getFileTypeResourceID(value))
this.resourceProvider(getFileTypeResourceID(value)),
);
},
} as VModelFieldDescriptor<XFileType>,
@@ -1411,7 +1411,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
* @param error
*/
async handleCustomError(
error?: VQueryPresenterActionIdentifier
error?: VQueryPresenterActionIdentifier,
): Promise<void> {
//
await this.setLoadingState(false);
@@ -1597,7 +1597,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
(!isNullOrUndefined(actions.childs) &&
this.hasChild(actions.childs) &&
actions.childs.findIndex(
(a) => a.id === defaultRemoveFabButton.id
(a) => a.id === defaultRemoveFabButton.id,
)) >= 0
) {
//
@@ -1716,7 +1716,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
VQueryPresenterTabs.Details
VQueryPresenterTabs.Details,
);
}
@@ -1747,7 +1747,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
VQueryPresenterTabs.Update
VQueryPresenterTabs.Update,
);
}
}
@@ -1802,7 +1802,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
this.activeTab = VQueryPresenterTabs.Details;
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
this.activeTab
this.activeTab,
);
} else {
this.hasParams = false;
@@ -1824,15 +1824,15 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
try {
//
const connectionId =
this.sharedService.mabsutAPIService.files.fileEntityPushService
this.sharedService.saherElmAPIService.files.fileEntityPushService
.connectionId;
//
await this.getValueAsync(
this.sharedService.mabsutAPIService.files.fileProviderService.remove(
this.sharedService.saherElmAPIService.files.fileProviderService.remove(
model.id,
connectionId
)
connectionId,
),
);
} catch {
//
@@ -1861,7 +1861,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
this.prevTab = undefined;
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
VQueryPresenterTabs.List
VQueryPresenterTabs.List,
);
}
});
@@ -1882,7 +1882,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
!this.toolbarShowBack ||
!isFunction(this.toolbarBackHandler) ||
[VQueryPresenterTabs.Add, VQueryPresenterTabs.Update].includes(
this.activeTab
this.activeTab,
)
) {
return;
@@ -1937,8 +1937,8 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
(fd) =>
fd.key === this.ModelFieldNames.path &&
!!fd.hasCustomTemplate &&
!isNullOrUndefined(fd.template)
)
!isNullOrUndefined(fd.template),
),
);
if (!hasTemplate && !isNullOrUndefined(this.fileNameRef)) {
//
@@ -1954,7 +1954,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
? this.fileNameRef
: fd.template,
};
}
},
);
}
@@ -1965,8 +1965,8 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
(fd) =>
fd.key === this.ModelFieldNames.path &&
!!fd.hasCustomTemplate &&
!isNullOrUndefined(fd.template)
)
!isNullOrUndefined(fd.template),
),
);
if (!hasTemplate && !isNullOrUndefined(this.fileNameRef)) {
//
@@ -1982,7 +1982,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
? this.fileNameRef
: fd.template,
};
}
},
);
}
@@ -1993,8 +1993,8 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
(fd) =>
fd.key === this.ModelFieldNames.path &&
!!fd.hasCustomTemplate &&
!isNullOrUndefined(fd.template)
)
!isNullOrUndefined(fd.template),
),
);
if (!hasTemplate && !isNullOrUndefined(this.fileNameRef)) {
//
@@ -2020,8 +2020,8 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
(fd) =>
fd.key === this.ModelFieldNames.path &&
!!fd.hasCustomTemplate &&
!isNullOrUndefined(fd.template)
)
!isNullOrUndefined(fd.template),
),
);
if (!hasTemplate && !isNullOrUndefined(this.fileNameRef)) {
//
@@ -2049,13 +2049,13 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
// Check Connected Before ...
if (
this.sharedService.mabsutAPIService.files.fileEntityPushService.isConnected()
this.sharedService.saherElmAPIService.files.fileEntityPushService.isConnected()
) {
this.isPushServiceConnected = true;
} else {
//
this.isPushServiceConnected = true;
await this.sharedService.mabsutAPIService.files.fileEntityPushService.connect();
await this.sharedService.saherElmAPIService.files.fileEntityPushService.connect();
}
} catch {
//
@@ -2072,7 +2072,8 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
// On Added ...
this.applyTakeUntilWrapper(
this.sharedService.mabsutAPIService.files.fileEntityPushService.onAdded$
this.sharedService.saherElmAPIService.files.fileEntityPushService
.onAdded$,
).subscribe(async (event) => {
//
if (isNullOrUndefined(event)) {
@@ -2083,7 +2084,8 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
// On Removed ...
this.applyTakeUntilWrapper(
this.sharedService.mabsutAPIService.files.fileEntityPushService.onDeleted$
this.sharedService.saherElmAPIService.files.fileEntityPushService
.onDeleted$,
).subscribe(async (event) => {
//
if (isNullOrUndefined(event) && isNullOrUndefined(this.dtoQueryResult)) {
@@ -2093,7 +2095,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
// Check if Model Exists in Current Context or not ...
let model = this.dtoQueryResult.items.find(
(i) => i.id === event.model.id
(i) => i.id === event.model.id,
);
const modelP = fileEntityToDto(event.model, model.owner);
if (!isNullOrUndefined(model) && !isNullOrUndefined(modelP)) {
@@ -2127,7 +2129,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
VQueryPresenterTabs.List
VQueryPresenterTabs.List,
);
}
});
@@ -2135,7 +2137,8 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
// On Updated ...
this.applyTakeUntilWrapper(
this.sharedService.mabsutAPIService.files.fileEntityPushService.onUpdated$
this.sharedService.saherElmAPIService.files.fileEntityPushService
.onUpdated$,
).subscribe(async (event) => {
//
if (isNullOrUndefined(event) || isNullOrUndefined(this.dtoQueryResult)) {
@@ -2145,7 +2148,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
//
// Check if Model Exists in Current Context or not ...
let model = this.dtoQueryResult.items.find(
(i) => i.id === event.model.id
(i) => i.id === event.model.id,
);
if (isNullOrUndefined(model)) {
return;
@@ -2155,9 +2158,9 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
let fromEntity: XFileDto = undefined;
try {
fromEntity = await this.getValueAsync(
this.sharedService.mabsutAPIService.files.fileProviderService.get(
event.model.id
)
this.sharedService.saherElmAPIService.files.fileProviderService.get(
event.model.id,
),
);
} catch {
return;
@@ -2204,7 +2207,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
const selector = getQuerySelectorOfSpecifiedAttribute(
VFileComponent,
this.ModelFieldNames.id,
this.updateModel.id
this.updateModel.id,
);
await this.waitForElement(selector).then(async (el) => {
//
@@ -2236,7 +2239,7 @@ export abstract class FilesBaseProviderPage extends VQueryPresenterBasePage {
const selector = getQuerySelectorOfSpecifiedAttribute(
VFileComponent,
this.ModelFieldNames.id,
this.detailsModel.id
this.detailsModel.id,
);
await this.waitForElement(selector).then(async (el) => {
//
src/app/pages/files/files-explorer/files-explorer.page.ts
+4 -4
View File
@@ -28,14 +28,14 @@ export class FilesExplorerPage extends FilesBaseProviderPage {
//#region Abstractions ...
getModelTask(identifier: string): Observable<any> {
//
return this.sharedService.mabsutAPIService.files.fileProviderService.get(
identifier
return this.sharedService.saherElmAPIService.files.fileProviderService.get(
identifier,
);
}
queryModelTask(query: XQueryDto): Observable<XQueryResultDto<any>> {
return this.sharedService.mabsutAPIService.files.fileProviderService.query(
query
return this.sharedService.saherElmAPIService.files.fileProviderService.query(
query,
);
}
//#endregion
src/app/pages/files/files-management/files-management.page.ts
+4 -4
View File
@@ -28,14 +28,14 @@ export class FilesManagementPage extends FilesBaseProviderPage {
//#region Abstractions ...
getModelTask(identifier: string): Observable<any> {
//
return this.sharedService.mabsutAPIService.files.fileProviderService.get(
identifier
return this.sharedService.saherElmAPIService.files.fileProviderService.get(
identifier,
);
}
queryModelTask(query: XQueryDto): Observable<XQueryResultDto<any>> {
return this.sharedService.mabsutAPIService.files.fileProviderService.query(
query
return this.sharedService.saherElmAPIService.files.fileProviderService.query(
query,
);
}
//#endregion
src/app/pages/tags/tags-base/tags-base.provider.page.ts
+13 -13
View File
@@ -56,9 +56,9 @@ import {
} from 'src/app/views/v-query-presenter/v-query-presenter.typings';
import { XQueryDto, XQueryResultDto } from 'x-framework-identity-sdk';
import { sendAction } from 'src/app/views/tools/action-provider.tools';
import { defaultTagDto, XReferenceDto, XTagDto } from 'x-mabsut-api-sdk';
import { VTagComponent } from 'src/app/views/tags/v-tag/v-tag.component';
import { VTagPresentType } from 'src/app/views/tags/v-tag/v-tag.typings';
import { defaultTagDto, XReferenceDto, XTagDto } from 'x-saherelm-api-sdk';
import { PersonPresentType } from 'src/app/views/v-person/v-person.typings';
import { VDtoCommonProperties } from 'src/app/views/typings/dto.common.typings';
import { VPagePresenter } from 'src/app/views/v-page-presenter/v-page-presenter.component';
@@ -696,13 +696,13 @@ export abstract class TagsBaseProviderPage extends VQueryPresenterBasePage {
//
// Retrieve Connection ID ...
const connectionId =
this.sharedService.mabsutAPIService.tags.tagEntityPushService
this.sharedService.saherElmAPIService.tags.tagEntityPushService
.connectionId;
//
// Issue Task ...
response = await this.getValueAsync(
this.sharedService.mabsutAPIService.tags.tagProviderService.add(
this.sharedService.saherElmAPIService.tags.tagProviderService.add(
dtoModel, // Model ...
connectionId // Connection Id ...
)
@@ -874,13 +874,13 @@ export abstract class TagsBaseProviderPage extends VQueryPresenterBasePage {
//
// Retrieve Connection ID ...
const connectionId =
this.sharedService.mabsutAPIService.tags.tagEntityPushService
this.sharedService.saherElmAPIService.tags.tagEntityPushService
.connectionId;
//
// Issue Task ...
response = await this.getValueAsync(
this.sharedService.mabsutAPIService.tags.tagProviderService.update(
this.sharedService.saherElmAPIService.tags.tagProviderService.update(
dtoModel.id,
dtoModel,
connectionId
@@ -1447,12 +1447,12 @@ export abstract class TagsBaseProviderPage extends VQueryPresenterBasePage {
try {
//
const connectionId =
this.sharedService.mabsutAPIService.tags.tagEntityPushService
this.sharedService.saherElmAPIService.tags.tagEntityPushService
.connectionId;
//
await this.getValueAsync(
this.sharedService.mabsutAPIService.tags.tagProviderService.remove(
this.sharedService.saherElmAPIService.tags.tagProviderService.remove(
model.id,
connectionId
)
@@ -1566,13 +1566,13 @@ export abstract class TagsBaseProviderPage extends VQueryPresenterBasePage {
//
// Check Connected Before ...
if (
this.sharedService.mabsutAPIService.tags.tagEntityPushService.isConnected()
this.sharedService.saherElmAPIService.tags.tagEntityPushService.isConnected()
) {
this.isPushServiceConnected = true;
} else {
//
this.isPushServiceConnected = true;
await this.sharedService.mabsutAPIService.tags.tagEntityPushService.connect();
await this.sharedService.saherElmAPIService.tags.tagEntityPushService.connect();
}
} catch {
//
@@ -1589,7 +1589,7 @@ export abstract class TagsBaseProviderPage extends VQueryPresenterBasePage {
//
// On Added ...
this.applyTakeUntilWrapper(
this.sharedService.mabsutAPIService.tags.tagEntityPushService.onAdded$
this.sharedService.saherElmAPIService.tags.tagEntityPushService.onAdded$
).subscribe(async (event) => {
//
if (isNullOrUndefined(event)) {
@@ -1600,7 +1600,7 @@ export abstract class TagsBaseProviderPage extends VQueryPresenterBasePage {
//
// On Removed ...
this.applyTakeUntilWrapper(
this.sharedService.mabsutAPIService.tags.tagEntityPushService.onDeleted$
this.sharedService.saherElmAPIService.tags.tagEntityPushService.onDeleted$
).subscribe(async (event) => {
//
if (isNullOrUndefined(event) && isNullOrUndefined(this.dtoQueryResult)) {
@@ -1652,7 +1652,7 @@ export abstract class TagsBaseProviderPage extends VQueryPresenterBasePage {
//
// On Updated ...
this.applyTakeUntilWrapper(
this.sharedService.mabsutAPIService.tags.tagEntityPushService.onUpdated$
this.sharedService.saherElmAPIService.tags.tagEntityPushService.onUpdated$
).subscribe(async (event) => {
//
if (isNullOrUndefined(event) || isNullOrUndefined(this.dtoQueryResult)) {
@@ -1673,7 +1673,7 @@ export abstract class TagsBaseProviderPage extends VQueryPresenterBasePage {
try {
//
modelP = await this.getValueAsync(
this.sharedService.mabsutAPIService.tags.tagProviderService.get(
this.sharedService.saherElmAPIService.tags.tagProviderService.get(
event.model.id
)
);
src/app/pages/tags/tags-explorer/tags-explorer.page.ts
+6 -5
View File
@@ -29,14 +29,15 @@ export class TagsExplorerPage extends TagsBaseProviderPage {
//#region Abstractions ...
getModelTask(identifier: string): Observable<any> {
//
return this.sharedService.mabsutAPIService.tags.tagProviderService
.get(toNumber(identifier));
return this.sharedService.saherElmAPIService.tags.tagProviderService.get(
toNumber(identifier),
);
}
queryModelTask(query: XQueryDto): Observable<XQueryResultDto<any>> {
return this.sharedService.mabsutAPIService.tags.tagProviderService.query(
query
return this.sharedService.saherElmAPIService.tags.tagProviderService.query(
query,
);
}
//#endregion
}
}
src/app/pages/tags/tags-management/tags-management.page.ts
+4 -4
View File
@@ -29,14 +29,14 @@ export class TagsManagementPage extends TagsBaseProviderPage {
//#region Abstractions ...
getModelTask(identifier: string): Observable<any> {
//
return this.sharedService.mabsutAPIService.tags.tagProviderService.get(
toNumber(identifier)
return this.sharedService.saherElmAPIService.tags.tagProviderService.get(
toNumber(identifier),
);
}
queryModelTask(query: XQueryDto): Observable<XQueryResultDto<any>> {
return this.sharedService.mabsutAPIService.tags.tagProviderService.query(
query
return this.sharedService.saherElmAPIService.tags.tagProviderService.query(
query,
);
}
//#endregion
src/app/pages/webinars/webinars-base/webinars-base.provider.page.ts
+71 -71
View File
@@ -4,12 +4,6 @@ import {
TemplateRef,
ChangeDetectionStrategy,
} from '@angular/core';
import {
XFileDto,
XPersonDto,
XWebinarDto,
XWebinarType,
} from 'x-mabsut-api-sdk';
import {
XRef,
nameof,
@@ -20,6 +14,12 @@ import {
XResourceIdentifier,
getComponentSelector,
} from 'x-framework-core';
import {
XFileDto,
XPersonDto,
XWebinarDto,
XWebinarType,
} from 'x-saherelm-api-sdk';
import {
XListItem,
XSlotName,
@@ -110,7 +110,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
toolbarShowSubTitle = true;
titleRes = this.ResourceIDs.app_name;
toolbarSubTitle = this.resourceProvider(
this.AppResourceIDs.webinars_management_page_title
this.AppResourceIDs.webinars_management_page_title,
);
toolbarTitle = this.resourceProvider(this.titleRes);
@@ -121,11 +121,11 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
readonly TagsPresenterPresertTypes = Object.assign(
VTagsPresenterPresentType,
{}
{},
);
readonly FilesPresenterPresertTypes = Object.assign(
{},
VFilesPresenterPresentType
VFilesPresenterPresentType,
);
readonly ButtonTypes = Object.assign(XButtonType, {});
readonly ModelFieldTypes = Object.assign(VModelFieldTypes);
@@ -213,19 +213,19 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
this.applyTakeUntilWrapper(
this.managerService.settingsService.isMobile$
this.managerService.settingsService.isMobile$,
).subscribe((res) => {
//
if (!isNullOrUndefined(this.activeTab)) {
//
switch(this.activeTab) {
switch (this.activeTab) {
//
case VQueryPresenterTabs.List:
sendAction({
provider: this.listItemActionProvider,
action: VBaseDtoAction.Refresh
action: VBaseDtoAction.Refresh,
});
break;
break;
}
}
});
@@ -445,7 +445,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
? this.LIST_OWNER_REF
: fd.template,
};
}
},
);
}
@@ -456,7 +456,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
* @returns
*/
async handleGetQueryResult(
query: XQueryDto
query: XQueryDto,
): Promise<XQueryResultDto<VWebinarViewDto>> {
//
let result: XQueryResultDto<VWebinarViewDto> = undefined;
@@ -472,7 +472,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
// Retrieve Webinar Dto Result ...
this.dtoQueryResult = await this.getValueAsync(
this.queryModelTask(query)
this.queryModelTask(query),
);
//
@@ -490,7 +490,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
// Converts XWebinarDto to VWebinarViewDto ...
result.items = this.dtoQueryResult.items.map((i) =>
ToWebinarViewDto(i, this.managerService.currentLocale)
ToWebinarViewDto(i, this.managerService.currentLocale),
);
//
@@ -583,7 +583,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
* @returns
*/
async validateAndPrepareListItems(
items: Array<XListItem<VWebinarViewDto>>
items: Array<XListItem<VWebinarViewDto>>,
): Promise<Array<XListItem<VWebinarViewDto>>> {
//
let result: Array<XListItem<VWebinarViewDto>> = [];
@@ -611,7 +611,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
*/
async requestFillingItems(
exists: Array<VWebinarViewDto>,
recieved: Array<VWebinarViewDto>
recieved: Array<VWebinarViewDto>,
): Promise<VQueryFilledItemsProcessingResult<VWebinarViewDto>> {
//
let result: VQueryFilledItemsProcessingResult<VWebinarViewDto> =
@@ -668,7 +668,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
ids.forEach((id) => {
//
const iSelector = `${selector}[${nameof<VWebinarViewDto>(
'id'
'id',
)}="${id}"][${nameof<VWebinarViewComponent>('presentType')}="${
VBaseDtoPresentType.AsView
}"]`;
@@ -891,7 +891,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
// Since Cancel only Fired when Lock Breaked, here we do not need to handle it ...
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
this.prevTab || VQueryPresenterTabs.List
this.prevTab || VQueryPresenterTabs.List,
);
}
//
@@ -918,7 +918,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
async handleAddModel(
model: VWebinarViewDto,
tags?: Array<string>,
files?: Array<File>
files?: Array<File>,
) {
//
if (isNullOrUndefined(model)) {
@@ -956,7 +956,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
// Retrieve Connection ID ...
const connectionId =
this.sharedService.mabsutAPIService.webinars.webinarEntityPushService
this.sharedService.saherElmAPIService.webinars.webinarEntityPushService
.connectionId;
//
@@ -966,12 +966,12 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
// Issue Task ...
response = await this.getValueAsync(
this.sharedService.mabsutAPIService.webinars.webinarProviderService.create(
this.sharedService.saherElmAPIService.webinars.webinarProviderService.create(
dtoModel, // Model ...
pTags, // Tags ...
pFiles, // Files ...
connectionId // Connection Id ...
)
connectionId, // Connection Id ...
),
);
} catch (ex) {
//
@@ -1191,7 +1191,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
* @returns
*/
detailsFilesActionsProvider: (
f: XFileDto | File
f: XFileDto | File,
) => Array<XSimpleListItemSlideOption> = (f) => {
return [];
};
@@ -1209,7 +1209,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
// Since Cancel only Fired when Lock Breaked, here we do not need to handle it ...
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
this.prevTab || VQueryPresenterTabs.List
this.prevTab || VQueryPresenterTabs.List,
);
}
//
@@ -1267,7 +1267,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
// Retrieve Connection ID ...
const connectionId =
this.sharedService.mabsutAPIService.webinars.webinarEntityPushService
this.sharedService.saherElmAPIService.webinars.webinarEntityPushService
.connectionId;
//
@@ -1277,10 +1277,10 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
// Issue Task ...
response = await this.getValueAsync(
this.sharedService.mabsutAPIService.webinars.webinarProviderService.update(
this.sharedService.saherElmAPIService.webinars.webinarProviderService.update(
dtoModel,
connectionId
)
connectionId,
),
);
} catch (ex) {
//
@@ -1386,7 +1386,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
* @param error
*/
async handleCustomError(
error?: VQueryPresenterActionIdentifier
error?: VQueryPresenterActionIdentifier,
): Promise<void> {
//
await this.setLoadingState(false);
@@ -1609,7 +1609,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
(!isNullOrUndefined(actions.childs) &&
this.hasChild(actions.childs) &&
actions.childs.findIndex(
(a) => a.id === defaultEditFabButton.id
(a) => a.id === defaultEditFabButton.id,
)) >= 0
) {
//
@@ -1642,7 +1642,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
(!isNullOrUndefined(actions.childs) &&
this.hasChild(actions.childs) &&
actions.childs.findIndex(
(a) => a.id === defaultRemoveFabButton.id
(a) => a.id === defaultRemoveFabButton.id,
)) >= 0
) {
//
@@ -1675,7 +1675,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
(!isNullOrUndefined(actions.childs) &&
this.hasChild(actions.childs) &&
actions.childs.findIndex(
(a) => a.id === defaultCloseFabButton.id
(a) => a.id === defaultCloseFabButton.id,
)) >= 0
) {
//
@@ -1708,7 +1708,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
(!isNullOrUndefined(actions.childs) &&
this.hasChild(actions.childs) &&
actions.childs.findIndex(
(a) => a.id === defaultConnectFabButton.id
(a) => a.id === defaultConnectFabButton.id,
)) >= 0
) {
//
@@ -1881,7 +1881,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
VQueryPresenterTabs.Details
VQueryPresenterTabs.Details,
);
}
@@ -1912,7 +1912,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
VQueryPresenterTabs.Update
VQueryPresenterTabs.Update,
);
}
}
@@ -1967,7 +1967,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
this.activeTab = VQueryPresenterTabs.Details;
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
this.activeTab
this.activeTab,
);
} else {
this.hasParams = false;
@@ -2008,13 +2008,13 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
try {
//
const connectionId =
this.sharedService.mabsutAPIService.webinars.webinarEntityPushService
.connectionId;
this.sharedService.saherElmAPIService.webinars
.webinarEntityPushService.connectionId;
response = await this.getValueAsync(
this.sharedService.mabsutAPIService.webinars.webinarProviderService.update(
this.sharedService.saherElmAPIService.webinars.webinarProviderService.update(
dtoModel,
connectionId
)
connectionId,
),
);
} catch {
//
@@ -2032,7 +2032,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
const updateVDto = ToWebinarViewDto(
response,
this.managerService.currentLocale
this.managerService.currentLocale,
);
const actions = await this.prepareListActions(updateVDto);
this.sendQueryPresenterAction(VQueryPresenterAction.UpdateModel, {
@@ -2099,15 +2099,15 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
try {
//
const connectionId =
this.sharedService.mabsutAPIService.webinars.webinarEntityPushService
.connectionId;
this.sharedService.saherElmAPIService.webinars
.webinarEntityPushService.connectionId;
//
await this.getValueAsync(
this.sharedService.mabsutAPIService.webinars.webinarProviderService.remove(
this.sharedService.saherElmAPIService.webinars.webinarProviderService.remove(
model.id,
connectionId
)
connectionId,
),
);
} catch {
//
@@ -2136,7 +2136,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
this.prevTab = undefined;
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
VQueryPresenterTabs.List
VQueryPresenterTabs.List,
);
}
});
@@ -2157,7 +2157,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
!this.toolbarShowBack ||
!isFunction(this.toolbarBackHandler) ||
[VQueryPresenterTabs.Add, VQueryPresenterTabs.Update].includes(
this.activeTab
this.activeTab,
)
) {
return;
@@ -2209,7 +2209,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
private provideItemOptions(
userId: string,
isAdmin: boolean,
item: VWebinarViewDto
item: VWebinarViewDto,
) {
//
let result: Array<XSimpleListItemSlideOption> = [];
@@ -2283,13 +2283,13 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
// Check Connected Before ...
if (
this.sharedService.mabsutAPIService.webinars.webinarEntityPushService.isConnected()
this.sharedService.saherElmAPIService.webinars.webinarEntityPushService.isConnected()
) {
this.isPushServiceConnected = true;
} else {
//
this.isPushServiceConnected = true;
await this.sharedService.mabsutAPIService.webinars.webinarEntityPushService.connect();
await this.sharedService.saherElmAPIService.webinars.webinarEntityPushService.connect();
}
} catch {
//
@@ -2306,8 +2306,8 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
// On Added ...
this.applyTakeUntilWrapper(
this.sharedService.mabsutAPIService.webinars.webinarEntityPushService
.onAdded$
this.sharedService.saherElmAPIService.webinars.webinarEntityPushService
.onAdded$,
).subscribe(async (event) => {
//
if (isNullOrUndefined(event)) {
@@ -2346,8 +2346,8 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
// On Removed ...
this.applyTakeUntilWrapper(
this.sharedService.mabsutAPIService.webinars.webinarEntityPushService
.onDeleted$
this.sharedService.saherElmAPIService.webinars.webinarEntityPushService
.onDeleted$,
).subscribe(async (event) => {
//
if (isNullOrUndefined(event) && isNullOrUndefined(this.dtoQueryResult)) {
@@ -2357,7 +2357,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
// Check if Model Exists in Current Context or not ...
let model = this.dtoQueryResult.items.find(
(i) => i.id === event.model.id
(i) => i.id === event.model.id,
);
const modelP = ToWebinarViewDto(model, this.managerService.currentLocale);
if (!isNullOrUndefined(model) && !isNullOrUndefined(modelP)) {
@@ -2391,7 +2391,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
this.sendQueryPresenterAction(
VQueryPresenterAction.ChangeTab,
VQueryPresenterTabs.List
VQueryPresenterTabs.List,
);
}
});
@@ -2399,8 +2399,8 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
// On Updated ...
this.applyTakeUntilWrapper(
this.sharedService.mabsutAPIService.webinars.webinarEntityPushService
.onUpdated$
this.sharedService.saherElmAPIService.webinars.webinarEntityPushService
.onUpdated$,
).subscribe(async (event) => {
//
if (isNullOrUndefined(event) || isNullOrUndefined(this.dtoQueryResult)) {
@@ -2410,7 +2410,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
// Check if Model Exists in Current Context or not ...
let model = this.dtoQueryResult.items.find(
(i) => i.id === event.model.id
(i) => i.id === event.model.id,
);
if (isNullOrUndefined(model)) {
return;
@@ -2420,9 +2420,9 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
let fromEntity: XWebinarDto = undefined;
try {
fromEntity = await this.getValueAsync(
this.sharedService.mabsutAPIService.webinars.webinarProviderService.get(
event.model.id
)
this.sharedService.saherElmAPIService.webinars.webinarProviderService.get(
event.model.id,
),
);
} catch {
return;
@@ -2436,7 +2436,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
//
const modelP = ToWebinarViewDto(
fromEntity,
this.managerService.currentLocale
this.managerService.currentLocale,
);
//
@@ -2472,7 +2472,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
const selector = getQuerySelectorOfSpecifiedAttribute(
VWebinarViewComponent,
this.ModelFieldNames.id,
this.updateModel.id
this.updateModel.id,
);
await this.waitForElement(selector).then(async (el) => {
//
@@ -2504,7 +2504,7 @@ export abstract class WebinarsBaseProviderPage extends VQueryPresenterBasePage {
const selector = getQuerySelectorOfSpecifiedAttribute(
VWebinarViewComponent,
this.ModelFieldNames.id,
this.detailsModel.id
this.detailsModel.id,
);
await this.waitForElement(selector).then(async (el) => {
//
src/app/pages/webinars/webinars-explorer/webinars-explorer.page.ts
+5 -5
View File
@@ -30,18 +30,18 @@ export class WebinarsExplorerPage extends WebinarsBaseProviderPage {
//#region Abstractions ...
getModelTask(identifier: string): Observable<any> {
//
return this.sharedService.mabsutAPIService.webinars.webinarProviderService
return this.sharedService.saherElmAPIService.webinars.webinarProviderService
.get(identifier)
.pipe(
concatMap((m) =>
this.getValue(ToWebinarViewDto(m, this.managerService.currentLocale))
)
this.getValue(ToWebinarViewDto(m, this.managerService.currentLocale)),
),
);
}
queryModelTask(query: XQueryDto): Observable<XQueryResultDto<any>> {
return this.sharedService.mabsutAPIService.webinars.webinarProviderService.query(
query
return this.sharedService.saherElmAPIService.webinars.webinarProviderService.query(
query,
);
}
//#endregion
src/app/pages/webinars/webinars-management/webinars-management.page.ts
+5 -5
View File
@@ -30,18 +30,18 @@ export class WebinarsManagementPage extends WebinarsBaseProviderPage {
//#region Abstractions ...
getModelTask(identifier: string): Observable<any> {
//
return this.sharedService.mabsutAPIService.webinars.webinarProviderService
return this.sharedService.saherElmAPIService.webinars.webinarProviderService
.get(identifier)
.pipe(
concatMap((m) =>
this.getValue(ToWebinarViewDto(m, this.managerService.currentLocale))
)
this.getValue(ToWebinarViewDto(m, this.managerService.currentLocale)),
),
);
}
queryModelTask(query: XQueryDto): Observable<XQueryResultDto<any>> {
return this.sharedService.mabsutAPIService.webinars.webinarProviderService.query(
query
return this.sharedService.saherElmAPIService.webinars.webinarProviderService.query(
query,
);
}
//#endregion