WIP preserve local changes before duckie merge

2026-06-20 07:26:19 +00:00 · 2026-04-21 11:13:32 +02:00
parent e0174e450c
commit 9b36513def
74 changed files with 4419 additions and 408 deletions
@@ -1,13 +1,25 @@
 import { FC } from 'react';
 import { GetConfigurationValue } from '../../api';
+import { useCatalog } from '../../hooks';
 import { CatalogClassicView } from './CatalogClassicView';
 import { CatalogModernView } from './CatalogModernView';

 export const CatalogView: FC<{}> = () =>
 {
+    const { catalogLocalizationVersion = 0 } = useCatalog();
    const useNewStyle = GetConfigurationValue<boolean>('catalog.style.new', false);

-    if(useNewStyle) return <CatalogModernView />;
+    if(useNewStyle) return (
+        <>
+            <div className="hidden" data-catalog-localization-version={ catalogLocalizationVersion } />
+            <CatalogModernView />
+        </>
+    );

-    return <CatalogClassicView />;
+    return (
+        <>
+            <div className="hidden" data-catalog-localization-version={ catalogLocalizationVersion } />
+            <CatalogClassicView />
+        </>
+    );
 };
@@ -1,17 +1,24 @@
 import { GetSessionDataManager, IFurnitureData } from '@nitrots/nitro-renderer';
 import { FC, useEffect, useState } from 'react';
 import { FaSearch, FaTimes } from 'react-icons/fa';
-import { CatalogPage, CatalogType, FilterCatalogNode, FurnitureOffer, GetOfferNodes, ICatalogNode, ICatalogPage, IPurchasableOffer, LocalizeText, PageLocalization, SearchResult } from '../../../../../api';
+import { CatalogPage, CatalogType, FilterCatalogNode, FurnitureOffer, ICatalogNode, ICatalogPage, IPurchasableOffer, LocalizeText, PageLocalization, SearchResult } from '../../../../../api';
 import { useCatalog } from '../../../../../hooks';

 export const CatalogSearchView: FC<{}> = () =>
 {
    const [ searchValue, setSearchValue ] = useState('');
-    const { currentType = null, rootNode = null, offersToNodes = null, searchResult = null, setSearchResult = null, setCurrentPage = null } = useCatalog();
+    const { currentType = null, rootNode = null, searchResult = null, setSearchResult = null, setCurrentPage = null } = useCatalog();
+
+    const normalizeSearchText = (value: string) => (value || '')
+        .toLocaleLowerCase()
+        .normalize('NFD')
+        .replace(/[\u0300-\u036f]/g, '')
+        .replace(/\s+/g, ' ')
+        .trim();

    useEffect(() =>
    {
-        let search = searchValue?.toLocaleLowerCase().replace(' ', '');
+        const search = normalizeSearchText(searchValue);

        if(!search || !search.length)
        {
@@ -22,7 +29,7 @@ export const CatalogSearchView: FC<{}> = () =>

        const timeout = setTimeout(() =>
        {
-            if(!offersToNodes || !rootNode) return;
+            if(!rootNode) return;

            const furnitureDatas = GetSessionDataManager().getAllFurnitureData();

@@ -39,34 +46,35 @@ export const CatalogSearchView: FC<{}> = () =>

                if((currentType === CatalogType.NORMAL) && furniture.excludeDynamic) continue;

-                const searchValues = [ furniture.className || '', furniture.name || '', furniture.description || '' ].join(' ').replace(/ /gi, '').toLowerCase();
+                const name = normalizeSearchText(furniture.name || '');
+                const matchesSearch = name.includes(search);

                if((currentType === CatalogType.BUILDER) && (furniture.purchaseOfferId === -1) && (furniture.rentOfferId === -1))
                {
                    if((furniture.furniLine !== '') && (foundFurniLines.indexOf(furniture.furniLine) < 0))
                    {
-                        if(searchValues.indexOf(search) >= 0) foundFurniLines.push(furniture.furniLine);
+                        if(matchesSearch) foundFurniLines.push(furniture.furniLine);
                    }
                }
-                else
+                else if(matchesSearch)
                {
-                    const foundNodes = [
-                        ...GetOfferNodes(offersToNodes, furniture.purchaseOfferId),
-                        ...GetOfferNodes(offersToNodes, furniture.rentOfferId)
-                    ];
+                    foundFurniture.push(furniture);

-                    if(foundNodes.length)
+                    if(furniture.furniLine && furniture.furniLine.length && (foundFurniLines.indexOf(furniture.furniLine) < 0))
                    {
-                        if(searchValues.indexOf(search) >= 0) foundFurniture.push(furniture);
-
-                        if(foundFurniture.length === 250) break;
+                        foundFurniLines.push(furniture.furniLine);
                    }
+
+                    if(foundFurniture.length === 250) break;
                }
            }

            const offers: IPurchasableOffer[] = [];

-            for(const furniture of foundFurniture) offers.push(new FurnitureOffer(furniture));
+            for(const furniture of foundFurniture)
+            {
+                offers.push(new FurnitureOffer(furniture));
+            }

            let nodes: ICatalogNode[] = [];

@@ -77,7 +85,7 @@ export const CatalogSearchView: FC<{}> = () =>
        }, 300);

        return () => clearTimeout(timeout);
-    }, [ offersToNodes, currentType, rootNode, searchValue, setCurrentPage, setSearchResult ]);
+    }, [ currentType, rootNode, searchValue, setCurrentPage, setSearchResult ]);

    return (
        <div className="relative w-full">
@@ -1,5 +1,5 @@
 import { FC, useCallback, useEffect, useRef, useState } from 'react';
-import { IPurchasableOffer, ProductTypeEnum } from '../../../../../api';
+import { IPurchasableOffer } from '../../../../../api';
 import { AutoGrid, AutoGridProps } from '../../../../../common';
 import { useCatalog } from '../../../../../hooks';
 import { useCatalogAdmin } from '../../../CatalogAdminContext';
@@ -13,7 +13,7 @@ interface CatalogItemGridWidgetViewProps extends AutoGridProps
 export const CatalogItemGridWidgetView: FC<CatalogItemGridWidgetViewProps> = props =>
 {
    const { columnCount = 5, children = null, ...rest } = props;
-    const { currentOffer = null, setCurrentOffer = null, currentPage = null, setPurchaseOptions = null } = useCatalog();
+    const { currentOffer = null, currentPage = null, selectCatalogOffer = null } = useCatalog();
    const catalogAdmin = useCatalogAdmin();
    const adminMode = catalogAdmin?.adminMode ?? false;
    const elementRef = useRef<HTMLDivElement>();
@@ -29,23 +29,7 @@ export const CatalogItemGridWidgetView: FC<CatalogItemGridWidgetViewProps> = pro

    const selectOffer = (offer: IPurchasableOffer) =>
    {
-        offer.activate();
-
-        if(offer.isLazy) return;
-
-        setCurrentOffer(offer);
-
-        if(offer.product && (offer.product.productType === ProductTypeEnum.WALL))
-        {
-            setPurchaseOptions(prevValue =>
-            {
-                const newValue = { ...prevValue };
-
-                newValue.extraData = (offer.product.extraParam || null);
-
-                return newValue;
-            });
-        }
+        selectCatalogOffer(offer);
    };

    const handleDragStart = useCallback((index: number) =>