fix: correction des conflits avec la branche main #579

IGNF · Jan 7, 2025 · 6c3d5c0 · 6c3d5c0
2 parents 703fb09 + cc5b0e6
commit 6c3d5c0
Show file tree

Hide file tree

Showing 152 changed files with 6,677 additions and 3,874 deletions.
diff --git a/.env b/.env
@@ -34,9 +34,12 @@ HTTPS_PROXY=
 # id du processus d'intégration en base
 API_ENTREPOT_PROC_INT_VECT_FILES_DB=
 
-# id du processus de génération de pyramide
+# id du processus de génération de pyramide vecteur
 API_ENTREPOT_PROC_CREATE_VECT_PYR=
 
+# id du processus de génération de pyramide raster
+API_ENTREPOT_PROC_CREATE_RAST_PYR=
+
 # Id de la community liee au datastore bac a sable
 SANDBOX_COMMUNITY_ID=
 
@@ -47,8 +50,11 @@ SANDBOX_SERVICE_ACCOUNT_CLIENT_SECRET=
 # id du processus d'intégration en base pour le Bac a sable
 SANDBOX_PROC_INT_VECT_FILES_DB=
 
-# id du processus de génération de pyramide pour le Bac a sable
+# id du processus de génération de pyramide vecteur pour le Bac a sable
 SANDBOX_PROC_CREATE_VECT_PYR=
 
+# id du processus de génération de pyramide raster pour le Bac à sable
+SANDBOX_PROC_CREATE_RAST_PYR=
+
 # URL de l'API espace collaboratif
 API_ESPACE_COLLABORATIF_URL=
diff --git a/assets/@types/app.ts b/assets/@types/app.ts
@@ -42,8 +42,12 @@ export type CartesUser = {
     last_name?: string | null;
     roles: string[];
     communities_member: CommunityMemberDto[];
-    account_creation_date: string;
-    last_api_call_date: string;
+    account_creation_date?: string;
+    last_login_date?: string;
+    documents_quota?: number;
+    documents_use?: number;
+    keys_quota?: number;
+    keys_use?: number;
 };
 
 /** datastore */
@@ -83,7 +87,8 @@ export enum DatasheetDocumentTypeEnum {
 
 export type DatasheetDetailed = Datasheet & {
     vector_db_list: VectorDb[] | undefined;
-    pyramid_list: Pyramid[] | undefined;
+    pyramid_vector_list: PyramidVector[] | undefined;
+    pyramid_raster_list: PyramidRaster[] | undefined;
     upload_list: Upload[] | undefined;
     service_list: Service[] | undefined;
 };
@@ -108,7 +113,7 @@ export type VectorDb = StoredData & {
 };
 
 /** stored_data (donnée stockée) du type ROK4-PYRAMID-VECTOR */
-export type Pyramid = StoredData & {
+export type PyramidVector = StoredData & {
     type: StoredDataPrivateDetailResponseDtoTypeEnum.ROK4PYRAMIDVECTOR;
     tags: {
         datasheet_name?: string;
@@ -120,6 +125,18 @@ export type Pyramid = StoredData & {
     };
 };
 
+/** stored_data (donnée stockée) du type ROK4-PYRAMID-VECTOR */
+export type PyramidRaster = StoredData & {
+    type: StoredDataPrivateDetailResponseDtoTypeEnum.ROK4PYRAMIDRASTER;
+    tags: {
+        datasheet_name?: string;
+        upload_id?: string;
+        proc_int_id?: string;
+        vectordb_id?: string;
+        proc_pyr_creat_id?: string;
+    };
+};
+
 /** upload (livraison) */
 export type Upload = UploadPrivateDetailResponseDto & {
     tags: {
@@ -180,7 +197,13 @@ export type TmsMetadata = {
 };
 
 /** configuration & offerings */
-export type Configuration = ConfigurationDetailResponseDto & { styles?: CartesStyle[] };
+export type Configuration = ConfigurationDetailResponseDto & {
+    styles?: CartesStyle[];
+    tags: {
+        datasheet_name?: string;
+    };
+    pyramid?: PyramidVector | PyramidRaster;
+};
 
 export type Offering = OfferingDetailResponseDto;
 export { OfferingStatusEnum } from "./entrepot";

diff --git a/assets/components/Layout/AppLayout.tsx b/assets/components/Layout/AppLayout.tsx
@@ -7,13 +7,13 @@ import { useQuery } from "@tanstack/react-query";
 import { FC, PropsWithChildren, ReactNode, memo, useMemo } from "react";
 
 import { ConsentBannerAndConsentManagement } from "../../config/consentManagement";
-import { defaultNavItems } from "../../config/navItems";
+import { defaultNavItems } from "../../config/navItems/navItems";
 import api from "../../entrepot/api";
 import useDocumentTitle from "../../hooks/useDocumentTitle";
 import { useTranslation } from "../../i18n/i18n";
 import Translator from "../../modules/Translator";
 import RQKeys from "../../modules/entrepot/RQKeys";
-import getBreadcrumb from "../../modules/entrepot/breadcrumbs";
+import getBreadcrumb from "../../modules/entrepot/breadcrumbs/Breadcrumb";
 import { useRoute } from "../../router/router";
 import SessionExpiredAlert from "../Utils/SessionExpiredAlert";
 import SnackbarMessage from "../Utils/SnackbarMessage";

diff --git a/assets/components/Layout/DatastoreLayout.tsx b/assets/components/Layout/DatastoreLayout.tsx
@@ -3,7 +3,7 @@ import { useQuery } from "@tanstack/react-query";
 import { FC, PropsWithChildren, memo, useMemo } from "react";
 
 import { Datastore } from "../../@types/app";
-import { datastoreNavItems } from "../../config/datastoreNavItems";
+import { datastoreNavItems } from "../../config/navItems/datastoreNavItems";
 import api from "../../entrepot/api";
 import RQKeys from "../../modules/entrepot/RQKeys";
 import { CartesApiException } from "../../modules/jsonFetch";

diff --git a/assets/components/Utils/LanguageSelector.tsx b/assets/components/Utils/LanguageSelector.tsx
@@ -2,7 +2,8 @@ import { fr } from "@codegouvfr/react-dsfr";
 import { memo, useId } from "react";
 import { symToStr } from "tsafe/symToStr";
 
-import { languagesDisplayNames, languages, type Language } from "../../i18n/i18n";
+import { Language } from "../../i18n";
+import { languages, languagesDisplayNames } from "../../i18n/types";
 
 type Props = {
     lang: Language;

diff --git a/assets/components/Utils/MenuList.tsx b/assets/components/Utils/MenuList.tsx
@@ -29,7 +29,7 @@ type MenuListItem = MenuListItemCommon &
 
 type MenuListProps = {
     menuOpenButtonProps?: Omit<ButtonProps, "linkProps" | "onClick" | "type" | "disabled">;
-    items: MenuListItem[];
+    items: (MenuListItem | undefined | false)[];
     disabled?: boolean;
 };
 
@@ -48,6 +48,8 @@ const MenuList: FC<MenuListProps> = ({ menuOpenButtonProps, items = [], disabled
         setAnchorEl(null);
     };
 
+    const _items: MenuListItem[] = useMemo(() => items.filter((item) => item !== undefined && item !== false), [items]);
+
     // props du bouton ouvrir menu
     const _menuOpenBtnProps = useMemo<ButtonProps>(() => {
         const _props: ButtonProps = menuOpenButtonProps ? { ...(menuOpenButtonProps as ButtonProps) } : ({} as ButtonProps);
@@ -66,7 +68,7 @@ const MenuList: FC<MenuListProps> = ({ menuOpenButtonProps, items = [], disabled
         return _props;
     }, [menuOpenButtonProps, disabled, isMenuOpen, otherActionsBtnId, otherActionsMenuId]);
 
-    const atLeastOneIcon = useMemo<boolean>(() => items.filter((item) => item.iconId !== undefined).length > 0, [items]);
+    const atLeastOneIcon = useMemo<boolean>(() => _items.filter((item) => item.iconId !== undefined).length > 0, [_items]);
 
     return (
         <>
@@ -91,7 +93,7 @@ const MenuList: FC<MenuListProps> = ({ menuOpenButtonProps, items = [], disabled
                     }}
                 >
                     {disabled === false &&
-                        items.map((item, i) => {
+                        _items.map((item, i) => {
                             const itemContent = (
                                 <MenuItem
                                     key={i}

diff --git a/assets/components/Utils/RangeSlider.tsx b/assets/components/Utils/RangeSlider.tsx
@@ -23,7 +23,6 @@ const RangeSlider: FC<RangeSliderProps> = (props) => {
                     value: v,
                     label: v.toString(),
                 }))}
-                getAriaLabel={() => "Minimum distance"}
                 value={values}
                 onChange={(_, newValue) => {
                     if (!Array.isArray(newValue)) {

diff --git a/assets/components/Utils/TextWithLink.tsx b/assets/components/Utils/TextWithLink.tsx
diff --git a/assets/components/Utils/ZoomRange.tsx b/assets/components/Utils/ZoomRange.tsx
@@ -1,31 +1,38 @@
 import { fr } from "@codegouvfr/react-dsfr";
+import Range, { RangeProps } from "@codegouvfr/react-dsfr/Range";
+import { cx } from "@codegouvfr/react-dsfr/tools/cx";
 import Map, { type MapOptions } from "ol/Map";
 import View, { ViewOptions } from "ol/View";
 import { ScaleLine } from "ol/control";
 import BaseLayer from "ol/layer/Base";
 import TileLayer from "ol/layer/Tile";
 import { fromLonLat } from "ol/proj";
 import WMTS, { optionsFromCapabilities } from "ol/source/WMTS";
-import { FC, memo, useCallback, useEffect, useRef } from "react";
+import { FC, memo, ReactNode, useCallback, useEffect, useRef } from "react";
+import { symToStr } from "tsafe/symToStr";
+import { tss } from "tss-react";
 
 import olDefaults from "../../data/ol-defaults.json";
 import useCapabilities from "../../hooks/useCapabilities";
-import RangeSlider from "./RangeSlider";
 
-import "../../sass/components/zoom-range.scss";
+import imgMapZoomBottom from "../../img/zoom-range/map-zoom-bottom.png";
+import imgMapZoomTop from "../../img/zoom-range/map-zoom-top.png";
 
 type ZoomRangeProps = {
-    min: number;
-    max: number;
+    min: RangeProps["min"];
+    max: RangeProps["min"];
     values: number[];
     onChange: (values: number[]) => void;
+    step?: RangeProps["step"];
     center?: number[];
+    mode?: "top" | "bottom" | "both";
+    overlayContent?: ReactNode;
 };
 
 const ZoomRange: FC<ZoomRangeProps> = (props) => {
     const { data: capabilities } = useCapabilities();
 
-    const { min, max, values, center = olDefaults.center, onChange } = props;
+    const { min, max, values, center = olDefaults.center, onChange, step, mode = "both", overlayContent } = props;
 
     // References sur les deux cartes
     const leftMapRef = useRef<Map>();
@@ -109,15 +116,140 @@ const ZoomRange: FC<ZoomRangeProps> = (props) => {
         rightMapRef.current?.updateSize();
     }, [values]);
 
+    const handleChange = useCallback(
+        (newValue: number, zoomType?: "top" | "bottom") => {
+            switch (zoomType) {
+                case "top":
+                    onChange([newValue, values[1]]);
+                    break;
+                case "bottom":
+                    onChange([values[0], newValue]);
+                    break;
+                default:
+                    onChange([newValue]);
+                    break;
+            }
+        },
+        [onChange, values]
+    );
+
+    const { classes } = useStyles();
+
     return (
         <div className={fr.cx("fr-my-2v")}>
-            <div className="ui-map-zoom-levels">
-                <div ref={leftMapTargetRef} className="ui-top-zoom-level" />
-                <div ref={rightMapTargetRef} className="ui-bottom-zoom-level" />
+            <div className={fr.cx("fr-grid-row")}>
+                {(mode === "both" || mode === "top") && (
+                    <div className={fr.cx("fr-col", "fr-px-2v")}>
+                        <div ref={leftMapTargetRef} className={cx(classes.map)} />
+                    </div>
+                )}
+
+                {mode !== "both" && (
+                    <div className={cx(fr.cx("fr-col", "fr-px-2v"))}>
+                        <div className={cx(classes.falseMapRoot)}>
+                            <img
+                                src={mode === "top" ? imgMapZoomBottom : imgMapZoomTop}
+                                className={cx(classes.map, classes.falseMapImg)}
+                                alt="Illustration d'une carte fixe"
+                            />
+                            <div className={cx(classes.falseMapOverlay)}>
+                                {overlayContent && <div className={cx(fr.cx("fr-m-4v", "fr-p-2v"), classes.falseMapOverlayContent)}>{overlayContent}</div>}
+                            </div>
+                        </div>
+                    </div>
+                )}
+
+                {(mode === "both" || mode === "bottom") && (
+                    <div className={fr.cx("fr-col", "fr-px-2v")}>
+                        <div ref={rightMapTargetRef} className={cx(classes.map)} />
+                    </div>
+                )}
             </div>
-            <RangeSlider min={min} max={max} values={values} onChange={(newValues) => onChange(newValues)} />
+            <Range
+                label=" "
+                min={min}
+                max={max}
+                small={true}
+                step={step}
+                {...(() => {
+                    switch (mode) {
+                        case "top":
+                            return {
+                                nativeInputProps: {
+                                    value: values?.[0] ?? min,
+                                    onChange: (e) => {
+                                        handleChange(e.currentTarget.valueAsNumber);
+                                    },
+                                },
+                            };
+                        case "bottom":
+                            return {
+                                nativeInputProps: {
+                                    value: values?.[0] ?? max,
+                                    onChange: (e) => {
+                                        handleChange(e.currentTarget.valueAsNumber);
+                                    },
+                                },
+                            };
+                        case "both":
+                            return {
+                                double: true,
+                                nativeInputProps: [
+                                    {
+                                        value: values?.[0] ?? min,
+                                        onChange: (e) => {
+                                            handleChange(e.currentTarget.valueAsNumber, "top");
+                                        },
+                                    },
+                                    {
+                                        value: values?.[1] ?? max,
+                                        onChange: (e) => {
+                                            handleChange(e.currentTarget.valueAsNumber, "bottom");
+                                        },
+                                    },
+                                ],
+                            };
+                    }
+                })()}
+            />
         </div>
     );
 };
 
+ZoomRange.displayName = symToStr({ ZoomRange });
+
 export default memo(ZoomRange);
+
+const useStyles = tss.withName(ZoomRange.displayName).create(() => ({
+    map: {
+        height: "300px",
+        width: "100%",
+    },
+    falseMapRoot: {
+        position: "relative",
+        display: "inline-block",
+        width: "100%",
+        height: "300px",
+    },
+    falseMapImg: {
+        display: "block",
+        width: "100%",
+        height: "300px",
+    },
+    falseMapOverlay: {
+        position: "absolute",
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0,
+        display: "flex",
+        justifyContent: "center",
+        alignItems: "center",
+        backgroundColor: "rgba(0, 0, 0, 0.6)",
+        textAlign: "center",
+    },
+    falseMapOverlayContent: {
+        backgroundColor: fr.colors.decisions.background.default.grey.default,
+        color: fr.colors.decisions.text.default.grey.default,
+    },
+}));
diff --git a/assets/config/assistanceNavItems.ts → assets/config/navItems/assistanceNavItems.ts b/assets/config/assistanceNavItems.ts → assets/config/navItems/assistanceNavItems.ts
@@ -1,8 +1,8 @@
 import { MainNavigationProps } from "@codegouvfr/react-dsfr/MainNavigation";
 import { TranslationFunction } from "i18nifty/typeUtils/TranslationFunction";
 
-import { ComponentKey } from "../i18n/i18n";
-import { routes } from "../router/router";
+import { ComponentKey } from "../../i18n/types";
+import { routes } from "../../router/router";
 
 export const assistanceNavItems = (t: TranslationFunction<"navItems", ComponentKey>): MainNavigationProps.Item.Menu => {
     return {