Remove deprecated procedures (#1808)

* Remove deprecated procedures

* update e2e tests

* Refactor schemaFrame

* replace version getter in schema frame

Author: noahmay

e2e_tests/integration/schema-frame.spec.ts

@@ -103,9 +103,26 @@ describe('Schema Frame', () => {
       cy.executeCommand(':clear')
       cy.executeCommand(':schema')
 
-      cy.get('[data-testid="frameContents"]')
-        .should('contain', 'Constraints')
-        .and('contain', ':SchemaTest')
+      if (Cypress.config('serverVersion') >= 4.2) {
+        // Headers
+        cy.get('[data-testid="frameContents"]')
+          .should('contain', 'Constraint Name')
+          .and('contain', 'Type')
+          .and('contain', 'EntityType')
+          .and('contain', 'LabelsOrTypes')
+          .and('contain', 'Properties')
+
+        // Constraint info
+        cy.get('[data-testid="frameContents"]')
+          .should('contain', 'UNIQUENESS')
+          .and('contain', 'NODE')
+          .and('contain', '"SchemaTest"')
+          .and('contain', '"prop1"')
+      } else {
+        cy.get('[data-testid="frameContents"]')
+          .should('contain', 'Constraints')
+          .and('contain', ':SchemaTest')
+      }
     })
   })
 })

src/browser/modules/Stream/SchemaFrame.test.tsx

@@ -48,6 +48,71 @@ test('SchemaFrame renders empty for Neo4j >= 4.0', () => {
   expect(container).toMatchSnapshot()
 })
 
+test('SchemaFrame renders results for Neo4j >= 4.2', () => {
+  const indexResult = {
+    success: true,
+    result: {
+      records: [
+        {
+          _fields: [
+            'INDEX ON :Movie(released)',
+            'Movie',
+            ['released'],
+            'ONLINE',
+            'node_label_property',
+            {
+              version: '2.0',
+              key: 'lucene+native'
+            }
+          ],
+          keys: [
+            'description',
+            'label',
+            'properties',
+            'state',
+            'type',
+            'provider'
+          ]
+        }
+      ]
+    }
+  }
+  const firstIndexRecord: any = indexResult.result.records[0]
+  firstIndexRecord.get = (key: any) =>
+    firstIndexRecord._fields[firstIndexRecord.keys.indexOf(key)]
+
+  const constraintResult = {
+    success: true,
+    result: {
+      records: [
+        {
+          keys: ['name', 'type', 'entityType', 'labelsOrTypes', 'properties'],
+          _fields: [
+            'constraint_550b2518',
+            'UNIQUE',
+            'node',
+            ['Movie'],
+            ['released']
+          ]
+        }
+      ]
+    }
+  }
+  const firstConstraintRecord: any = constraintResult.result.records[0]
+  firstConstraintRecord.get = (key: any) =>
+    firstConstraintRecord._fields[firstConstraintRecord.keys.indexOf(key)]
+
+  const { container } = renderWithRedux(
+    <SchemaFrame
+      indexes={indexResult}
+      constraints={constraintResult}
+      neo4jVersion={'4.2.1'}
+    />
+  )
+
+  expect(container).toMatchSnapshot()
+})
+
 test('SchemaFrame renders results for Neo4j < 4.0', () => {
   const indexResult = {
     success: true,

src/browser/modules/Stream/SchemaFrame.tsx

@@ -21,7 +21,7 @@ import { replace, toUpper } from 'lodash-es'
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
 import { withBus } from 'react-suber'
-import semver from 'semver'
+import semver, { SemVer } from 'semver'
 import { v4 } from 'uuid'
 
 import Slide from '../Carousel/Slide'
@@ -36,11 +36,11 @@ import Directives from 'browser-components/Directives'
 import { GlobalState } from 'project-root/src/shared/globalState'
 import { NEO4J_BROWSER_USER_ACTION_QUERY } from 'services/bolt/txMetadata'
 import { CYPHER_REQUEST } from 'shared/modules/cypher/cypherDuck'
-import { getRawVersion } from 'shared/modules/dbMeta/dbMetaDuck'
+import { getSemanticVersion } from 'shared/modules/dbMeta/dbMetaDuck'
 
 type IndexesProps = {
   indexes: any
-  neo4jVersion: string | null
+  neo4jVersion: SemVer | null
 }
 const Indexes = ({ indexes, neo4jVersion }: IndexesProps) => {
   if (
@@ -90,15 +90,44 @@ const Indexes = ({ indexes, neo4jVersion }: IndexesProps) => {
   )
 }
 
-const Constraints = ({ constraints }: any) => {
-  const rows = constraints.map((constraint: any) => [
-    replace(constraint.description, 'CONSTRAINT', '')
-  ])
+const Constraints = ({
+  constraints,
+  neo4jVersion
+}: {
+  constraints: any
+  neo4jVersion: string
+}) => {
+  let rows = []
+  let header = []
+
+  if (semver.valid(neo4jVersion) && semver.satisfies(neo4jVersion, '<4.2.*')) {
+    header = ['Constraints']
+
+    rows = constraints.map((constraint: any) => [
+      replace(constraint.description, 'CONSTRAINT', '')
+    ])
+  } else {
+    header = [
+      'Constraint Name',
+      'Type',
+      'EntityType',
+      'LabelsOrTypes',
+      'Properties'
+    ]
+
+    rows = constraints.map((constraint: any) => [
+      constraint.name,
+      constraint.type,
+      constraint.entityType,
+      JSON.stringify(constraint.labelsOrTypes, null, 2),
+      JSON.stringify(constraint.properties, null, 2)
+    ])
+  }
 
   return (
     <SchemaTable
       testid="schemaFrameConstraintsTable"
-      header={['Constraints']}
+      header={header}
       rows={rows}
     />
   )
@@ -139,7 +168,7 @@ const SchemaTable = ({ testid, header, rows }: any) => {
 type SchemaFrameState = any
 
 export class SchemaFrame extends Component<any, SchemaFrameState> {
-  constructor(props: {}) {
+  constructor(props: { neo4jVersion: string }) {
     super(props)
     this.state = {
       indexes: [],
@@ -163,13 +192,17 @@ export class SchemaFrame extends Component<any, SchemaFrameState> {
     }
   }
 
-  fetchData() {
+  fetchData(neo4jVersion: SemVer) {
     if (this.props.bus) {
       // Indexes
       this.props.bus.self(
         CYPHER_REQUEST,
         {
-          query: 'CALL db.indexes()',
+          query:
+            semver.valid(neo4jVersion) &&
+            semver.satisfies(neo4jVersion, '<4.2.*')
+              ? 'CALL db.indexes()'
+              : 'SHOW INDEXES',
           queryType: NEO4J_BROWSER_USER_ACTION_QUERY
         },
         this.responseHandler('indexes')
@@ -178,15 +211,19 @@ export class SchemaFrame extends Component<any, SchemaFrameState> {
       this.props.bus.self(
         CYPHER_REQUEST,
         {
-          query: 'CALL db.constraints()',
+          query:
+            semver.valid(neo4jVersion) &&
+            semver.satisfies(neo4jVersion, '<4.2.*')
+              ? 'CALL db.constraints()'
+              : 'SHOW CONSTRAINTS',
           queryType: NEO4J_BROWSER_USER_ACTION_QUERY
         },
         this.responseHandler('constraints')
       )
     }
   }
   componentDidMount() {
-    this.fetchData()
+    this.fetchData(this.props.neo4jVersion)
     if (this.props.indexes) {
       this.responseHandler('indexes')(this.props.indexes)
     }
@@ -200,11 +237,11 @@ export class SchemaFrame extends Component<any, SchemaFrameState> {
       this.props.frame &&
       this.props.frame.schemaRequestId !== prevProps.frame.schemaRequestId
     ) {
-      this.fetchData()
+      this.fetchData(this.props.neo4jVersion)
     }
   }
 
-  render() {
+  render(): JSX.Element {
     const { neo4jVersion } = this.props
     const { indexes, constraints } = this.state
     const schemaCommand =
@@ -215,7 +252,7 @@ export class SchemaFrame extends Component<any, SchemaFrameState> {
     const frame = (
       <Slide>
         <Indexes indexes={indexes} neo4jVersion={neo4jVersion} />
-        <Constraints constraints={constraints} />
+        <Constraints constraints={constraints} neo4jVersion={neo4jVersion} />
         <br />
         <p className="lead">
           Execute the following command to visualize what's related, and how
@@ -245,7 +282,7 @@ const Frame = (props: any) => {
 }
 
 const mapStateToProps = (state: GlobalState) => ({
-  neo4jVersion: getRawVersion(state)
+  neo4jVersion: getSemanticVersion(state)
 })
 
 export default withBus(connect(mapStateToProps, null)(Frame))