@redneckz/wildless-cms-uni-blocks 0.14.898 → 0.14.899

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

@@ -18,6 +18,12 @@ export const INITIAL_FILTRATION_STATE = {
   bullionOperations: false,
   preciousMetalsOperations: false,
   transferringDataToBiometricSystem: false,
+  hasAccessibilitySign: false,
+  equippedWithRamp: false,
+  equippedWithLift: false,
+  equippedWithElevator: false,
+  equippedWithStairclimber: false,
+  hasHelpMeButton: false,
   ...ATMS_INITIAL_FILTRATION_STATE,
 };
 
@@ -39,6 +45,12 @@ export const FILTRATION_LABELS = {
   serviceDisabledPeople: 'Для маломобильных граждан',
   workAllTime: 'Круглосуточно',
   workingSaturday: 'Открыты по субботам',
+  hasAccessibilitySign: 'Без барьеров',
+  equippedWithRamp: 'Есть пандус',
+  equippedWithLift: 'Есть подъёмник',
+  equippedWithElevator: 'Есть лифт',
+  equippedWithStairclimber: 'Есть лестницеход',
+  hasHelpMeButton: 'Есть кнопка «HELP ME»',
 };
 
 const FILTRATION_PREDICATES_ATMS = {
@@ -71,4 +83,16 @@ export const FILTRATION_PREDICATES = {
     Boolean('preciousMetalsOperations' in item && item.preciousMetalsOperations),
   transferringDataToBiometricSystem: (item: Branch | RemoteWorkplace) =>
     Boolean('transferringDataToBiometricSystem' in item && item.transferringDataToBiometricSystem),
+  hasAccessibilitySign: (item: Branch | RemoteWorkplace) =>
+    Boolean('hasAccessibilitySign' in item && item.hasAccessibilitySign),
+  equippedWithRamp: (item: Branch | RemoteWorkplace) =>
+    Boolean('equippedWithRamp' in item && item.equippedWithRamp),
+  equippedWithLift: (item: Branch | RemoteWorkplace) =>
+    Boolean('equippedWithLift' in item && item.equippedWithLift),
+  equippedWithElevator: (item: Branch | RemoteWorkplace) =>
+    Boolean('equippedWithElevator' in item && item.equippedWithElevator),
+  equippedWithStairclimber: (item: Branch | RemoteWorkplace) =>
+    Boolean('equippedWithStairclimber' in item && item.equippedWithStairclimber),
+  hasHelpMeButton: (item: Branch | RemoteWorkplace) =>
+    Boolean('hasHelpMeButton' in item && item.hasHelpMeButton),
 };

package/package.json

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

package/src/components/OfficesAtmsMap/FiltrationForm.tsx

@@ -8,8 +8,32 @@ import { DefaultFoldButton } from '../../ui-kit/Foldable/DefaultFoldButton';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';
 import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
 import { Icon } from '../../ui-kit/Icon/Icon';
+import { Text } from '../../ui-kit/Text/Text';
 
 const COMMON_FILTERS_STYLES = 'flex flex-col sm:flex-row sm:flex-wrap gap-3xl pb-2xl';
+const VISIBLE_FILTERS = [
+  'workingSaturday',
+  'premiumService',
+  'privateBanking',
+  'remoteWorkplace',
+  'serviceDisabledPeople',
+  'transferringDataToBiometricSystem',
+];
+const PRECIOUS_METALS_FILTERS = [
+  'sellingCoins',
+  'buyingCoins',
+  'bullionOperations',
+  'preciousMetalsOperations',
+];
+const DISABLED_SERVICE_FILTERS = [
+  'hasAccessibilitySign',
+  'equippedWithRamp',
+  'equippedWithLift',
+  'equippedWithElevator',
+  'equippedWithStairclimber',
+  'hasHelpMeButton',
+];
+const VISIBLE_ATMS_FILTERS_NUM = 6;
 
 export interface RenderFiltrationFormProps {
   filters: string[];
@@ -18,18 +42,25 @@ export interface RenderFiltrationFormProps {
   labels: Record<string, string>;
 }
 
-export const FiltrationForm = JSX<RenderFiltrationFormProps>(
-  ({ filters, field: { field, reset }, onlyOffice, labels }) => {
-    const visibleFiltersNum = onlyOffice ? 5 : 6;
+type getFilterProps = {
+  onlyOffice?: boolean;
+  filtersCheckbox?: filtersCheckboxType[];
+};
 
-    const filtersCheckbox = (filters || []).map((key) => (
+type filtersCheckboxType = {
+  key: string;
+};
+
+export const FiltrationForm = JSX<RenderFiltrationFormProps>(
+  ({ filters = [], field: { field, reset }, onlyOffice, labels }) => {
+    const filtersCheckbox = filters.map((key) => (
       <Checkbox key={key} text={labels[key]} {...field(key)} />
     ));
 
-    const [visibleFilters, hiddenFilters] =
-      visibleFiltersNum > 0
-        ? [filtersCheckbox.slice(0, visibleFiltersNum), filtersCheckbox.slice(visibleFiltersNum)]
-        : [filtersCheckbox, []];
+    const [visibleFilters, hiddenPreciousMetalsFilters, hiddenDisabledServiceFilters] = getFilters({
+      onlyOffice,
+      filtersCheckbox,
+    });
 
     const [isUnfolded, { toggle }] = useBool(false);
 
@@ -40,11 +71,8 @@ export const FiltrationForm = JSX<RenderFiltrationFormProps>(
             <Foldable>
               <div>
                 <div className={COMMON_FILTERS_STYLES}>{visibleFilters}</div>
-                <FoldableSection className={COMMON_FILTERS_STYLES} isUnfolded={isUnfolded}>
-                  {hiddenFilters}
-                </FoldableSection>
               </div>
-              <div className="flex space-x-lg">
+              <div className="flex space-x-lg pb-2xl">
                 {onlyOffice ? (
                   <DefaultFoldButton
                     label={isUnfolded ? 'Меньше фильтров' : 'Больше фильтров'}
@@ -59,6 +87,15 @@ export const FiltrationForm = JSX<RenderFiltrationFormProps>(
                   <Icon name="CloseIcon" size="small" />
                 </Button>
               </div>
+              <div>
+                <FoldableSection isUnfolded={isUnfolded}>
+                  {renderFoldableSubsection('Драгоценные металлы', hiddenPreciousMetalsFilters)}
+                  {renderFoldableSubsection(
+                    'Специальные возможности',
+                    hiddenDisabledServiceFilters,
+                  )}
+                </FoldableSection>
+              </div>
             </Foldable>
           </div>
         ) : null}
@@ -66,3 +103,45 @@ export const FiltrationForm = JSX<RenderFiltrationFormProps>(
     );
   },
 );
+
+const getFilters = ({ onlyOffice = false, filtersCheckbox = [] }: getFilterProps) => {
+  return onlyOffice ? getOfficeFilters(filtersCheckbox) : getAtmsFilters(filtersCheckbox);
+};
+
+const getOfficeFilters = (filtersCheckbox: filtersCheckboxType[]) => {
+  const visibleFilters: filtersCheckboxType[] = [];
+  const preciousMetalsFilters: filtersCheckboxType[] = [];
+  const disabledServiceFilters: filtersCheckboxType[] = [];
+
+  for (const item of filtersCheckbox) {
+    if (VISIBLE_FILTERS.includes(item.key)) {
+      visibleFilters.push(item);
+    }
+    if (PRECIOUS_METALS_FILTERS.includes(item.key)) {
+      preciousMetalsFilters.push(item);
+    }
+    if (DISABLED_SERVICE_FILTERS.includes(item.key)) {
+      disabledServiceFilters.push(item);
+    }
+  }
+
+  return [visibleFilters, preciousMetalsFilters, disabledServiceFilters];
+};
+
+const getAtmsFilters = (filtersCheckbox: filtersCheckboxType[]) => [
+  filtersCheckbox.slice(0, VISIBLE_ATMS_FILTERS_NUM),
+  filtersCheckbox.slice(VISIBLE_ATMS_FILTERS_NUM),
+];
+
+const renderFoldableSubsection = (text: string, filters: filtersCheckboxType[] = []) => {
+  return (
+    <div>
+      {filters.length > 0 ? (
+        <div className="space-y-s">
+          <Text>{text}</Text>
+          <div className={COMMON_FILTERS_STYLES}>{filters}</div>
+        </div>
+      ) : null}
+    </div>
+  );
+};

package/src/components/OfficesAtmsMap/OfficesAtmsMapProps.tsx

@@ -82,6 +82,12 @@ export interface Branch {
   preciousMetalsOperations?: false;
   transferringDataToBiometricSystem?: false;
   serviceDisabledPeople?: false;
+  hasAccessibilitySign?: boolean;
+  equippedWithRamp?: boolean;
+  equippedWithLift?: boolean;
+  equippedWithElevator?: boolean;
+  equippedWithStairclimber?: boolean;
+  hasHelpMeButton?: boolean;
 }
 
 export interface RemoteWorkplace extends DescriptionProps {

package/src/components/OfficesAtmsMap/filters.ts

@@ -18,6 +18,12 @@ export const INITIAL_FILTRATION_STATE = {
   bullionOperations: false,
   preciousMetalsOperations: false,
   transferringDataToBiometricSystem: false,
+  hasAccessibilitySign: false,
+  equippedWithRamp: false,
+  equippedWithLift: false,
+  equippedWithElevator: false,
+  equippedWithStairclimber: false,
+  hasHelpMeButton: false,
   ...ATMS_INITIAL_FILTRATION_STATE,
 };
 
@@ -39,6 +45,12 @@ export const FILTRATION_LABELS = {
   serviceDisabledPeople: 'Для маломобильных граждан',
   workAllTime: 'Круглосуточно',
   workingSaturday: 'Открыты по субботам',
+  hasAccessibilitySign: 'Без барьеров',
+  equippedWithRamp: 'Есть пандус',
+  equippedWithLift: 'Есть подъёмник',
+  equippedWithElevator: 'Есть лифт',
+  equippedWithStairclimber: 'Есть лестницеход',
+  hasHelpMeButton: 'Есть кнопка «HELP ME»',
 };
 
 const FILTRATION_PREDICATES_ATMS = {
@@ -71,4 +83,16 @@ export const FILTRATION_PREDICATES = {
     Boolean('preciousMetalsOperations' in item && item.preciousMetalsOperations),
   transferringDataToBiometricSystem: (item: Branch | RemoteWorkplace) =>
     Boolean('transferringDataToBiometricSystem' in item && item.transferringDataToBiometricSystem),
+  hasAccessibilitySign: (item: Branch | RemoteWorkplace) =>
+    Boolean('hasAccessibilitySign' in item && item.hasAccessibilitySign),
+  equippedWithRamp: (item: Branch | RemoteWorkplace) =>
+    Boolean('equippedWithRamp' in item && item.equippedWithRamp),
+  equippedWithLift: (item: Branch | RemoteWorkplace) =>
+    Boolean('equippedWithLift' in item && item.equippedWithLift),
+  equippedWithElevator: (item: Branch | RemoteWorkplace) =>
+    Boolean('equippedWithElevator' in item && item.equippedWithElevator),
+  equippedWithStairclimber: (item: Branch | RemoteWorkplace) =>
+    Boolean('equippedWithStairclimber' in item && item.equippedWithStairclimber),
+  hasHelpMeButton: (item: Branch | RemoteWorkplace) =>
+    Boolean('hasHelpMeButton' in item && item.hasHelpMeButton),
 };