Merge remote-tracking branch 'refs/remotes/origin/main' into migrate-…

…workgroup-api

# Conflicts:
#	src/client/src/pages/settings/admin/adminSettings.jsx

src/api-legacy/main.py

@@ -151,7 +151,7 @@ async def close(application):
         (r'/api/v1/borehole/stratigraphy/layer', LayerViewerHandler),
         (r'/api/v1/borehole/stratigraphy/layer/edit', LayerProducerHandler),
 
-        # Profile Layer handlers
+        # Lithology Layer handlers
         (r'/api/v1/borehole/profile/layer', ProfileLayerViewerHandler),
 
         # Other handlers

src/client/cypress/e2e/boreholeList.cy.js

@@ -139,6 +139,7 @@ describe("Borehole list tests", () => {
     returnToOverview();
 
     // verify current page is still 4
+    cy.get('[data-cy="showTableButton"]').click();
     cy.get("a").should("have.class", "active item").contains("4");
     cy.get("tbody").children().eq(0).contains("td", "Christine Schuster");
     cy.get("tbody").children().eq(1).contains("td", "Christine Wilderman");

src/client/cypress/e2e/editor/boreholeEditorTable.cy.js

@@ -27,6 +27,7 @@ describe("Borehole editor table tests", () => {
     returnToOverview();
 
     // verify current page is 2
+    cy.get('[data-cy="showTableButton"]').click();
     cy.get("a").should("have.class", "active item").contains("2");
     cy.get("tbody").children().eq(0).contains("td", "Andres Miller");
     cy.get("tbody").children().eq(1).contains("td", "Andres Renner");

src/client/src/App.tsx

@@ -4,17 +4,17 @@ import { QueryClient, QueryClientProvider } from "react-query";
 import { ReactQueryDevtools } from "react-query/devtools";
 import { ThemeProvider } from "@mui/material/styles";
 import { theme } from "./AppTheme";
-import EditorComponent from "./pages/editor/editorComponent";
-import SettingCmp from "./pages/settings/settingCmp";
+import OverviewPage from "./pages/overview/overviewPage";
+import SettingCmp from "./pages/settings/settingsPage";
 import { DataLoader } from "./pages/settings/dataLoader";
-import AcceptTerms from "./pages/term/accept";
+import AcceptTerms from "./term/accept";
 import { AlertProvider } from "./components/alert/alertContext";
 import { AlertBanner } from "./components/alert/alertBanner";
 import { DataCardProvider } from "./components/dataCard/dataCardContext.jsx";
 import { PromptProvider } from "./components/prompt/promptContext.tsx";
 import { Prompt } from "./components/prompt/prompt.tsx";
 import { BasemapProvider } from "./components/basemapSelector/basemapContext.tsx";
-import { FilterProvider } from "./components/filter/filterContext.tsx";
+import { FilterProvider } from "./pages/overview/sidePanelContent/filter/filterContext.tsx";
 
 const queryClient = new QueryClient();
 
@@ -53,7 +53,7 @@ class App extends React.Component {
                             <Route render={props => <SettingCmp {...props} />} key={1} path={"/setting"} />
                             <Route
                               render={props => {
-                                return <EditorComponent {...props} />;
+                                return <OverviewPage {...props} />;
                               }}
                               exact={false}
                               key={0}

src/client/src/commons/auth/AuthOverlay.tsx → src/client/src/auth/AuthOverlay.tsx

@@ -3,8 +3,8 @@ import { useAuth } from "react-oidc-context";
 import { useTranslation } from "react-i18next";
 import { useDispatch, useSelector } from "react-redux";
 import { Alert, Button, CircularProgress } from "@mui/material";
-import { loadUser } from "../../api-lib";
-import { SplashScreen } from "./SplashScreen";
+import { loadUser } from "../api-lib";
+import { SplashScreen } from "./SplashScreen.tsx";
 
 interface AuthOverlayProps {
   children?: React.ReactNode;

src/client/src/commons/auth/AuthenticationStoreSync.js → src/client/src/auth/AuthenticationStoreSync.js

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import { useAuth } from "react-oidc-context";
 import { useDispatch } from "react-redux";
-import { setAuthentication, unsetAuthentication } from "../../api-lib";
+import { setAuthentication, unsetAuthentication } from "../api-lib";
 
 export const AuthenticationStoreSync = () => {
   const auth = useAuth();

src/client/src/commons/auth/SplashScreen.tsx → src/client/src/auth/SplashScreen.tsx

@@ -1,9 +1,9 @@
 import React from "react";
 import { Stack, Typography } from "@mui/material";
 import styled from "@mui/material/styles/styled";
-import TranslationKeys from "../translationKeys";
+import TranslationKeys from "./translationKeys";
 import { useTranslation } from "react-i18next";
-import { theme } from "../../AppTheme";
+import { theme } from "../AppTheme.ts";
 
 interface AuthOverlayProps {
   children?: React.ReactNode;

src/client/src/auth/translationKeys/index.js

@@ -0,0 +1 @@
+export { default } from "./translationKeys.jsx";

src/client/src/commons/translationKeys/translationKeys.jsx → src/client/src/auth/translationKeys/translationKeys.jsx

@@ -1,5 +1,5 @@
 import { useState, useEffect } from "react";
-import * as Styled from "./styles";
+import * as Styled from "./styles.js";
 import { withTranslation } from "react-i18next";
 
 const TranslationKeys = prop => {

src/client/src/components/buttons/buttons.tsx

@@ -1,5 +1,5 @@
 import { forwardRef } from "react";
-import TranslationText from "../../commons/form/translationText";
+import TranslationText from "../legacyComponents/translationText";
 import { Button } from "@mui/material";
 import AddIcon from "@mui/icons-material/Add";
 import EditIcon from "../../assets/icons/edit.svg?react";

src/client/src/components/dataCard/dataCards.jsx

@@ -4,7 +4,7 @@ import { CircularProgress, Typography } from "@mui/material";
 import { DataCard, DataCardButtonContainer, DataCardContainer, DataCardItem } from "./dataCard";
 import { DataCardContext, DataCardSwitchContext } from "./dataCardContext";
 import { AddButton } from "../buttons/buttons.tsx";
-import { FullPage, FullPageCentered } from "../styledComponents";
+import { FullPage, FullPageCentered } from "../styledComponents.js";
 
 const DataCardsContainer = props => {
   return <DataCardContainer>{props.children()}</DataCardContainer>;

src/client/src/components/dataCard/dataDisplayCard.jsx

@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
 import { DataCardButtonContainer } from "./dataCard.jsx";
 import { DataCardContext, DataCardSwitchContext } from "./dataCardContext";
 import { PromptContext } from "../prompt/promptContext.tsx";
-import { StackFullWidth } from "../styledComponents";
+import { StackFullWidth } from "../styledComponents.js";
 import { DeleteButton, EditButton } from "../buttons/buttons.tsx";
 import TrashIcon from "../../assets/icons/trash.svg?react";
 

src/client/src/components/dataCard/dataInputCard.jsx

@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
 import { FormProvider, useForm } from "react-hook-form";
 import { DataCardButtonContainer } from "./dataCard.jsx";
 import { DataCardContext, DataCardSwitchContext } from "./dataCardContext.jsx";
-import { StackFullWidth } from "../styledComponents";
+import { StackFullWidth } from "../styledComponents.js";
 import { CancelButton, SaveButton } from "../buttons/buttons.tsx";
 import { PromptContext } from "../prompt/promptContext.tsx";
 

src/client/src/components/form/formResultTableDisplay.tsx

@@ -1,8 +1,8 @@
 import React, { ReactNode } from "react";
 import { useTranslation } from "react-i18next";
-import { Table, TableHead, TableBody, TableContainer, TableRow, Typography } from "@mui/material";
-import { FieldMeasurementResult } from "../../commons/form/borehole/hydrogeology/FieldMeasurementInterface";
-import { HydrotestResult } from "../../commons/form/borehole/hydrogeology/HydrotestInterface";
+import { Table, TableBody, TableContainer, TableHead, TableRow, Typography } from "@mui/material";
+import { FieldMeasurementResult } from "../../pages/detail/form/hydrogeology/FieldMeasurementInterface.ts";
+import { HydrotestResult } from "../../pages/detail/form/hydrogeology/HydrotestInterface.ts";
 
 interface FormResultTableDisplayProps {
   title: string;

src/client/src/commons/menu/headerComponent.tsx → src/client/src/components/header/headerComponent.tsx

@@ -1,8 +1,8 @@
 import { Box, Stack } from "@mui/material";
-import { theme } from "../../AppTheme";
-import { VersionTag } from "./versionTag";
-import { ProfilePopup } from "./profilePopup";
-import { ReduxRootState, User } from "../../api-lib/ReduxStateInterfaces";
+import { theme } from "../../AppTheme.ts";
+import { VersionTag } from "./versionTag.tsx";
+import { ProfilePopup } from "./profilePopup.tsx";
+import { ReduxRootState, User } from "../../api-lib/ReduxStateInterfaces.ts";
 import { useSelector } from "react-redux";
 import { LanguagePopup } from "./languagePopup.tsx";
 

src/client/src/commons/menu/profilePopup.tsx → src/client/src/components/header/profilePopup.tsx

@@ -2,7 +2,7 @@ import { useAuth } from "react-oidc-context";
 import { Button, IconButton, Popover, Stack, Typography } from "@mui/material";
 import { theme } from "../../AppTheme.ts";
 import ProfileIcon from "../../assets/icons/profile.svg?react";
-import { UserData } from "../../api-lib/ReduxStateInterfaces";
+import { UserData } from "../../api-lib/ReduxStateInterfaces.ts";
 import { MouseEvent, useState } from "react";
 
 export function ProfilePopup({ user }: { user: UserData }) {

src/client/src/commons/menu/versionTag.tsx → src/client/src/components/header/versionTag.tsx

@@ -1,5 +1,5 @@
 import { Box, Typography } from "@mui/material";
-import { theme } from "../../AppTheme";
+import { theme } from "../../AppTheme.ts";
 
 const shortenedVersion = import.meta.env.VITE_APP_VERSION.split("+")[0];
 

src/client/src/commons/form/domain/domainText.jsx → src/client/src/components/legacyComponents/domain/domainText.jsx

@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { withTranslation } from "react-i18next";
 
-import { loadDomains } from "../../../api-lib/index";
+import { loadDomains } from "../../../api-lib/index.js";
 
 class DomainText extends React.Component {
   componentDidMount() {

src/client/src/commons/form/domain/dropdown/domainDropdown.jsx → src/client/src/components/legacyComponents/domain/dropdown/domainDropdown.jsx

@@ -4,10 +4,10 @@ import { connect } from "react-redux";
 import { withTranslation } from "react-i18next";
 import _ from "lodash";
 
-import { loadDomains } from "../../../../api-lib/index";
+import { loadDomains } from "../../../../api-lib/index.js";
 
 import { Form, Header } from "semantic-ui-react";
-import TranslationText from "../../translationText";
+import TranslationText from "../../translationText.jsx";
 
 class DomainDropdown extends React.Component {
   constructor(props) {

src/client/src/commons/form/domain/tree/domainTree.jsx → src/client/src/components/legacyComponents/domain/tree/domainTree.jsx

@@ -3,10 +3,10 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { withTranslation } from "react-i18next";
 import _ from "lodash";
-import { loadDomains } from "../../../../api-lib/index";
+import { loadDomains } from "../../../../api-lib/index.js";
 import { Dropdown, Form, Header, Icon, Input, List, Modal } from "semantic-ui-react";
-import TranslationText from "../../translationText";
-import DomainText from "../domainText";
+import TranslationText from "../../translationText.jsx";
+import DomainText from "../domainText.jsx";
 
 class DomainTree extends React.Component {
   constructor(props) {

src/client/src/commons/form/multiple/multipleForm.jsx → src/client/src/components/legacyComponents/multiple/multipleForm.jsx

@@ -5,15 +5,15 @@ import { withTranslation } from "react-i18next";
 import _ from "lodash";
 import { produce } from "immer";
 
-import DomainDropdown from "../domain/dropdown/domainDropdown";
-import DomainTree from "../domain/tree/domainTree";
-import DateField from "../dateField";
-import TranslationText from "../translationText";
+import DomainDropdown from "../domain/dropdown/domainDropdown.jsx";
+import DomainTree from "../domain/tree/domainTree.jsx";
+import DateField from "../dateField.jsx";
+import TranslationText from "../translationText.jsx";
 
 import { Button, Form, Header, Input } from "semantic-ui-react";
 import { FormControl, FormControlLabel, Radio, RadioGroup } from "@mui/material";
 
-import { patchBoreholes } from "../../../api-lib/index";
+import { patchBoreholes } from "../../../api-lib/index.js";
 
 class MultipleForm extends React.Component {
   constructor(props) {

src/client/src/commons/map/mapComponent.jsx → src/client/src/components/map/mapComponent.jsx

@@ -18,16 +18,16 @@ import { createEmpty, extend } from "ol/extent";
 import { get as getProjection } from "ol/proj";
 import { register } from "ol/proj/proj4";
 import proj4 from "proj4";
-import { getGeojson } from "../../api-lib/index";
+import { getGeojson } from "../../api-lib";
 import { Box } from "@mui/material";
-import ZoomControls from "./zoomControls";
-import NamePopup from "./namePopup";
-import { BasemapSelector } from "../../components/basemapSelector/basemapSelector";
-import { swissExtent, updateBasemap } from "../../components/basemapSelector/basemaps";
-import { BasemapContext } from "../../components/basemapSelector/basemapContext";
-import { clusterStyleFunction, drawStyle, styleFunction } from "./mapStyleFunctions";
-import { projections } from "./mapProjections";
-import { theme } from "../../AppTheme";
+import ZoomControls from "./zoomControls.jsx";
+import NamePopup from "./namePopup.jsx";
+import { BasemapSelector } from "../basemapSelector/basemapSelector.tsx";
+import { swissExtent, updateBasemap } from "../basemapSelector/basemaps.ts";
+import { BasemapContext } from "../basemapSelector/basemapContext.tsx";
+import { clusterStyleFunction, drawStyle, styleFunction } from "./mapStyleFunctions.js";
+import { projections } from "./mapProjections.js";
+import { theme } from "../../AppTheme.ts";
 import Draw from "ol/interaction/Draw.js";
 import { withTranslation } from "react-i18next";
 

src/client/src/commons/map/pointComponent.jsx → src/client/src/components/map/pointComponent.jsx

@@ -14,14 +14,14 @@ import { register } from "ol/proj/proj4";
 import proj4 from "proj4";
 import { Button, Icon, Label, Segment } from "semantic-ui-react";
 import { Box } from "@mui/material";
-import { getHeight } from "../../api-lib/index";
-import { fetchApiV2 } from "../../api/fetchApiV2";
-import ZoomControls from "./zoomControls";
-import { BasemapSelector } from "../../components/basemapSelector/basemapSelector";
-import { attributions, crossOrigin, swissExtent, updateBasemap } from "../../components/basemapSelector/basemaps";
-import { BasemapContext } from "../../components/basemapSelector/basemapContext";
-import { projections } from "../../commons/map/mapProjections";
-import { detailMapStyleFunction } from "../../commons/map/mapStyleFunctions";
+import { getHeight } from "../../api-lib";
+import { fetchApiV2 } from "../../api/fetchApiV2.js";
+import ZoomControls from "./zoomControls.jsx";
+import { BasemapSelector } from "../basemapSelector/basemapSelector.tsx";
+import { attributions, crossOrigin, swissExtent, updateBasemap } from "../basemapSelector/basemaps.ts";
+import { BasemapContext } from "../basemapSelector/basemapContext.tsx";
+import { projections } from "./mapProjections.js";
+import { detailMapStyleFunction } from "./mapStyleFunctions.js";
 import TileLayer from "ol/layer/Tile.js";
 import XYZ from "ol/source/XYZ.js";