Move prompt and alert (#990)

src/client/cypress/e2e/editor/completion-v2.cy.js

@@ -2,6 +2,7 @@ import {
   createBorehole,
   startBoreholeEditing,
   loginAsAdmin,
+  handlePrompt,
 } from "../helpers/testHelpers";
 import {
   setInput,
@@ -58,12 +59,6 @@ const isTabSelected = index => {
     .should("eq", "true");
 };
 
-const handlePrompt = (title, action) => {
-  cy.get('[data-cy="prompt"]').should("exist");
-  cy.contains(title);
-  cy.get('[data-cy="prompt-button-' + action + '"]').click();
-};
-
 describe("completion crud tests", () => {
   it("add, edit, copy and delete completions", () => {
     createBorehole({ "extended.original_name": "INTEADAL" }).as("borehole_id");

src/client/cypress/e2e/helpers/testHelpers.js

@@ -366,3 +366,9 @@ export const createStratigraphy = (boreholeId, kindId) => {
     });
   });
 };
+
+export const handlePrompt = (title, action) => {
+  cy.get('[data-cy="prompt"]').should("exist");
+  cy.contains(title);
+  cy.get('[data-cy="prompt-button-' + action + '"]').click();
+};

src/client/src/App.js

@@ -14,8 +14,8 @@ import EditorComponent from "./pages/editor/editorComponent";
 import SettingCmp from "./pages/settings/settingCmp";
 import DataLoader from "./pages/settings/dataLoader";
 import AcceptTerms from "./pages/term/accept";
-import { AlertProvider } from "./commons/alert/alertContext";
-import { AlertBanner } from "./commons/alert/alertBanner";
+import { AlertProvider } from "./components/alert/alertContext";
+import { AlertBanner } from "./components/alert/alertBanner";
 
 const queryClient = new QueryClient();
 

src/client/src/commons/feedback/feedbackComponent.js

@@ -4,7 +4,7 @@ import { connect } from "react-redux";
 import { withTranslation } from "react-i18next";
 
 import { Form, Button } from "semantic-ui-react";
-import { AlertContext } from "../alert/alertContext";
+import { AlertContext } from "../../components/alert/alertContext";
 import { createFeedback } from "../../api-lib/index";
 
 class Feedback extends React.Component {

src/client/src/commons/files/table/editorBoreholeFilesTable.js

@@ -11,7 +11,7 @@ import {
 import FilesTableComponent from "./filesTableComponent";
 import TranslationText from "../../form/translationText";
 import { Button } from "semantic-ui-react";
-import { AlertContext } from "../../alert/alertContext";
+import { AlertContext } from "../../../components/alert/alertContext";
 import { withTranslation } from "react-i18next";
 
 class EditorBoreholeFilesTable extends Component {

src/client/src/commons/form/borehole/boreholeForm.js

@@ -24,7 +24,7 @@ import LocationSegment from "./segments/locationSegment";
 import WaterIngress from "./hydrogeology/waterIngress";
 import GroundwaterLevelMeasurement from "./hydrogeology/groundwaterLevelMeasurement";
 import Hydrotest from "./hydrogeology/hydrotest";
-import { AlertContext } from "../../alert/alertContext";
+import { AlertContext } from "../../../components/alert/alertContext";
 import FieldMeasurement from "./hydrogeology/fieldMeasurement";
 import ChronostratigraphyPanel from "./stratigraphy/chronostratigraphyPanel";
 import LithostratigraphyPanel from "./stratigraphy/lithostratigraphyPanel";

src/client/src/commons/form/borehole/completion/completion.js

@@ -17,7 +17,7 @@ import {
 import CompletionContent from "./completionContent";
 import CompletionHeaderInput from "./completionHeaderInput";
 import CompletionHeaderDisplay from "./completionHeaderDisplay";
-import Prompt from "../../../prompt/prompt";
+import Prompt from "../../../../components/prompt/prompt";
 
 const Completion = props => {
   const { isEditable, boreholeId } = props;

src/client/src/commons/form/borehole/completion/completionHeaderInput.js

@@ -11,7 +11,7 @@ import {
   FormSelect,
   FormCheckbox,
 } from "../../../../components/form/form";
-import Prompt from "../../../prompt/prompt";
+import Prompt from "../../../../components/prompt/prompt";
 
 const CompletionHeaderInput = props => {
   const {

src/client/src/commons/form/borehole/hydrogeology/fieldMeasurementInput.js

@@ -13,7 +13,7 @@ import {
 import { useDomains } from "../../../../api/fetchApiV2";
 import CheckIcon from "@mui/icons-material/Check";
 import { useTranslation } from "react-i18next";
-import { AlertContext } from "../../../alert/alertContext";
+import { AlertContext } from "../../../../components/alert/alertContext";
 import ObservationInput from "./observationInput";
 import { ObservationType } from "./observationType";
 import { hydrogeologySchemaConstants } from "./hydrogeologySchemaConstants";

src/client/src/commons/form/borehole/hydrogeology/groundwaterLevelMeasurementInput.js

@@ -12,7 +12,7 @@ import {
 import { useDomains } from "../../../../api/fetchApiV2";
 import CheckIcon from "@mui/icons-material/Check";
 import { useTranslation } from "react-i18next";
-import { AlertContext } from "../../../alert/alertContext";
+import { AlertContext } from "../../../../components/alert/alertContext";
 import ObservationInput from "./observationInput";
 import { ObservationType } from "./observationType";
 import { hydrogeologySchemaConstants } from "./hydrogeologySchemaConstants";

src/client/src/commons/form/borehole/hydrogeology/hydrotestInput.js

@@ -19,7 +19,7 @@ import AddCircleIcon from "@mui/icons-material/AddCircle";
 import CancelIcon from "@mui/icons-material/Cancel";
 import { useTranslation } from "react-i18next";
 import { useHydrotestDomains, useDomains } from "../../../../api/fetchApiV2";
-import { AlertContext } from "../../../alert/alertContext";
+import { AlertContext } from "../../../../components/alert/alertContext";
 import { ObservationType } from "./observationType";
 import { hydrogeologySchemaConstants } from "./hydrogeologySchemaConstants";
 

src/client/src/commons/form/borehole/hydrogeology/hydrotestResultTable.js

@@ -18,7 +18,7 @@ import DeleteIcon from "@mui/icons-material/Delete";
 import CheckIcon from "@mui/icons-material/Check";
 import { useDomains } from "../../../../api/fetchApiV2";
 import { TestResultParameterUnits } from "./parameterUnits";
-import { AlertContext } from "../../../alert/alertContext";
+import { AlertContext } from "../../../../components/alert/alertContext";
 import { hydrogeologySchemaConstants } from "./hydrogeologySchemaConstants";
 
 const HydrotestResultTable = ({

src/client/src/commons/form/borehole/hydrogeology/waterIngressInput.js

@@ -12,7 +12,7 @@ import {
 import { useDomains } from "../../../../api/fetchApiV2";
 import CheckIcon from "@mui/icons-material/Check";
 import { useTranslation } from "react-i18next";
-import { AlertContext } from "../../../alert/alertContext";
+import { AlertContext } from "../../../../components/alert/alertContext";
 import ObservationInput from "./observationInput";
 import { ObservationType } from "./observationType";
 import { hydrogeologySchemaConstants } from "./hydrogeologySchemaConstants";

src/client/src/commons/form/borehole/segments/indentifierSegment.js

@@ -4,7 +4,7 @@ import _ from "lodash";
 import DomainDropdown from "../../domain/dropdown/domainDropdown";
 import DomainText from "../../domain/domainText";
 import TranslationText from "../../translationText";
-import { AlertContext } from "../../../alert/alertContext";
+import { AlertContext } from "../../../../components/alert/alertContext";
 import { Form, Icon, Input, Segment } from "semantic-ui-react";
 import { removeIdentifier, addIdentifier } from "../../../../api-lib";
 import { useTranslation } from "react-i18next";

src/client/src/commons/form/profile/components/profileAttributes/profileAttributes.js

@@ -13,7 +13,7 @@ import { useTranslation } from "react-i18next";
 import ProfileAttributeList from "./components/profileAttributeList/profileAttributeList";
 import { useSelector } from "react-redux";
 import { useQueryClient } from "react-query";
-import { AlertContext } from "../../../../alert/alertContext";
+import { AlertContext } from "../../../../../components/alert/alertContext";
 import {
   fetchLayerById,
   layerQueryKey,

src/client/src/commons/form/profile/components/profileInfo/profileInfo.js

@@ -12,7 +12,7 @@ import { useTranslation } from "react-i18next";
 import { getData, sendProfile } from "./api";
 import _ from "lodash";
 import useCasingList from "../../hooks/useCasingList";
-import { AlertContext } from "../../../../alert/alertContext";
+import { AlertContext } from "../../../../../components/alert/alertContext";
 
 const ProfileInfo = props => {
   const {

src/client/src/commons/form/profile/components/profileInstrument/components/instrument/Instrument.js

@@ -13,7 +13,7 @@ import {
 } from "../../../../../../../api/fetchApiV2";
 import { NumericFormat } from "react-number-format";
 import { parseIfString } from "../../../../../formUtils";
-import { AlertContext } from "../../../../../../alert/alertContext";
+import { AlertContext } from "../../../../../../../components/alert/alertContext";
 import { produce } from "immer";
 
 const Instrument = props => {

src/client/src/commons/form/profile/components/profileLayers/components/profileLayersError/profileLayersError.js

@@ -8,7 +8,7 @@ import {
   addBedrock,
 } from "../../../../../../../api/fetchApiV2";
 import ErrorTypes from "./errorTypes";
-import { AlertContext } from "../../../../../../alert/alertContext";
+import { AlertContext } from "../../../../../../../components/alert/alertContext";
 
 const ProfileLayersError = props => {
   const {

src/client/src/commons/form/profile/components/profileLayers/components/profileLayersList/profileLayersList.js

@@ -15,7 +15,7 @@ import { NumericFormat } from "react-number-format";
 import { withTranslation } from "react-i18next";
 import * as Styled from "./styles";
 import { deleteLayer } from "../../../../../../../api-lib";
-import { AlertContext } from "../../../../../../alert/alertContext";
+import { AlertContext } from "../../../../../../../components/alert/alertContext";
 import { useLithostratigraphies } from "../../../../../../../api/fetchApiV2";
 
 const ProfileLayersList = props => {

src/client/src/commons/form/profile/components/profileLayers/profileLayers.js

@@ -40,7 +40,7 @@ import {
 import AddCircleIcon from "@mui/icons-material/AddCircle";
 import { withTranslation } from "react-i18next";
 import { useMutation, useQueryClient } from "react-query";
-import { AlertContext } from "../../../../alert/alertContext";
+import { AlertContext } from "../../../../../components/alert/alertContext";
 import { profileKind } from "../../constance";
 
 const ProfileLayers = props => {

src/client/src/commons/form/workflow/workflowForm.js

@@ -24,7 +24,7 @@ import {
   rejectWorkflow,
   resetWorkflow,
 } from "../../../api-lib/index";
-import { AlertContext } from "../../alert/alertContext";
+import { AlertContext } from "../../../components/alert/alertContext";
 import CommentArea from "./commentArea";
 import DateText from "../dateText";
 import TranslationText from "../../form/translationText";

src/client/src/commons/menu/editor/menuEditorSearch.js

@@ -11,7 +11,7 @@ import { Box, Stack, MenuItem, Select, FormControl } from "@mui/material/";
 import { Button, Header, Icon, Menu, Modal, Segment } from "semantic-ui-react";
 
 import { createBorehole } from "../../../api-lib/index";
-import { AlertContext } from "../../alert/alertContext";
+import { AlertContext } from "../../../components/alert/alertContext";
 import SearchEditorComponent from "../../search/editor/searchEditorComponent";
 import { downloadCodelistCsv, importBoreholes } from "../../../api/fetchApiV2";
 import Downloadlink from "../../files/downloadlink";

src/client/src/commons/table/boreholeEditorTable.js

@@ -27,7 +27,7 @@ import {
   getdBoreholeIds,
   deleteBoreholes,
 } from "../../api-lib/index";
-import { AlertContext } from "../alert/alertContext";
+import { AlertContext } from "../../components/alert/alertContext";
 
 class BoreholeEditorTable extends TTable {
   static contextType = AlertContext;

src/client/src/commons/prompt/prompt.js → src/client/src/components/prompt/prompt.js

@@ -12,6 +12,7 @@ import { styled } from "@mui/system";
 
 export const PromptButton = styled(Button)({
   fontFamily: "Lato",
+  fontSize: "16px",
   textTransform: "none",
   color: "rgba(0, 0, 0, 0.8)",
   "&:hover": {

src/client/src/pages/settings/admin/adminSettings.js

@@ -2,7 +2,7 @@ import React from "react";
 import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import { withTranslation } from "react-i18next";
-import { AlertContext } from "../../../commons/alert/alertContext";
+import { AlertContext } from "../../../components/alert/alertContext";
 import { fetchUsers } from "../../../api/fetchApiV2";
 
 import {

src/client/src/pages/settings/components/editorSettingList/mapSettings.js

@@ -13,7 +13,7 @@ import {
   Segment,
 } from "semantic-ui-react";
 import { getWms } from "../../../../api-lib/index";
-import { AlertContext } from "../../../../commons/alert/alertContext";
+import { AlertContext } from "../../../../components/alert/alertContext";
 import TranslationText from "../../../../commons/form/translationText";
 import WMTSCapabilities from "ol/format/WMTSCapabilities";
 import WMSCapabilities from "ol/format/WMSCapabilities";

src/client/src/pages/settings/editor/identifierSettings.js

@@ -2,7 +2,7 @@ import React from "react";
 import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import { withTranslation } from "react-i18next";
-import { AlertContext } from "../../../commons/alert/alertContext";
+import { AlertContext } from "../../../components/alert/alertContext";
 
 import { Button, Icon, Form, Modal, Header } from "semantic-ui-react";
 

src/client/src/pages/settings/explorerSettings.js

@@ -14,7 +14,7 @@ import { lithologyFilterEditorData } from "./data/lithologyFilterEditorData";
 import { lithologyFieldEditorData } from "./data/lithologyFieldEditorData";
 import EditorSettingList from "./components/editorSettingList/editorSettingList";
 import MapSettings from "./components/editorSettingList/mapSettings";
-import { AlertContext } from "../../commons/alert/alertContext";
+import { AlertContext } from "../../components/alert/alertContext";
 
 const projections = {
   "EPSG:21781":

src/client/src/pages/settings/loginScreen.js

@@ -3,7 +3,7 @@ import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import { withTranslation } from "react-i18next";
 import { Button, Form, Modal, TextArea } from "semantic-ui-react";
-import { AlertContext } from "../../commons/alert/alertContext";
+import { AlertContext } from "../../components/alert/alertContext";
 import LoginPreview from "../../commons/form/loginPreview";
 import TranslationKeys from "../../commons/translationKeys";