@redneckz/wildless-cms-uni-blocks 0.14.573 → 0.14.574

package/mobile/lib/components/OfficesAtmsMap/renderHeading.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderHeading.js","sourceRoot":"","sources":["../../../src/components/OfficesAtmsMap/renderHeading.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAE9C,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAc,EAAE,WAAoB,EAAE,EAAE,CAAC,CACrE,cAAK,SAAS,EAAC,yCAAyC,YACtD,MAAC,OAAO,IAAC,WAAW,EAAC,IAAI,aACvB,eAAM,wBAAwB,EAAE,IAAI,YAAG,KAAK,GAAQ,EACnD,WAAW,CAAC,CAAC,CAAC,CACb,KAAC,IAAI,IAAC,IAAI,EAAC,SAAS,EAAC,KAAK,EAAC,qBAAqB,YAC9C,eAAM,wBAAwB,EAAE,IAAI,YAAG,KAAK,WAAW,GAAG,GAAQ,GAC7D,CACR,CAAC,CAAC,CAAC,IAAI,IACA,GACN,CACP,CAAC"}

package/mobile/lib/ui-kit/YandexMap/renderClusterer.js

@@ -1,10 +1,13 @@
 const MapMarkerClusterIcon = '/icons/MapMarkerClusterIcon.svg';
 const MapMarkerClusterYellowIcon = '/icons/MapMarkerClusterYellowIcon.svg';
 export function renderClusterer({ yandexMaps, map, points, isLoad, }) {
-    if (isLoad || !points?.length) {
+    if (isLoad || !points) {
         return;
     }
     map.geoObjects.removeAll();
+    if (!points.length) {
+        return;
+    }
     const clusterIconContentLayout = yandexMaps.templateLayoutFactory.createClass('<div style="margin-top: -3px;">{{properties.geoObjects.length}}</div>');
     const officeClusterer = defineClusterer('offices', yandexMaps, clusterIconContentLayout);
     if (points.length && points.every((_) => 'type' in _)) {

package/mobile/lib/ui-kit/YandexMap/renderClusterer.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderClusterer.js","sourceRoot":"","sources":["../../../src/ui-kit/YandexMap/renderClusterer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"renderClusterer.js","sourceRoot":"","sources":["../../../src/ui-kit/YandexMap/renderClusterer.ts"],"names":[],"mappings":"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"}

package/mobile/src/components/OfficesAtmsMap/OfficesAtmsMapLayout.tsx

@@ -2,21 +2,19 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
 import { type VNode } from '../../model/VNode';
-import { Button } from '../../ui-kit/Button/Button';
 import { ClientOnly } from '../../ui-kit/ClientOnly';
-import { Heading } from '../../ui-kit/Heading/Heading';
-import { Text } from '../../ui-kit/Text/Text';
 import { YandexMap } from '../../ui-kit/YandexMap/YandexMap';
-import { getVersion } from '../../utils/getVersion';
 import { style } from '../../utils/style';
+import { FILTRATION_LABELS, FILTRATION_PREDICATES, INITIAL_FILTRATION_STATE } from './filters';
 import { type AtmsDef } from './OfficesAtmsMapContent';
 import { type Atm, type Branch, type RemoteWorkplace } from './OfficesAtmsMapProps';
+import { renderButtonsGroup } from './renderButtonsGroup';
 import { renderDescriptionBlock } from './renderDescriptionBlock';
-import { renderFiltrationForm } from './renderFiltrationForm';
+import { renderFiltrationForm, type RenderFiltrationFormOptions } from './renderFiltrationForm';
+import { renderHeading } from './renderHeading';
 import { type BalloonContent } from './YandexMapProps';
 
 const defaultEmptyFunction = () => void 0;
-const defaultFilterItems = () => [];
 
 export type InitFilterState = Record<string, boolean>;
 
@@ -46,15 +44,13 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
     remoteWorkplaces = [],
     renderCard = defaultEmptyFunction,
     renderRemoteWorkplaceCard = defaultEmptyFunction,
-    filterItems = defaultFilterItems,
     getBalloon = defaultEmptyFunction,
     getBalloonRemoteWorkplaces = defaultEmptyFunction,
-    initFilterState = {},
     descriptionData,
     title,
   }) => {
     const onlyOffice = title?.includes('Офис');
-    const [filtrationState, { field, reset }] = useForm(initFilterState);
+    const [filtrationState, { field, reset }] = useForm(INITIAL_FILTRATION_STATE);
 
     const [filteredItems, points, filteredRemoteWorkplaces, lengthItems] = useMemo(() => {
       const _filteredItems = filterItems(data, filtrationState);
@@ -83,6 +79,13 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
 
     const [activeButton, setActiveButton] = useState('all');
 
+    const filterOptions: RenderFiltrationFormOptions = {
+      filters: getFiltersWithNonEmptyData([...data, ...remoteWorkplaces]),
+      field: { field, reset },
+      onlyOffice,
+      labels: FILTRATION_LABELS,
+    };
+
     return (
       <div className={style('space-y-1', className)}>
         <div className="bg-white">
@@ -91,7 +94,7 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
             {descriptionData ? renderDescriptionBlock(descriptionData) : null}
             {onlyOffice && renderButtonsGroup(data, activeButton, setActiveButton)}
             <div className={style('pb-3xl', filtersVisibleStyles(activeButton))}>
-              {renderFiltrationForm(Object.keys(initFilterState), { field, reset }, onlyOffice)}
+              {renderFiltrationForm(filterOptions)}
             </div>
           </div>
           <div className="h-[600px]">
@@ -109,55 +112,16 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
   },
 );
 
-const renderHeading = (title?: string, lengthItems?: number) => (
-  <div className="flex flex-col sm:flex-row gap-xs mb-2xl">
-    <Heading headingType="h3">
-      <span suppressHydrationWarning={true}>{title}</span>
-      {lengthItems ? (
-        <Text size="text-h2" color="text-secondary-text">
-          <span suppressHydrationWarning={true}>{` (${lengthItems})`}</span>
-        </Text>
-      ) : null}
-    </Heading>
-  </div>
-);
-
-const renderButtonsGroup = (
-  data: Branch[],
-  activeButton: string,
-  onButtonClick: (item: string) => void,
+export const filterItems = (
+  data: (Branch | RemoteWorkplace)[],
+  filtrationState: Record<string, boolean>,
 ) => {
-  const allButtonVersion = getVersion(activeButton === 'all');
-
-  const businessButtonVersion = getVersion(activeButton === 'business');
+  const truthyFilters = Object.keys(filtrationState).filter((key) => filtrationState[key]);
 
-  const handleClick = (e: any, key: string, branches: Branch[]) => {
-    if (e.currentTarget === e.target && key === 'business') {
-      branches.filter(
-        (branch) =>
-          branch.workSchedule &&
-          branch.workSchedule.businessScheduleVisibleTag &&
-          !branch.workSchedule.businessScheduleDescription,
-      );
-    }
-
-    onButtonClick(key);
-
-    return branches;
-  };
+  return data.filter((item) => truthyFilters.every((_) => FILTRATION_PREDICATES[_](item)));
+};
 
-  return (
-    <div className="flex gap-lg flex-col sm:flex-row pb-lg">
-      <Button data-id="all" onClick={(e) => handleClick(e, 'all', data)} version={allButtonVersion}>
-        Для физических лиц
-      </Button>
-      <Button
-        data-id="business"
-        onClick={(e) => handleClick(e, 'business', data)}
-        version={businessButtonVersion}
-      >
-        Для юридических лиц
-      </Button>
-    </div>
+export const getFiltersWithNonEmptyData = (data: (Branch | Atm | RemoteWorkplace)[]) =>
+  Object.keys(INITIAL_FILTRATION_STATE).filter(
+    (_) => data.filter((item) => FILTRATION_PREDICATES[_](item)).length,
   );
-};

package/mobile/src/components/OfficesAtmsMap/OfficesMap.tsx

@@ -1,46 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLocation } from '../../hooks/useLocation';
 import { OfficesAtmsMapLayout } from './OfficesAtmsMapLayout';
-import { type Branch, type RemoteWorkplace } from './OfficesAtmsMapProps';
 import { getOfficePoint, renderOfficeCard } from './renderOfficeCard';
 import { getRemoteWorkplacePoint, renderRemoteWorkplaceCard } from './renderRemoteWorkplaceCard';
 import { useOffices } from './useOffices';
 
-const INITIAL_FILTRATION_STATE = {
-  workingSaturday: false,
-  premiumService: false,
-  privateBanking: false,
-  remoteWorkplace: false,
-  serviceDisabledPeople: false,
-  sellingCoins: false,
-  buyingCoins: false,
-  bullionOperations: false,
-  preciousMetalsOperations: false,
-  transferringDataToBiometricSystem: false,
-};
-
-const FILTRATION_PREDICATES = {
-  workingSaturday: (item: Branch | RemoteWorkplace) =>
-    Boolean('workSchedule' in item && item.workSchedule?.workingSaturday),
-  premiumService: (item: Branch | RemoteWorkplace) =>
-    Boolean('premiumService' in item && item.premiumService),
-  privateBanking: (item: Branch | RemoteWorkplace) =>
-    Boolean('privateBanking' in item && item.privateBanking),
-  remoteWorkplace: (item: Branch | RemoteWorkplace) => Boolean('workScheduleDescription' in item),
-  serviceDisabledPeople: (item: Branch | RemoteWorkplace) =>
-    Boolean('serviceDisabledPeople' in item && item.serviceDisabledPeople),
-  sellingCoins: (item: Branch | RemoteWorkplace) =>
-    Boolean('sellingCoins' in item && item.sellingCoins),
-  buyingCoins: (item: Branch | RemoteWorkplace) =>
-    Boolean('buyingCoins' in item && item.buyingCoins),
-  bullionOperations: (item: Branch | RemoteWorkplace) =>
-    Boolean('bullionOperations' in item && item.bullionOperations),
-  preciousMetalsOperations: (item: Branch | RemoteWorkplace) =>
-    Boolean('preciousMetalsOperations' in item && item.preciousMetalsOperations),
-  transferringDataToBiometricSystem: (item: Branch | RemoteWorkplace) =>
-    Boolean('transferringDataToBiometricSystem' in item && item.transferringDataToBiometricSystem),
-};
-
 export interface OfficesMapProps {
   className?: string;
 }
@@ -53,11 +17,9 @@ export const OfficesMap = JSX<OfficesMapProps>(({ className }) => {
   return (
     <OfficesAtmsMapLayout
       className={className}
-      filterItems={filterItems}
       data={data?.branches}
       isLoad={isLoad}
       remoteWorkplaces={data?.remoteWorkplaces}
-      initFilterState={INITIAL_FILTRATION_STATE}
       renderCard={renderOfficeCard}
       renderRemoteWorkplaceCard={renderRemoteWorkplaceCard}
       getBalloon={getOfficePoint}
@@ -66,12 +28,3 @@ export const OfficesMap = JSX<OfficesMapProps>(({ className }) => {
     />
   );
 });
-
-const filterItems = (
-  data: (Branch | RemoteWorkplace)[],
-  filtrationState: Record<string, boolean>,
-) => {
-  const truthyFilters = Object.keys(filtrationState).filter((key) => filtrationState[key]);
-
-  return data.filter((item) => truthyFilters.every((_) => FILTRATION_PREDICATES[_](item)));
-};

package/mobile/src/components/OfficesAtmsMap/filters.ts

@@ -0,0 +1,56 @@
+import type { Branch, RemoteWorkplace } from './OfficesAtmsMapProps';
+
+export const INITIAL_FILTRATION_STATE = {
+  workingSaturday: false,
+  premiumService: false,
+  privateBanking: false,
+  remoteWorkplace: false,
+  serviceDisabledPeople: false,
+  sellingCoins: false,
+  buyingCoins: false,
+  bullionOperations: false,
+  preciousMetalsOperations: false,
+  transferringDataToBiometricSystem: false,
+};
+
+export const FILTRATION_LABELS = {
+  safeBoxCaseVolumes: 'Аренда индивидуальных сейфовых ячеек',
+  workingSaturday: 'Открыты по субботам',
+  terminalTypeAtms: 'Банкоматы',
+  terminalTypeTerm: 'Терминалы',
+  workAllTime: 'Круглосуточно',
+  billAcceptorEnable: 'Прием наличных',
+  premiumService: 'Премиальное обслуживание',
+  privateBanking: 'Услуга Private banking',
+  sellingCoins: 'Продажа монет из драгоценных металлов',
+  buyingCoins: 'Покупка монет из драгоценных металлов',
+  bullionOperations: 'Операции со слитками',
+  preciousMetalsOperations: 'Операции с драгоценными металлами',
+  transferringDataToBiometricSystem: 'Передача фото и голоса в Единую биометрическую систему',
+  locationDisabledPeople: 'Для маломобильных',
+  designDisabledPeople: 'Для слабовидящих',
+  remoteWorkplace: 'Удаленное рабочее место',
+  serviceDisabledPeople: 'Для маломобильных граждан',
+};
+
+export const FILTRATION_PREDICATES = {
+  workingSaturday: (item: Branch | RemoteWorkplace) =>
+    Boolean('workSchedule' in item && item.workSchedule?.workingSaturday),
+  premiumService: (item: Branch | RemoteWorkplace) =>
+    Boolean('premiumService' in item && item.premiumService),
+  privateBanking: (item: Branch | RemoteWorkplace) =>
+    Boolean('privateBanking' in item && item.privateBanking),
+  remoteWorkplace: (item: Branch | RemoteWorkplace) => Boolean('workScheduleDescription' in item),
+  serviceDisabledPeople: (item: Branch | RemoteWorkplace) =>
+    Boolean('serviceDisabledPeople' in item && item.serviceDisabledPeople),
+  sellingCoins: (item: Branch | RemoteWorkplace) =>
+    Boolean('sellingCoins' in item && item.sellingCoins),
+  buyingCoins: (item: Branch | RemoteWorkplace) =>
+    Boolean('buyingCoins' in item && item.buyingCoins),
+  bullionOperations: (item: Branch | RemoteWorkplace) =>
+    Boolean('bullionOperations' in item && item.bullionOperations),
+  preciousMetalsOperations: (item: Branch | RemoteWorkplace) =>
+    Boolean('preciousMetalsOperations' in item && item.preciousMetalsOperations),
+  transferringDataToBiometricSystem: (item: Branch | RemoteWorkplace) =>
+    Boolean('transferringDataToBiometricSystem' in item && item.transferringDataToBiometricSystem),
+};

package/mobile/src/components/OfficesAtmsMap/renderButtonsGroup.tsx

@@ -0,0 +1,43 @@
+import { Button } from '../../ui-kit/Button/Button';
+import { getVersion } from '../../utils/getVersion';
+import type { Branch } from './OfficesAtmsMapProps';
+
+export const renderButtonsGroup = (
+  data: Branch[],
+  activeButton: string,
+  onButtonClick: (item: string) => void,
+) => {
+  const allButtonVersion = getVersion(activeButton === 'all');
+
+  const businessButtonVersion = getVersion(activeButton === 'business');
+
+  const handleClick = (e: any, key: string, branches: Branch[]) => {
+    if (e.currentTarget === e.target && key === 'business') {
+      branches.filter(
+        (branch) =>
+          branch.workSchedule &&
+          branch.workSchedule.businessScheduleVisibleTag &&
+          !branch.workSchedule.businessScheduleDescription,
+      );
+    }
+
+    onButtonClick(key);
+
+    return branches;
+  };
+
+  return (
+    <div className="flex gap-lg flex-col sm:flex-row pb-lg">
+      <Button data-id="all" onClick={(e) => handleClick(e, 'all', data)} version={allButtonVersion}>
+        Для физических лиц
+      </Button>
+      <Button
+        data-id="business"
+        onClick={(e) => handleClick(e, 'business', data)}
+        version={businessButtonVersion}
+      >
+        Для юридических лиц
+      </Button>
+    </div>
+  );
+};

package/mobile/src/components/OfficesAtmsMap/renderFiltrationForm.tsx

@@ -8,37 +8,25 @@ import { Icon } from '../../ui-kit/Icon/Icon';
 import { type IconName } from '../../ui-kit/Icon/IconProps';
 import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
 
-const FILTRATION_LABELS = {
-  safeBoxCaseVolumes: 'Аренда индивидуальных сейфовых ячеек',
-  workingSaturday: 'Открыты по субботам',
-  terminalTypeAtms: 'Банкоматы',
-  terminalTypeTerm: 'Терминалы',
-  workAllTime: 'Круглосуточно',
-  billAcceptorEnable: 'Прием наличных',
-  premiumService: 'Премиальное обслуживание',
-  privateBanking: 'Услуга Private banking',
-  sellingCoins: 'Продажа монет из драгоценных металлов',
-  buyingCoins: 'Покупка монет из драгоценных металлов',
-  bullionOperations: 'Операции со слитками',
-  preciousMetalsOperations: 'Операции с драгоценными металлами',
-  transferringDataToBiometricSystem: 'Передача фото и голоса в Единую биометрическую систему',
-  locationDisabledPeople: 'Для маломобильных',
-  designDisabledPeople: 'Для слабовидящих',
-  remoteWorkplace: 'Удаленное рабочее место',
-  serviceDisabledPeople: 'Для маломобильных граждан',
-};
-
 const COMMON_FILTERS_STYLES = 'flex flex-col sm:flex-row sm:flex-wrap gap-3xl pb-2xl';
 
-export const renderFiltrationForm = (
-  filters: string[],
-  { field, reset }: { field: FormFieldRegisterer<any>; reset: () => void },
-  onlyOffice?: boolean,
-) => {
+export interface RenderFiltrationFormOptions {
+  filters: string[];
+  field: { field: FormFieldRegisterer<any>; reset: () => void };
+  onlyOffice?: boolean;
+  labels: Record<string, string>;
+}
+
+export const renderFiltrationForm = ({
+  filters,
+  field: { field, reset },
+  onlyOffice,
+  labels,
+}: RenderFiltrationFormOptions) => {
   const visibleFiltersNum = onlyOffice ? 5 : 6;
 
   const filtersCheckbox = (filters || []).map((key) => (
-    <Checkbox key={key} text={FILTRATION_LABELS[key]} {...field(key)} />
+    <Checkbox key={key} text={labels[key]} {...field(key)} />
   ));
 
   const [visibleFilters, hiddenFilters] =

package/mobile/src/components/OfficesAtmsMap/renderHeading.tsx

@@ -0,0 +1,15 @@
+import { Heading } from '../../ui-kit/Heading/Heading';
+import { Text } from '../../ui-kit/Text/Text';
+
+export const renderHeading = (title?: string, lengthItems?: number) => (
+  <div className="flex flex-col sm:flex-row gap-xs mb-2xl">
+    <Heading headingType="h3">
+      <span suppressHydrationWarning={true}>{title}</span>
+      {lengthItems ? (
+        <Text size="text-h2" color="text-secondary-text">
+          <span suppressHydrationWarning={true}>{` (${lengthItems})`}</span>
+        </Text>
+      ) : null}
+    </Heading>
+  </div>
+);

package/mobile/src/ui-kit/YandexMap/renderClusterer.ts

@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 import type ymaps from 'yandex-maps';
-import { type BalloonPoints } from '../../components/OfficesAtmsMap/YandexMapProps'; //! Вынести этот тип в файл YandexMapProps.ts расположенный в корне этого компонента
+import { type BalloonPoints } from '../../components/OfficesAtmsMap/YandexMapProps';
 
 const MapMarkerClusterIcon = '/icons/MapMarkerClusterIcon.svg';
 const MapMarkerClusterYellowIcon = '/icons/MapMarkerClusterYellowIcon.svg';
@@ -18,12 +18,16 @@ export function renderClusterer({
   points: BalloonPoints[];
   isLoad: boolean;
 }) {
-  if (isLoad || !points?.length) {
+  if (isLoad || !points) {
     return;
   }
 
   map.geoObjects.removeAll();
 
+  if (!points.length) {
+    return;
+  }
+
   const clusterIconContentLayout = yandexMaps.templateLayoutFactory.createClass(
     '<div style="margin-top: -3px;">{{properties.geoObjects.length}}</div>',
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.573",
+  "version": "0.14.574",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/OfficesAtmsMap/OfficesAtmsMapLayout.tsx

@@ -2,21 +2,19 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
 import { type VNode } from '../../model/VNode';
-import { Button } from '../../ui-kit/Button/Button';
 import { ClientOnly } from '../../ui-kit/ClientOnly';
-import { Heading } from '../../ui-kit/Heading/Heading';
-import { Text } from '../../ui-kit/Text/Text';
 import { YandexMap } from '../../ui-kit/YandexMap/YandexMap';
-import { getVersion } from '../../utils/getVersion';
 import { style } from '../../utils/style';
+import { FILTRATION_LABELS, FILTRATION_PREDICATES, INITIAL_FILTRATION_STATE } from './filters';
 import { type AtmsDef } from './OfficesAtmsMapContent';
 import { type Atm, type Branch, type RemoteWorkplace } from './OfficesAtmsMapProps';
+import { renderButtonsGroup } from './renderButtonsGroup';
 import { renderDescriptionBlock } from './renderDescriptionBlock';
-import { renderFiltrationForm } from './renderFiltrationForm';
+import { renderFiltrationForm, type RenderFiltrationFormOptions } from './renderFiltrationForm';
+import { renderHeading } from './renderHeading';
 import { type BalloonContent } from './YandexMapProps';
 
 const defaultEmptyFunction = () => void 0;
-const defaultFilterItems = () => [];
 
 export type InitFilterState = Record<string, boolean>;
 
@@ -46,15 +44,13 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
     remoteWorkplaces = [],
     renderCard = defaultEmptyFunction,
     renderRemoteWorkplaceCard = defaultEmptyFunction,
-    filterItems = defaultFilterItems,
     getBalloon = defaultEmptyFunction,
     getBalloonRemoteWorkplaces = defaultEmptyFunction,
-    initFilterState = {},
     descriptionData,
     title,
   }) => {
     const onlyOffice = title?.includes('Офис');
-    const [filtrationState, { field, reset }] = useForm(initFilterState);
+    const [filtrationState, { field, reset }] = useForm(INITIAL_FILTRATION_STATE);
 
     const [filteredItems, points, filteredRemoteWorkplaces, lengthItems] = useMemo(() => {
       const _filteredItems = filterItems(data, filtrationState);
@@ -83,6 +79,13 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
 
     const [activeButton, setActiveButton] = useState('all');
 
+    const filterOptions: RenderFiltrationFormOptions = {
+      filters: getFiltersWithNonEmptyData([...data, ...remoteWorkplaces]),
+      field: { field, reset },
+      onlyOffice,
+      labels: FILTRATION_LABELS,
+    };
+
     return (
       <div className={style('space-y-1', className)}>
         <div className="bg-white">
@@ -91,7 +94,7 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
             {descriptionData ? renderDescriptionBlock(descriptionData) : null}
             {onlyOffice && renderButtonsGroup(data, activeButton, setActiveButton)}
             <div className={style('pb-3xl', filtersVisibleStyles(activeButton))}>
-              {renderFiltrationForm(Object.keys(initFilterState), { field, reset }, onlyOffice)}
+              {renderFiltrationForm(filterOptions)}
             </div>
           </div>
           <div className="h-[600px]">
@@ -109,55 +112,16 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
   },
 );
 
-const renderHeading = (title?: string, lengthItems?: number) => (
-  <div className="flex flex-col sm:flex-row gap-xs mb-2xl">
-    <Heading headingType="h3">
-      <span suppressHydrationWarning={true}>{title}</span>
-      {lengthItems ? (
-        <Text size="text-h2" color="text-secondary-text">
-          <span suppressHydrationWarning={true}>{` (${lengthItems})`}</span>
-        </Text>
-      ) : null}
-    </Heading>
-  </div>
-);
-
-const renderButtonsGroup = (
-  data: Branch[],
-  activeButton: string,
-  onButtonClick: (item: string) => void,
+export const filterItems = (
+  data: (Branch | RemoteWorkplace)[],
+  filtrationState: Record<string, boolean>,
 ) => {
-  const allButtonVersion = getVersion(activeButton === 'all');
-
-  const businessButtonVersion = getVersion(activeButton === 'business');
+  const truthyFilters = Object.keys(filtrationState).filter((key) => filtrationState[key]);
 
-  const handleClick = (e: any, key: string, branches: Branch[]) => {
-    if (e.currentTarget === e.target && key === 'business') {
-      branches.filter(
-        (branch) =>
-          branch.workSchedule &&
-          branch.workSchedule.businessScheduleVisibleTag &&
-          !branch.workSchedule.businessScheduleDescription,
-      );
-    }
-
-    onButtonClick(key);
-
-    return branches;
-  };
+  return data.filter((item) => truthyFilters.every((_) => FILTRATION_PREDICATES[_](item)));
+};
 
-  return (
-    <div className="flex gap-lg flex-col sm:flex-row pb-lg">
-      <Button data-id="all" onClick={(e) => handleClick(e, 'all', data)} version={allButtonVersion}>
-        Для физических лиц
-      </Button>
-      <Button
-        data-id="business"
-        onClick={(e) => handleClick(e, 'business', data)}
-        version={businessButtonVersion}
-      >
-        Для юридических лиц
-      </Button>
-    </div>
+export const getFiltersWithNonEmptyData = (data: (Branch | Atm | RemoteWorkplace)[]) =>
+  Object.keys(INITIAL_FILTRATION_STATE).filter(
+    (_) => data.filter((item) => FILTRATION_PREDICATES[_](item)).length,
   );
-};

package/src/components/OfficesAtmsMap/OfficesMap.tsx

@@ -1,46 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLocation } from '../../hooks/useLocation';
 import { OfficesAtmsMapLayout } from './OfficesAtmsMapLayout';
-import { type Branch, type RemoteWorkplace } from './OfficesAtmsMapProps';
 import { getOfficePoint, renderOfficeCard } from './renderOfficeCard';
 import { getRemoteWorkplacePoint, renderRemoteWorkplaceCard } from './renderRemoteWorkplaceCard';
 import { useOffices } from './useOffices';
 
-const INITIAL_FILTRATION_STATE = {
-  workingSaturday: false,
-  premiumService: false,
-  privateBanking: false,
-  remoteWorkplace: false,
-  serviceDisabledPeople: false,
-  sellingCoins: false,
-  buyingCoins: false,
-  bullionOperations: false,
-  preciousMetalsOperations: false,
-  transferringDataToBiometricSystem: false,
-};
-
-const FILTRATION_PREDICATES = {
-  workingSaturday: (item: Branch | RemoteWorkplace) =>
-    Boolean('workSchedule' in item && item.workSchedule?.workingSaturday),
-  premiumService: (item: Branch | RemoteWorkplace) =>
-    Boolean('premiumService' in item && item.premiumService),
-  privateBanking: (item: Branch | RemoteWorkplace) =>
-    Boolean('privateBanking' in item && item.privateBanking),
-  remoteWorkplace: (item: Branch | RemoteWorkplace) => Boolean('workScheduleDescription' in item),
-  serviceDisabledPeople: (item: Branch | RemoteWorkplace) =>
-    Boolean('serviceDisabledPeople' in item && item.serviceDisabledPeople),
-  sellingCoins: (item: Branch | RemoteWorkplace) =>
-    Boolean('sellingCoins' in item && item.sellingCoins),
-  buyingCoins: (item: Branch | RemoteWorkplace) =>
-    Boolean('buyingCoins' in item && item.buyingCoins),
-  bullionOperations: (item: Branch | RemoteWorkplace) =>
-    Boolean('bullionOperations' in item && item.bullionOperations),
-  preciousMetalsOperations: (item: Branch | RemoteWorkplace) =>
-    Boolean('preciousMetalsOperations' in item && item.preciousMetalsOperations),
-  transferringDataToBiometricSystem: (item: Branch | RemoteWorkplace) =>
-    Boolean('transferringDataToBiometricSystem' in item && item.transferringDataToBiometricSystem),
-};
-
 export interface OfficesMapProps {
   className?: string;
 }
@@ -53,11 +17,9 @@ export const OfficesMap = JSX<OfficesMapProps>(({ className }) => {
   return (
     <OfficesAtmsMapLayout
       className={className}
-      filterItems={filterItems}
       data={data?.branches}
       isLoad={isLoad}
       remoteWorkplaces={data?.remoteWorkplaces}
-      initFilterState={INITIAL_FILTRATION_STATE}
       renderCard={renderOfficeCard}
       renderRemoteWorkplaceCard={renderRemoteWorkplaceCard}
       getBalloon={getOfficePoint}
@@ -66,12 +28,3 @@ export const OfficesMap = JSX<OfficesMapProps>(({ className }) => {
     />
   );
 });
-
-const filterItems = (
-  data: (Branch | RemoteWorkplace)[],
-  filtrationState: Record<string, boolean>,
-) => {
-  const truthyFilters = Object.keys(filtrationState).filter((key) => filtrationState[key]);
-
-  return data.filter((item) => truthyFilters.every((_) => FILTRATION_PREDICATES[_](item)));
-};