Fix alias in database picker (#1865)

* fix e2e test

* fix review

* update snapshot

* update test

Author: OskarDamkjaer

e2e_tests/integration/auto-prefix.spec.ts

@@ -44,21 +44,19 @@ describe(':auto prefix in browser', () => {
     })
   }
 
-  if (Cypress.config('serverVersion') >= 4.4) {
+  if (Cypress.config('serverVersion') >= 5) {
     it('shows help link when running CALL IN TRANSACTIONS without :auto', () => {
-      cy.executeCommand(
-        `MATCH (n) WITH n CALL {{} CALL db.ping() YIELD success {}} IN TRANSACTIONS`
-      )
+      cy.executeCommand(`CALL {{} RETURN 2 as x {}} IN TRANSACTIONS RETURN 2;`)
       cy.getFrames().contains('ERROR')
       cy.getFrames().contains(':auto')
     })
 
     it('adding :auto enables running CALL IN TRANSACTIONS', () => {
       cy.executeCommand(
-        `:auto MATCH (n) WITH n CALL {{} CALL db.ping() YIELD success {}} IN TRANSACTIONS`
+        `:auto CALL {{} RETURN 2 as x {}} IN TRANSACTIONS RETURN 2;`
       )
       cy.getFrames().should('not.contain', 'ERROR')
-      cy.getFrames().contains('(no changes, no records)')
+      cy.getFrames().contains('Started streaming 1 rec')
     })
   }
 

src/browser/modules/DBMSInfo/DatabaseSelector.tsx

@@ -95,35 +95,19 @@ export const DatabaseSelector = ({
             <option value={EMPTY_OPTION}>{EMPTY_OPTION}</option>
           )}
 
-          {databasesAndAliases.map(dbOrAlias => {
-            //If alias
-            if ('databaseName' in dbOrAlias) {
-              return (
-                <option
-                  key={dbOrAlias.name}
-                  value={dbOrAlias.databaseName}
-                  disabled={dbOrAlias.status === 'unknown'}
-                >
-                  {dbOrAlias.name}
-                </option>
-              )
-            }
-
-            //If database
-            return (
-              <option
-                key={dbOrAlias.name}
-                value={dbOrAlias.name}
-                disabled={dbOrAlias.status === 'unknown'}
-              >
-                {dbOrAlias.name}
-                {dbOrAlias === homeDb ? NBSP_CHAR + HOUSE_EMOJI : ''}
-                {dbOrAlias.status === 'unknown'
-                  ? NBSP_CHAR + HOUR_GLASS_EMOJI
-                  : ''}
-              </option>
-            )
-          })}
+          {databasesAndAliases.map(dbOrAlias => (
+            <option
+              key={dbOrAlias.name}
+              value={dbOrAlias.name}
+              disabled={dbOrAlias.status === 'unknown'}
+            >
+              {dbOrAlias.name}
+              {dbOrAlias === homeDb ? NBSP_CHAR + HOUSE_EMOJI : ''}
+              {dbOrAlias.status === 'unknown'
+                ? NBSP_CHAR + HOUR_GLASS_EMOJI
+                : ''}
+            </option>
+          ))}
         </Select>
       </DrawerSectionBody>
     </DrawerSection>

src/browser/modules/Stream/CypherFrame/CodeView.tsx

@@ -94,6 +94,10 @@ export class CodeViewComponent extends Component<any> {
       <PaddedDiv>
         <StyledTable>
           <StyledTBody>
+            <StyledAlteringTr>
+              <StyledStrongTd>Server version</StyledStrongTd>
+              <StyledTd>{request.result.summary.server.agent}</StyledTd>
+            </StyledAlteringTr>
             <StyledAlteringTr>
               <StyledStrongTd>Server address</StyledStrongTd>
               <StyledTd>{request.result.summary.server.address}</StyledTd>

src/browser/modules/Stream/CypherFrame/__snapshots__/CodeView.test.tsx.snap

@@ -37,6 +37,18 @@ exports[`CodeViews CodeView displays request and response info if successful que
       <tbody
         class="sc-jeraig geBIAF"
       >
+        <tr
+          class="sc-nVkyK iDrzMo"
+        >
+          <td
+            class="sc-hiwPVj dBfpwL"
+          >
+            Server version
+          </td>
+          <td
+            class="sc-ehCJOs"
+          />
+        </tr>
         <tr
           class="sc-nVkyK iDrzMo"
         >

src/neo4j-arc/cypher-language-support/cypher-editor/CypherEditor.tsx

@@ -46,10 +46,6 @@ const MonacoStyleWrapper = styled.div`
   .hover-row.status-bar {
     display: none !important;
   }
-  // used to make the focus outline of the editor not be ugly. Don't think this breaks anything
-  .monaco-editor.rename-box {
-    display: none;
-  }
 `
 
 const EXPLAIN_QUERY_PREFIX = 'EXPLAIN '

src/neo4j-arc/package.json

@@ -26,7 +26,7 @@
     "@rollup/plugin-alias": "^3.1.9",
     "@types/react": "^17.0.40",
     "esbuild": "^0.14.26",
-    "neo4j-driver-core": "^5.0.1",
+    "neo4j-driver-core": "^5.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "rollup": "^2.70.1",
@@ -68,7 +68,7 @@
   "peerDependencies": {
     "@neo4j-ndl/base": "^0.1.2",
     "@neo4j-ndl/react": "^0.1.2",
-    "neo4j-driver-core": "^5.0.1",
+    "neo4j-driver-core": "^5.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }

src/neo4j-arc/yarn.lock

@@ -1280,7 +1280,7 @@ nano-css@^5.3.1:
     stacktrace-js "^2.0.2"
     stylis "^4.0.6"
 
-neo4j-driver-core@^5.0.1:
+neo4j-driver-core@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/neo4j-driver-core/-/neo4j-driver-core-5.2.0.tgz#b465bea6580196f43945265b75961978de17e39e"
   integrity sha512-USdA9u+V0VM7y4UwH4nrofBaROwp73iKx1hC6TNWQRKF5o7biDUt6Wc1x3+oO4YN4lCSC5JzB/tHlG4f1cYxsg==