Merge pull request #224 from neo4j-labs/develop

2.1.8 Release

Author: BennuFire

.github/workflows/develop-deployment.yml

@@ -16,6 +16,13 @@ jobs:
      uses: actions/setup-node@v1
      with:
        node-version: ${{ matrix.node-version }}
+   - name: Creating Neo4j Container
+     run: |
+       chmod +x ./scripts/docker-neo4j-initializer/docker-neo4j.sh
+       ./scripts/docker-neo4j-initializer/docker-neo4j.sh
+       sleep 30s
+       chmod +x ./scripts/docker-neo4j-initializer/start-movies-db.sh
+       ./scripts/docker-neo4j-initializer/start-movies-db.sh
    - run: rm -rf docs
    - run: yarn install
    - name: Cypress run
@@ -56,3 +63,23 @@ jobs:
        aws-region: us-west-1
    - run: curl ${{ secrets.INDEX_HTML_DEPLOYMENT_URL }} > dist/index.html
    - run: aws s3 rm s3://neodash-test.graphapp.io/ --recursive && aws s3 sync dist s3://neodash-test.graphapp.io/ --acl public-read
+ deploy-gallery:
+   runs-on: ubuntu-latest
+   strategy:
+     matrix:
+       node-version: [18.x]
+   steps:
+   - uses: actions/checkout@v2
+   - name: Use Node.js ${{ matrix.node-version }}
+     uses: actions/setup-node@v1
+     with:
+       node-version: ${{ matrix.node-version }}
+   - run: cd gallery && yarn install
+   - run: cd gallery && CI=false yarn run build
+   - name: Set AWS credentials
+     uses: aws-actions/configure-aws-credentials@v1
+     with:
+       aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+       aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+       aws-region: us-west-1
+   - run: aws s3 rm s3://neodash-gallery.graphapp.io/ --recursive && aws s3 sync gallery/build s3://neodash-gallery.graphapp.io/ --acl public-read

.github/workflows/develop-test.yml

@@ -17,6 +17,13 @@ jobs:
      uses: actions/setup-node@v1
      with:
        node-version: ${{ matrix.node-version }}
+   - name: Creating Neo4j Container
+     run: |
+       chmod +x ./scripts/docker-neo4j-initializer/docker-neo4j.sh
+       ./scripts/docker-neo4j-initializer/docker-neo4j.sh
+       sleep 30s
+       chmod +x ./scripts/docker-neo4j-initializer/start-movies-db.sh
+       ./scripts/docker-neo4j-initializer/start-movies-db.sh
    - run: yarn install
    - name: Cypress run
      uses: cypress-io/github-action@v2

.github/workflows/master-deployment.yml

@@ -17,6 +17,13 @@ jobs:
      uses: actions/setup-node@v1
      with:
        node-version: ${{ matrix.node-version }}
+   - name: Creating Neo4j Container
+      run: 
+        chmod +x ./scripts/docker-neo4j-initializer/docker-neo4j.sh
+        ./scripts/docker-neo4j-initializer/docker-neo4j.sh
+        sleep 30s
+        chmod +x ./scripts/docker-neo4j-initializer/start-movies-db.sh
+        ./scripts/docker-neo4j-initializer/start-movies-db.sh
    - run: rm -rf docs
    - run: yarn install
    - name: Cypress run
@@ -25,29 +32,29 @@ jobs:
         build: yarn run build
         start: yarn run dev
         wait-on: 'http://localhost:3000'
- build-s3:
-   needs: build-test
-   runs-on: ubuntu-latest
-   strategy:
-     matrix:
-       node-version: [18.x]
-   steps:
-   - uses: actions/checkout@v2
-   - name: Use Node.js ${{ matrix.node-version }}
-     uses: actions/setup-node@v1
-     with:
-       node-version: ${{ matrix.node-version }}
-   - run: rm -rf docs
-   - run: yarn install
-   - run: yarn run build
-   - name: Set AWS credentials
-     uses: aws-actions/configure-aws-credentials@v1
-     with:
-       aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-       aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-       aws-region: us-west-1
-   - run: curl ${{ secrets.INDEX_HTML_DEPLOYMENT_URL }} > dist/index.html
-   - run: aws s3 rm s3://neodash.graphapp.io/ --recursive && aws s3 sync dist s3://neodash.graphapp.io/ --acl public-read
+#  build-s3:
+#    needs: build-test
+#    runs-on: ubuntu-latest
+#    strategy:
+#      matrix:
+#        node-version: [18.x]
+#    steps:
+#    - uses: actions/checkout@v2
+#    - name: Use Node.js ${{ matrix.node-version }}
+#      uses: actions/setup-node@v1
+#      with:
+#        node-version: ${{ matrix.node-version }}
+#    - run: rm -rf docs
+#    - run: yarn install
+#    - run: yarn run build
+#    - name: Set AWS credentials
+#      uses: aws-actions/configure-aws-credentials@v1
+#      with:
+#        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+#        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+#        aws-region: us-west-1
+#    - run: curl ${{ secrets.INDEX_HTML_DEPLOYMENT_URL }} > dist/index.html
+#    - run: aws s3 rm s3://neodash.graphapp.io/ --recursive && aws s3 sync dist s3://neodash.graphapp.io/ --acl public-read
  build-docker:
    needs: build-test
    runs-on: ubuntu-latest
@@ -71,7 +78,7 @@ jobs:
       context: .
       file: ./Dockerfile
       push: true
-      tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.1.7
+      tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.1.8
  build-npm:
    needs: build-test
    runs-on: ubuntu-latest

.github/workflows/master.test.yml renamed to .github/workflows/master-test.yml

@@ -17,6 +17,13 @@ jobs:
      uses: actions/setup-node@v1
      with:
        node-version: ${{ matrix.node-version }}
+   - name: Creating Neo4j Container
+     run: |
+       chmod +x ./scripts/docker-neo4j-initializer/docker-neo4j.sh
+       ./scripts/docker-neo4j-initializer/docker-neo4j.sh
+       sleep 30s
+       chmod +x ./scripts/docker-neo4j-initializer/start-movies-db.sh
+       ./scripts/docker-neo4j-initializer/start-movies-db.sh
    - run: yarn install
    - name: Cypress run
      uses: cypress-io/github-action@v2

Dockerfile

@@ -38,4 +38,4 @@ RUN chown -R nginx:nginx /usr/share/nginx/html/
 USER nginx
 EXPOSE 5005
 HEALTHCHECK cmd curl --fail http://localhost:5005 || exit 1
-LABEL version="2.1.7"
+LABEL version="2.1.8"

changelog.md

@@ -1,3 +1,18 @@
+## NeoDash 2.1.8
+New features:
+- Added the [Dashboard Gallery](https://neodash-gallery.graphapp.io), a live gallery of example NeoDash dashboards.
+- Added **Gauge Charts**, a contribution of the [BlueHound](https://github.com/zeronetworks/BlueHound) fork.
+- Updated testing pipeline to work as an independent procedure.
+- Added option to select a different Neo4j database for each report. ([#188](https://github.com/neo4j-labs/neodash/issues/118))
+- Added **Report Actions**, a neodash extension (available in beta) only on [https://neodash.graphapp.io](https://neodash.graphapp.io). ([#27](https://github.com/neo4j-labs/neodash/issues/27))
+ 
+Bug fixes:
+- Fixed issue preventing dashboards to be shared with a non-standard database name.
+- Fixed table chart breaking when returning a property called 'id' with a null value.
+- Fixed bug not allowing users to select a different database when loading/saving a dashboard.
+
+
+
 ## NeoDash 2.1.6 & 2.1.7
 New features:
 - Added *Radar Charts/Spider Charts*.

cypress/fixtures/cypher_queries.js

@@ -1,4 +1,4 @@
-import { tableCypherQuery, barChartCypherQuery, mapChartCypherQuery, sunburstChartCypherQuery, iFrameText, markdownText, loadDashboardURL, sankeyChartCypherQuery } from "../fixtures/cypher_queries"
+import { tableCypherQuery, barChartCypherQuery, mapChartCypherQuery, sunburstChartCypherQuery, iFrameText, markdownText, loadDashboardURL, sankeyChartCypherQuery, gaugeChartCypherQuery } from "../fixtures/cypher_queries"
 
 // Ignore warnings that may appear when using the Cypress dev server
 Cypress.on('uncaught:exception', (err, runnable) => {
@@ -12,6 +12,7 @@ describe('NeoDash E2E Tests', () => {
         cy.viewport(1920, 1080)
         // Navigate to index
         cy.visit('/')
+        cy.wait(1000)
         cy.get('#form-dialog-title').should('contain', 'NeoDash - Neo4j Dashboard Builder')
         cy.wait(300)
 
@@ -27,13 +28,13 @@ describe('NeoDash E2E Tests', () => {
         cy.get('#form-dialog-title').should('contain', 'Connect to Neo4j')
 
         // Connect to Neo4j database
-        cy.get('#protocol').click()
-        cy.contains('neo4j+s').click()
-        cy.get('#url').clear().type('demo.neo4jlabs.com')
+        // cy.get('#protocol').click()
+        // cy.contains('neo4j').click()
+        cy.get('#url').clear().type('localhost')
         cy.wait(100)
-        cy.get('#database').type('movies')
-        cy.get('#dbusername').clear().type('movies')
-        cy.get('#dbpassword').type('movies')
+        // cy.get('#database').type('neo4j')
+        cy.get('#dbusername').clear().type('neo4j')
+        cy.get('#dbpassword').type('test')
         cy.wait(100)
         cy.get('button').contains('Connect').click()
     })
@@ -104,6 +105,11 @@ describe('NeoDash E2E Tests', () => {
         cy.get('main .react-grid-item:eq(2) .MuiCardContent-root > div > div:nth-child(2) > span').contains('1,999')
     })
 
+    it('creates a gauge chart report', () => {
+        createReportOfType('Gauge Chart', gaugeChartCypherQuery)
+        cy.get('.text-group > text').contains('69')
+    })
+
     it('creates a sunburst chart report', () => {
         createReportOfType('Sunburst Chart', sunburstChartCypherQuery)
         cy.get('main .react-grid-item:eq(2) .MuiCardActions-root .MuiInputLabel-root').contains('Path').next()

cypress/integration/start_page.spec.js

@@ -17,6 +17,7 @@
 *** xref:user-guide/reports/map.adoc[Map]
 *** xref:user-guide/reports/choropleth.adoc[Choropleth]
 *** xref:user-guide/reports/single-value.adoc[Single Value]
+*** xref:user-guide/reports/gauge-chart.adoc[Gauge Chart]
 *** xref:user-guide/reports/raw-json.adoc[Raw JSON]
 *** xref:user-guide/reports/parameter-select.adoc[Parameter Select]
 *** xref:user-guide/reports/iframe.adoc[iFrame]