Merge branch 'develop' into feature/VULCAN-126-fix

src/application/Application.tsx

@@ -15,6 +15,7 @@ import {
   applicationGetStandaloneSettings,
   applicationGetSsoSettings,
   applicationHasReportHelpModalOpen,
+  applicationIsStandalone,
 } from '../application/ApplicationSelectors';
 import {
   createConnectionThunk,
@@ -70,6 +71,7 @@ const Application = ({
   connectionModalOpen,
   reportHelpModalOpen,
   ssoSettings,
+  standalone,
   standaloneSettings,
   aboutModalOpen,
   loadDashboard,
@@ -140,7 +142,8 @@ const Application = ({
       </Suspense>
       <NeoConnectionModal
         open={connectionModalOpen}
-        dismissable={connected}
+        connected={connected}
+        dismissable={!standalone}
         connection={connection}
         ssoSettings={ssoSettings}
         standalone={standaloneSettings.standalone}
@@ -149,6 +152,7 @@ const Application = ({
         onSSOAttempt={onSSOAttempt}
         setConnectionProperties={setConnectionDetails}
         onConnectionModalClose={onConnectionModalClose}
+        setWelcomeScreenOpen={setWelcomeScreenOpen}
       ></NeoConnectionModal>
       <NeoWelcomeScreenModal
         welcomeScreenOpen={welcomeScreenOpen}
@@ -191,6 +195,7 @@ const mapStateToProps = (state) => ({
   shareDetails: applicationGetShareDetails(state),
   oldDashboard: applicationGetOldDashboard(state),
   ssoSettings: applicationGetSsoSettings(state),
+  standalone: applicationIsStandalone(state),
   standaloneSettings: applicationGetStandaloneSettings(state),
   connectionModalOpen: applicationHasConnectionModalOpen(state),
   aboutModalOpen: applicationHasAboutModalOpen(state),

src/modal/ConnectionModal.tsx

@@ -1,21 +1,23 @@
 import React, { useEffect } from 'react';
 import { SSOLoginButton } from '../component/sso/SSOLoginButton';
-import { Button, Dialog, Switch, TextInput, Dropdown, TextLink } from '@neo4j-ndl/react';
-import { PlayIconOutline } from '@neo4j-ndl/react/icons';
+import { Button, Dialog, Switch, TextInput, Dropdown, TextLink, IconButton } from '@neo4j-ndl/react';
+import { PlayIconOutline, ArrowLeftIconOutline } from '@neo4j-ndl/react/icons';
 /**
  * Configures setting the current Neo4j database connection for the dashboard.
  */
 export default function NeoConnectionModal({
+  connected,
   open,
   standalone,
   standaloneSettings,
   ssoSettings,
   connection,
-  dismissable = false,
+  dismissable,
   createConnection,
   setConnectionProperties,
   onConnectionModalClose,
   onSSOAttempt,
+  setWelcomeScreenOpen,
 }) {
   const protocols = ['neo4j', 'neo4j+s', 'neo4j+ssc', 'bolt', 'bolt+s', 'bolt+ssc'];
   const [ssoVisible, setSsoVisible] = React.useState(ssoSettings.ssoEnabled);
@@ -48,10 +50,13 @@ export default function NeoConnectionModal({
         size='small'
         open={open}
         onClose={() => {
-          dismissable ? onConnectionModalClose() : null;
+          onConnectionModalClose();
+          if (!connected) {
+            setWelcomeScreenOpen(true);
+          }
         }}
         aria-labelledby='form-dialog-title'
-        disableCloseButton
+        disableCloseButton={!dismissable}
       >
         <Dialog.Header id='form-dialog-title'>{standalone ? 'Connect to Dashboard' : 'Connect to Neo4j'}</Dialog.Header>
         <Dialog.Content className='n-flex n-flex-col n-gap-token-4'>