diff --git a/frontend/src/ts/ervu/component/grid/InMemoryStaticGrid.ts b/frontend/src/ts/ervu/component/grid/InMemoryStaticGrid.ts
index e2404920..99d7fd14 100644
--- a/frontend/src/ts/ervu/component/grid/InMemoryStaticGrid.ts
+++ b/frontend/src/ts/ervu/component/grid/InMemoryStaticGrid.ts
@@ -31,9 +31,6 @@ import {AuditConstants, AuditService, FilterInfo} from "../../service/AuditServi
changeDetection: ChangeDetectionStrategy.OnPush
})
export class InMemoryStaticGrid extends GridV2 {
- // todo: remove on updating platform version up to 3.188
- @Visible("false")
- public columnFiltersChanged: Event
= new Event();
private rpcService: InMemoryStaticGridRpcService;
private auditService: AuditService;
@@ -154,17 +151,4 @@ export class InMemoryStaticGrid extends GridV2 {
public getRowDataSize(): number {
return this.rowData ? this.rowData.length : 0;
}
-
- // todo: remove on updating platform version up to 3.188
- @Visible()
- public hasColumnFilters(): boolean {
- const filterModel: { [key: string]: any; } = this.gridApi.getFilterModel();
- return !!filterModel && Object.keys(filterModel).length > 0;
- }
-
- // todo: remove on updating platform version up to 3.188
- public columnFilterChanged(event: FilterChangedEvent) {
- super.columnFilterChanged(event);
- this.columnFiltersChanged.trigger(event);
- }
}
diff --git a/frontend/src/ts/modules/security/guard/auth.guard.ts b/frontend/src/ts/modules/security/guard/auth.guard.ts
index a24733f2..15bef83e 100644
--- a/frontend/src/ts/modules/security/guard/auth.guard.ts
+++ b/frontend/src/ts/modules/security/guard/auth.guard.ts
@@ -51,7 +51,7 @@ export abstract class AuthGuard implements CanActivate {
if (error) {
let errorMessage =
this.messageService.getUnknowErrorMessage();
- let errorCode = this.extractCode(errorDescription);
+ let errorCode = this.extractCode(error);
if (errorCode) {
errorMessage = EsiaErrorDetail.getDescription(errorCode);
}
diff --git a/frontend/webpack.aot.config.js b/frontend/webpack.aot.config.js
index 6c88c8bb..0e16cc4a 100644
--- a/frontend/webpack.aot.config.js
+++ b/frontend/webpack.aot.config.js
@@ -97,8 +97,6 @@ module.exports = {
}),
new CopyWebpackPlugin([
{from: 'index.webpack.html', to: 'index.html'},
- {from: 'home.html', to: 'home.html'},
- {from: 'browser_check.js', to: 'browser_check.js'},
{from: 'src/resources/img/progress.gif', to: 'src/resources/img/progress.gif'},
{from: 'src/resources/img/logo.png', to: 'src/resources/img/logo.png'},
{from: 'src/resources/app-config.json', to: 'src/resources/app-config.json'},
diff --git a/pom.xml b/pom.xml
index 96a7a3cc..34a7327c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
ru.micord.ervu.lkrp
ul
- 1.9.11
+ 1.9.12-SNAPSHOT
pom
backend
diff --git a/resources/pom.xml b/resources/pom.xml
index 8701d770..50aa882f 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -4,7 +4,7 @@
ru.micord.ervu.lkrp
ul
- 1.9.11
+ 1.9.12-SNAPSHOT
ru.micord.ervu.lkrp.ul
diff --git a/resources/src/main/resources/business-model/Личный кабинет юр лица.page b/resources/src/main/resources/business-model/Личный кабинет юр лица.page
index 2df73da3..10164fe3 100644
--- a/resources/src/main/resources/business-model/Личный кабинет юр лица.page
+++ b/resources/src/main/resources/business-model/Личный кабинет юр лица.page
@@ -804,6 +804,7 @@
8101e7bf-e6fe-4f6d-82a5-740dce669649
Кнопка 1
false
+ false
false
@@ -907,24 +908,7 @@
eventRefs
- -
-
-
-
- behavior
-
- {"objectId":"8101e7bf-e6fe-4f6d-82a5-740dce669649","packageName":"component.button","className":"Button","type":"TS"}
-
-
-
- propertyName
-
- "successActionEvent"
-
-
-
-
-
+ -
-
-
-
- behavior
-
- {"objectId":"3b26aaa6-3639-4a36-8d37-2a4a2d3a2f87","packageName":"component.button","className":"Button","type":"TS"}
-
-
-
- propertyName
-
- "successActionEvent"
-
-
-
-
-
+ -
-
-
-
- behavior
-
- {"objectId":"cc33db1e-2720-4e87-ab51-e32c7a5e0b9e","packageName":"component.button","className":"Button","type":"TS"}
-
-
-
- propertyName
-
- "successActionEvent"
-
-
-
-
-
+ -
-
-
-
- behavior
-
- {"objectId":"20a9ff21-b90f-4e38-ab85-4826fbc11405","packageName":"component.button","className":"Button","type":"TS"}
-
-
-
- propertyName
-
- "successActionEvent"
-
-
-
-
-
+ -
-
-
-
- behavior
-
- {"objectId":"f6310258-ec19-4d13-b04d-cfc09d6b5e77","packageName":"component.button","className":"Button","type":"TS"}
-
-
-
- propertyName
-
- "successActionEvent"
-
-
-
-
-
+ -
+
+"align-center"
+
+
+ -
+
+"win-error"
+
+
+
+
+
+
+
+
+
+
+
+ 98594cec-0a9b-4cef-af09-e1b71cb2ad9e
+ d6e0aa92-78ed-470e-8a98-9cce3f30efe5
+ Обработка событий-show dialog
+ false
+ false
+
+
+
+ eventRefs
+
+ -
+
+
+
+ behavior
+
+ {"objectId":"8101e7bf-e6fe-4f6d-82a5-740dce669649","packageName":"component.button","className":"Button","type":"TS"}
+
+
+
+ propertyName
+
+ "successActionEvent"
+
+
+
+
+
+ -
+
+
+
+ behavior
+
+ {"objectId":"3b26aaa6-3639-4a36-8d37-2a4a2d3a2f87","packageName":"component.button","className":"Button","type":"TS"}
+
+
+
+ propertyName
+
+ "successActionEvent"
+
+
+
+
+
+ -
+
+
+
+ behavior
+
+ {"objectId":"cc33db1e-2720-4e87-ab51-e32c7a5e0b9e","packageName":"component.button","className":"Button","type":"TS"}
+
+
+
+ propertyName
+
+ "successActionEvent"
+
+
+
+
+
+ -
+
+
+
+ behavior
+
+ {"objectId":"20a9ff21-b90f-4e38-ab85-4826fbc11405","packageName":"component.button","className":"Button","type":"TS"}
+
+
+
+ propertyName
+
+ "successActionEvent"
+
+
+
+
+
+ -
+
+
+
+ behavior
+
+ {"objectId":"f6310258-ec19-4d13-b04d-cfc09d6b5e77","packageName":"component.button","className":"Button","type":"TS"}
+
+
+
+ propertyName
+
+ "successActionEvent"
+
+
+
+
+
+ -
+
+
+
+ behavior
+
+ {"objectId":"93a1b29d-c3c8-4300-a063-44720562dff3","packageName":"component","className":"Dialog","type":"TS"}
+
+
+
+ method
+
+ "show"
+
+
+
+ value
+
+ null
+
+
+
+
+
+
+
+
+
+
+
+ 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91
+ 03e9410a-8d47-4a74-b0c3-cfb8900004f1
+ Вертикальный контейнер
+ true
+ false
+
+
+
+
+
+
+ ba24d307-0b91-4299-ba82-9d0b52384ff2
+ 8e234aed-6ad7-4e00-834f-e043f2d29c55
+ Текст
+ false
+ false
+
+
+
+ collectible
+
+false
+
+
+
+ initialValue
+
+"Система находится в опытной эксплуатации. Функция загрузки данных от организаций будет доступна позднее."
+
+
+
+
+
+
+
+
+ false
+
+
+
+ fd7e47b9-dce1-4d14-9f3a-580c79f59579
+ b32b3411-2032-4713-8c5c-67cb114ad231
+ Кнопка
+ false
+ true
+
+
+
+ 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91
+ b28dce91-46cb-46fe-a309-ccc2ace6cb34
+ Вертикальный контейнер
+ true
+ false
+
+
+
+
+
+
+ 98594cec-0a9b-4cef-af09-e1b71cb2ad9e
+ 14c11640-a5b2-4aea-a6a7-4b1ff334de7c
+ Обработка событий-close dialog
+ false
+ false
+
+
+
+ eventRefs
+
+-
+
+
+
+ behavior
+
+ {"objectId":"b32b3411-2032-4713-8c5c-67cb114ad231","packageName":"component.button","className":"Button","type":"TS"}
+
+
+
+ propertyName
+
+ "successActionEvent"
+
+
+
+
+
+
+
+
+ ifCondition
+
+
+
+ logicalOperation
+
+ null
+
+
+
+
+
+
+ thenActions
+
+-
+
+
+
+ behavior
+
+ {"objectId":"93a1b29d-c3c8-4300-a063-44720562dff3","packageName":"component","className":"Dialog","type":"TS"}
+
+
+
+ method
+
+ "hide"
+
+
+
+ value
+
+ null
+
+
+
+
+
+
+
+
+
+
+
+ fd7e47b9-dce1-4d14-9f3a-580c79f59579
+ b32b3411-2032-4713-8c5c-67cb114ad231
+ Кнопка
+ false
+ false
+
+
+
+ caption
+
+"Закрыть"
+
+
+
+
+
+
+ d7d54cfb-26b5-4dba-b56f-b6247183c24d
+ f6703dc0-c93c-4d28-adb7-a04faf79a920
+ Горизонтальный контейнер
+ true
+ true
+
+
+