FR-790: Move shops section module up (#595)

src/app/sections/payment-section/integrations/integrations-routing.module.ts

@@ -10,11 +10,7 @@ const ROUTES: Routes = [
         children: [
             {
                 path: 'webhooks',
-                loadChildren: () => import('./webhooks/webhooks.module').then((m) => m.WebhooksModule),
+                loadChildren: () => import('./webhooks').then((m) => m.WebhooksModule),
-            },
-            {
-                path: 'shops',
-                loadChildren: () => import('./shops').then((m) => m.ShopsModule),
             },
             {
                 path: 'payment-link',
@@ -26,7 +22,7 @@ const ROUTES: Routes = [
             },
             {
                 path: '',
-                redirectTo: 'shops',
+                redirectTo: 'payment-link',
             },
         ],
     },

src/app/sections/payment-section/integrations/integrations.component.ts

@@ -5,9 +5,6 @@ import { Component } from '@angular/core';
 })
 export class IntegrationsComponent {
     links = [
-        {
-            path: 'shops',
-        },
         {
             path: 'payment-link',
         },

src/app/sections/payment-section/payment-section-routing.module.ts

@@ -12,6 +12,10 @@ const PAYMENT_SECTION_ROUTES: Routes = [
         path: 'realm/:realm',
         component: PaymentSectionComponent,
         children: [
+            {
+                path: 'shops',
+                loadChildren: () => import('./shops/shops.module').then((m) => m.ShopsModule),
+            },
             {
                 path: 'analytics',
                 loadChildren: () => import('./analytics/analytics.module').then((m) => m.AnalyticsModule),
@@ -34,7 +38,7 @@ const PAYMENT_SECTION_ROUTES: Routes = [
             },
             {
                 path: '',
-                redirectTo: 'analytics',
+                redirectTo: 'shops',
             },
         ],
     },

src/app/sections/payment-section/shops/services/fetch-shops/fetch-shops.service.ts

@@ -7,7 +7,7 @@ import { PaymentInstitution, Shop as ApiShop } from '@dsh/api-codegen/capi/swagg
 import { ApiShopsService } from '@dsh/api/shop';
 import { mapToTimestamp, shareReplayRefCount } from '@dsh/operators';
 
-import { filterShopsByRealm } from '../../../../operations/operators';
+import { filterShopsByRealm } from '../../../operations/operators';
 import { ShopBalance } from '../../types/shop-balance';
 import { ShopFiltersData } from '../../types/shop-filters-data';
 import { ShopItem } from '../../types/shop-item';

src/app/sections/payment-section/shops/shops.component.html

@@ -1,4 +1,5 @@
-<div fxLayout="column" fxLayoutGap="32px">
+<div *transloco="let t; scope: 'shops'; read: 'shops'" fxLayout="column" fxLayoutGap="32px">
+    <h1 class="dsh-display-1">{{ t('headline') }}</h1>
     <div
         fxLayout="column-reverse"
         fxLayout.gt-sm="row"

src/app/sections/payment-section/shops/shops.component.spec.ts

@@ -13,8 +13,8 @@ import { ShopCreationService } from '@dsh/app/shared/components/shop-creation';
 import { provideMockService } from '@dsh/app/shared/tests';
 import { ButtonModule } from '@dsh/components/buttons';
 
-import { PaymentInstitutionRealmService } from '../../services/payment-institution-realm.service';
+import { PaymentInstitutionRealmService } from '../services/payment-institution-realm.service';
-import { RealmShopsService } from '../../services/realm-shops.service';
+import { RealmShopsService } from '../services/realm-shops.service';
 import { FetchShopsService } from './services/fetch-shops/fetch-shops.service';
 import { ShopsBalanceService } from './services/shops-balance/shops-balance.service';
 import { ShopsFiltersStoreService } from './services/shops-filters-store/shops-filters-store.service';

src/app/sections/payment-section/shops/shops.component.ts

@@ -4,7 +4,7 @@ import { take } from 'rxjs/operators';
 
 import { ShopCreationService } from '@dsh/app/shared/components/shop-creation';
 
-import { PaymentInstitutionRealmService, RealmShopsService } from '../../services';
+import { PaymentInstitutionRealmService, RealmShopsService } from '../services';
 import { FetchShopsService } from './services/fetch-shops/fetch-shops.service';
 import { ShopsExpandedIdManagerService } from './shops-list/services/shops-expanded-id-manager/shops-expanded-id-manager.service';
 

src/app/sections/payment-section/utils/to-navbar-item-config.ts

@@ -7,6 +7,7 @@ export interface NavbarItemConfig {
 }
 
 export const toNavbarItemConfig = ({
+    shops,
     analytics,
     integrations,
     operations,
@@ -15,6 +16,11 @@ export const toNavbarItemConfig = ({
 }: {
     [k: string]: string;
 }): NavbarItemConfig[] => [
+    {
+        routerLink: 'shops',
+        icon: BootstrapIconName.Shop,
+        label: shops,
+    },
     {
         routerLink: 'analytics',
         icon: BootstrapIconName.PieChart,

src/app/shared/components/shop-creation/create-russian-shop-entity/create-russian-shop-entity.module.ts

@@ -25,7 +25,7 @@ import { FormatInputModule } from '@dsh/components/form-controls';
 import { DetailsItemModule } from '@dsh/components/layout';
 
 import { DaDataModule } from '../../../../dadata';
-import { ShopPayoutToolDetailsService } from '../../../../sections/payment-section/integrations/shops/services/shop-payout-tool-details/shop-payout-tool-details.service';
+import { ShopPayoutToolDetailsService } from '../../../../sections/payment-section/shops/services/shop-payout-tool-details/shop-payout-tool-details.service';
 import { CurrencyAutocompleteFieldModule } from '../../inputs/currency-autocomplete-field';
 import { NewContractorFormComponent } from './components/new-contractor-form/new-contractor-form.component';
 import { OrgDetailsFormComponent } from './components/org-details-form/org-details-form.component';

src/assets/i18n/payment-section/ru.json

@@ -2,6 +2,7 @@
     "testEnvironment": "Тестовое окружение",
     "testEnvironmentHint": "Вы находитесь в тестовом окружении. Этот раздел предназначен для тестового подключения и проверки настроек приема платежей. Здесь же вы можете проверить функции личного кабинета, например, интеграцию магазина, создание и оплата счетов или осуществление возвратов.",
     "nav": {
+        "shops": "Магазины",
         "operations": "Операции",
         "reports": "Отчеты",
         "analytics": "Аналитика",
@@ -76,7 +77,6 @@
         "headline": "Интеграция",
         "tabs": {
             "webhooks": "Webhooks",
-            "shops": "Магазины",
             "payment-link": "Платежная ссылка",
             "api-key": "API ключ"
         }

src/assets/i18n/shops/ru.json

@@ -1,4 +1,5 @@
 {
+    "headline": "Магазины",
     "description": "Магазин - это отображение вашего веб-сайта или точки продаж в платформе. Используйте идентификатор магазина для технической интеграции с платформой.",
     "createShop": "Создать магазин",
     "emptySearchResult": "Нет ни одного магазина",