Merge remote-tracking branch 'origin/master' into feature/new-design-test

This commit is contained in:
m.epshtein 2024-06-18 13:11:53 +03:00
commit 00df32a787
4 changed files with 123 additions and 1947 deletions

View file

@ -33,6 +33,11 @@ const appRoutes: Routes = [
path: 'reset-password',
component: ResetPasswordComponent
},
{
path: 'my-data',
loadChildren: 'generated-sources/page-my-data.module#Pagemy-dataModule',
canActivate: [AuthenticationGuard, ConfirmExitGuard],
},
{
path: 'new-password',
component: NewPasswordComponent

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<xmlPage>
<id>dd6105c3-cbf7-4956-9dbe-531ccbf76755</id>
<id>my-data</id>
<versions>
<studioVersion>3.172.3</studioVersion>
<packageVersions>

View file

@ -142,6 +142,7 @@
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<enabled>false</enabled>
<properties>
<entry>
<key>caption</key>
@ -154,13 +155,41 @@
<value>
<item id="fc981c46-2d7a-4c46-a847-a2463e5490dd" removed="false">
<value>
<simple>"btn-link"</simple>
<simple>"link-data"</simple>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
<scripts id="da89d285-4d1f-4148-b945-fa43a49f6ed5">
<classRef type="TS">
<className>StaticRouteNavigationButton</className>
<packageName>modules.user-management.component</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
<properties>
<entry>
<key>caption</key>
<value>
<simple>"Мои данные"</simple>
</value>
</entry>
<entry>
<key>route</key>
<value>
<simple>"/my-data"</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="0754f79e-3bbe-4087-b9a0-0e955911af0a">
<prototypeId>c8dfe691-a84a-48da-b79e-6298d90db71d</prototypeId>
@ -248,6 +277,7 @@
<componentRootId>cefc3626-d99a-434e-983e-224ac0c15a4c</componentRootId>
<name>FS - 1.1.1 (Повестки)</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="46f20297-81d1-4786-bb17-2a78ca6fda6f">
<properties>
@ -316,6 +346,11 @@
<entry>
<key>cssClasses</key>
<value>
<item id="7bc9c5a0-0be3-4e50-b571-cbc304154839" removed="false">
<value>
<simple>"icon-doc"</simple>
</value>
</item>
<item id="42505d9e-55c3-4566-81b3-69b8b424430f" removed="true"/>
</value>
</entry>
@ -402,11 +437,7 @@
<entry>
<key>cssClasses</key>
<value>
<item id="be82fcf0-9bba-4cb5-b900-7af34d1f87f5" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
<item id="be82fcf0-9bba-4cb5-b900-7af34d1f87f5" removed="true"/>
<item id="5be1408c-448b-42a3-a23f-b1de0e0180e7" removed="true"/>
</value>
</entry>
@ -494,6 +525,7 @@
<componentRootId>54755bcb-801b-450d-aa2e-046e2a405538</componentRootId>
<name>VB - 1.1.1.1 (на ? дату нет сформированных повесток) сценарий</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -532,11 +564,7 @@
<entry>
<key>cssClasses</key>
<value>
<item id="83d0cb9b-0136-422c-aa1e-040d7fbc1ae6" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
<item id="83d0cb9b-0136-422c-aa1e-040d7fbc1ae6" removed="true"/>
</value>
</entry>
<entry>
@ -652,11 +680,7 @@
<entry>
<key>cssClasses</key>
<value>
<item id="83d0cb9b-0136-422c-aa1e-040d7fbc1ae6" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
<item id="83d0cb9b-0136-422c-aa1e-040d7fbc1ae6" removed="true"/>
</value>
</entry>
<entry>
@ -850,11 +874,7 @@
<entry>
<key>cssClasses</key>
<value>
<item id="4e18800d-ff83-419e-a418-1bb90dd5bc62" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
<item id="4e18800d-ff83-419e-a418-1bb90dd5bc62" removed="true"/>
</value>
</entry>
<entry>
@ -897,16 +917,6 @@
<value>
<simple>"Запросить выписку"</simple>
</value>
</entry>
<entry>
<key>cssClasses</key>
<value>
<item id="1d20a871-fd63-4949-ab84-9a1c2d19b0a6" removed="false">
<value>
<simple>"btn-main"</simple>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
@ -925,16 +935,6 @@
<simple>"Скачать выписку"</simple>
</value>
</entry>
<entry>
<key>cssClasses</key>
<value>
<item id="3b2ba819-13db-40e5-95c3-c1b598903c8c" removed="false">
<value>
<simple>"btn-main"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -958,16 +958,6 @@
<simple>"Повторить запрос"</simple>
</value>
</entry>
<entry>
<key>cssClasses</key>
<value>
<item id="8f7f274c-ea50-4aae-a741-1c1a8d3922f9" removed="false">
<value>
<simple>"btn-main"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -983,6 +973,7 @@
<componentRootId>c3fc56e5-4aec-44e3-92ed-5fb7b6a68519</componentRootId>
<name>FS - 1.1.2 (Временные меры)</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="46f20297-81d1-4786-bb17-2a78ca6fda6f">
<properties>
@ -1051,12 +1042,13 @@
<entry>
<key>cssClasses</key>
<value>
<item id="77431d44-7d57-4c46-92a5-413cfc8ebb27" removed="true"/>
<item id="fb9bbfeb-a532-4424-be6e-b8b417fd1d37" removed="false">
<item id="c57934c5-fd70-4a23-83e7-3ef954feecdc" removed="false">
<value>
<simple>"ag-row"</simple>
<simple>"icon-cross"</simple>
</value>
</item>
<item id="77431d44-7d57-4c46-92a5-413cfc8ebb27" removed="true"/>
<item id="fb9bbfeb-a532-4424-be6e-b8b417fd1d37" removed="true"/>
<item id="2c2f4cc4-7358-4bbb-8202-a68a0784cbec" removed="true"/>
</value>
</entry>
@ -1170,11 +1162,7 @@
<key>cssClasses</key>
<value>
<item id="6cd62dd9-6600-4ac5-80ef-3a291f071b55" removed="true"/>
<item id="e4af374e-c8a1-4d18-899e-154bb7223139" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
<item id="e4af374e-c8a1-4d18-899e-154bb7223139" removed="true"/>
</value>
</entry>
<entry>
@ -1292,7 +1280,6 @@
<componentRootId>935a9f9f-4d12-4813-b313-919627c0e642</componentRootId>
<name>VB - 1.1.2.2 (применены временные меры) сценарий</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -1330,11 +1317,7 @@
<key>cssClasses</key>
<value>
<item id="6cd62dd9-6600-4ac5-80ef-3a291f071b55" removed="true"/>
<item id="e4af374e-c8a1-4d18-899e-154bb7223139" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
<item id="e4af374e-c8a1-4d18-899e-154bb7223139" removed="true"/>
</value>
</entry>
<entry>
@ -1363,6 +1346,7 @@
<componentRootId>4e886a36-f027-4fc0-a0d5-0e934efdc726</componentRootId>
<name>HB - строка с текстом "Запрет на выезд с России"</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@ -1654,11 +1638,7 @@
<entry>
<key>cssClasses</key>
<value>
<item id="971b5644-25f3-412e-b76b-4f0f258f0ee9" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
<item id="971b5644-25f3-412e-b76b-4f0f258f0ee9" removed="true"/>
</value>
</entry>
<entry>
@ -1718,7 +1698,6 @@
<componentRootId>304824d5-9f9f-4af9-9b08-6232f7536774</componentRootId>
<name>FS - 1.1.3 (Воинский учёт)</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="46f20297-81d1-4786-bb17-2a78ca6fda6f">
<properties>
@ -1749,6 +1728,7 @@
<componentRootId>6af5aacd-21a6-40c1-8529-716c16d0bb26</componentRootId>
<name>HB заголовок - Воинский учёт</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -1837,11 +1817,7 @@
<entry>
<key>cssClasses</key>
<value>
<item id="3dc5b680-c52d-4d0b-8996-c30e361480df" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
<item id="3dc5b680-c52d-4d0b-8996-c30e361480df" removed="true"/>
</value>
</entry>
<entry>
@ -1909,6 +1885,17 @@
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="5d5e5226-075d-4131-bdd9-faeac88930a3" removed="false">
<value>
<simple>"long-value-input"</simple>
</value>
</item>
<item id="f5d53af6-c043-4883-b437-bbc7fd09ff2f" removed="true"/>
</value>
</entry>
<entry>
<key>disabled</key>
<value>
@ -1928,7 +1915,7 @@
<entry>
<key>width</key>
<value>
<simple>"600px"</simple>
<simple>null</simple>
</value>
</entry>
</complex>
@ -2082,11 +2069,7 @@
<entry>
<key>cssClasses</key>
<value>
<item id="3dc5b680-c52d-4d0b-8996-c30e361480df" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
<item id="3dc5b680-c52d-4d0b-8996-c30e361480df" removed="true"/>
</value>
</entry>
<entry>
@ -2137,11 +2120,7 @@
<entry>
<key>cssClasses</key>
<value>
<item id="3dc5b680-c52d-4d0b-8996-c30e361480df" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
<item id="3dc5b680-c52d-4d0b-8996-c30e361480df" removed="true"/>
</value>
</entry>
<entry>
@ -2298,98 +2277,42 @@
<componentRootId>d8df6959-b044-47ac-8d2b-4bf9163acc96</componentRootId>
<name>HB - строка с текстом "Если в выписке есть ошибки, подайте заявление на исправление на Госуслугах"</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="d5fa2655-8dd8-4004-9dec-217a41e5b9ed">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>d5fa2655-8dd8-4004-9dec-217a41e5b9ed</componentRootId>
<name>Если в выписке есть ошибки, подайте заявление на исправление на Госуслугах</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
<scripts id="fe04d7fb-6c5b-46c4-b723-667732d81f4f"/>
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
<scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
<children id="d5fa2655-8dd8-4004-9dec-217a41e5b9ed">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>d5fa2655-8dd8-4004-9dec-217a41e5b9ed</componentRootId>
<name>Если в выписке есть ошибки, подайте </name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="fb461770-19d4-452c-8347-825c3842b8a9" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>initialValue</key>
<value>
<simple>"Если в выписке есть ошибки, подайте "</simple>
</value>
</entry>
<entry>
<key>label</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
<children id="044059a8-c563-47d6-8f64-92704a38feb2">
<prototypeId>e32ae1f5-5b14-45f1-abb6-f52c34b3b570</prototypeId>
<componentRootId>044059a8-c563-47d6-8f64-92704a38feb2</componentRootId>
<name>Гиперссылка - "заявление на исправление на Госуслугах"</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="2fe08181-8a1e-4cda-be3a-0b0ddcb21603">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="8c9690b6-cb14-441b-afe5-d027fbcb7d9a" removed="true"/>
</value>
</entry>
<entry>
<key>isAbsolute</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>openInNewTab</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>parameterProviders</key>
<value>
<item id="e1b354d7-20b8-4dd3-8325-603322d178fc" removed="true"/>
</value>
</entry>
<entry>
<key>text</key>
<value>
<simple>"заявление на исправление на Госуслугах"</simple>
</value>
</entry>
<entry>
<key>url</key>
<value>
<simple>"https://www.gosuslugi.ru/"</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="fb461770-19d4-452c-8347-825c3842b8a9" removed="true"/>
</value>
</entry>
<entry>
<key>initialValue</key>
<value>
<simple>"Если в выписке есть ошибки, подайте \u003ca href\u003d\"https://www.gosuslugi.ru/\"\u003eзаявление на исправление на Госуслугах\u003c/a\u003e"</simple>
</value>
</entry>
<entry>
<key>label</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
<children id="f7303dfe-f3ef-42a6-bb59-8b818f38708b">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
@ -2402,11 +2325,7 @@
<entry>
<key>cssClasses</key>
<value>
<item id="3282eccb-d596-4f30-ad54-400ebd64d151" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
<item id="3282eccb-d596-4f30-ad54-400ebd64d151" removed="true"/>
</value>
</entry>
<entry>
@ -2449,16 +2368,6 @@
<value>
<simple>"Запросить выписку"</simple>
</value>
</entry>
<entry>
<key>cssClasses</key>
<value>
<item id="a2600561-cee0-4573-9e50-28b4bd5dc00d" removed="false">
<value>
<simple>"btn-main"</simple>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
@ -2477,16 +2386,6 @@
<simple>"Скачать выписку"</simple>
</value>
</entry>
<entry>
<key>cssClasses</key>
<value>
<item id="3b2ba819-13db-40e5-95c3-c1b598903c8c" removed="false">
<value>
<simple>"btn-main"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -2510,16 +2409,6 @@
<simple>"Повторить запрос"</simple>
</value>
</entry>
<entry>
<key>cssClasses</key>
<value>
<item id="7e743b35-575c-4846-92e6-33cefba36e71" removed="false">
<value>
<simple>"btn-main"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -2600,11 +2489,17 @@
<entry>
<key>cssClasses</key>
<value>
<item id="f5d53af6-c043-4883-b437-bbc7fd09ff2f" removed="true"/>
<item id="e3aef7c9-c865-4970-9df6-80c7e852ad7c" removed="false">
<value>
<simple>"title"</simple>
</value>
</item>
<item id="6dddfa92-4df4-4b39-a7aa-324275006ba4" removed="false">
<value>
<simple>"long-value-input"</simple>
</value>
</item>
</value>
</entry>
<entry>
@ -2659,11 +2554,7 @@
<entry>
<key>cssClasses</key>
<value>
<item id="cef1d0a4-9967-4979-9a0e-c3b7b31aeab0" removed="false">
<value>
<simple>"ag-row"</simple>
</value>
</item>
<item id="cef1d0a4-9967-4979-9a0e-c3b7b31aeab0" removed="true"/>
</value>
</entry>
<entry>
@ -2714,6 +2605,13 @@
</properties>
</scripts>
</children>
<children id="b2fe0dbb-3d41-4d8e-8112-90aeefe9f250">
<prototypeId>133ca212-09a6-413a-ac66-e2f6ce188f1f</prototypeId>
<componentRootId>b2fe0dbb-3d41-4d8e-8112-90aeefe9f250</componentRootId>
<name>Текстовое поле</name>
<container>false</container>
<removed>true</removed>
</children>
</children>
<children id="bc497784-f234-40d8-9d77-b3489ce9b0d2">
<prototypeId>f7504fc9-f501-43fe-a678-5c6ba756ba5c</prototypeId>
@ -2823,6 +2721,7 @@
<componentRootId>a01ac5a5-1b5c-4fc8-9404-341ce04cb76c</componentRootId>
<name>FS - 1.2.1 (если вы не можете явиться по уважительной причине)</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="46f20297-81d1-4786-bb17-2a78ca6fda6f">
<properties>
@ -2857,7 +2756,6 @@
<componentRootId>89768b28-4de1-4ce3-8d9e-37eef04653cf</componentRootId>
<name>VB - строка текста "Если Вы не можете явиться по уважительной причине"</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>