Merge pull request #540 from neo4j-labs/develop

Release 2.3.1
neo4j-labs · Aug 1, 2023 · c34adf5 · c34adf5
2 parents 8dcafd5 + ec3ffb2
commit c34adf5
Show file tree

Hide file tree

Showing 44 changed files with 857 additions and 435 deletions.
diff --git a/.github/workflows/master-deployment.yml b/.github/workflows/master-deployment.yml
@@ -79,7 +79,7 @@ jobs:
           context: .
           file: ./Dockerfile
           push: true
-          tags: ${{ secrets.DOCKER_HUB_LABS_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_LABS_USERNAME }}/neodash:2.3.0
+          tags: ${{ secrets.DOCKER_HUB_LABS_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_LABS_USERNAME }}/neodash:2.3.1
   build-docker-legacy:
     needs: build-test
     runs-on: ubuntu-latest
@@ -103,7 +103,7 @@ jobs:
           context: .
           file: ./Dockerfile
           push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.3.0
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.3.1
   deploy-gallery:
     runs-on: ubuntu-latest
     strategy:

diff --git a/Dockerfile b/Dockerfile
@@ -43,4 +43,4 @@ USER nginx
 EXPOSE $NGINX_PORT
 
 HEALTHCHECK cmd curl --fail "http://localhost:$NGINX_PORT" || exit 1
-LABEL version="2.3.0"
+LABEL version="2.3.1"
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ To manually run linting of all your .ts and .tsx files, run:
 yarn run lint
 ```
 
-To manually run linting of all your .ts and .tsx staged files,  run:
+To manually run linting of all your .ts and .tsx staged files, run:
 ```
 yarn run lint-staged
 ```

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,25 @@
+## NeoDash 2.3.1
+What's new in NeoDash 2.3.1? A few bug fixes, improvement of natural language queries with support of Azure Open AI and parameters, Graph Vizualization relationship styling and more below!
+
+- Natural language queries
+  - **Support of Azure Open AI** ([@BennuFire](https://github.com/bennufire), [#515](https://github.com/neo4j-labs/neodash/pull/515))
+  - Support parameters on natural language queries ([@BennuFire](https://github.com/bennufire), [#514](https://github.com/neo4j-labs/neodash/pull/514))
+
+- Graph Visualization
+  - Added styling rules for relationship color ([@brahmprakashMishra](https://github.com/brahmprakashMishra) [@BennuFire](https://github.com/bennufire), [#537](https://github.com/neo4j-labs/neodash/pull/537))
+
+- Table Chart
+  - Update TableChart to use first returned row values as titles when transposed ([@bastienhubert](https://github.com/bastienhubert), [#513](https://github.com/neo4j-labs/neodash/pull/513))
+  - Fix falsy boolean display on table ([@bastienhubert](https://github.com/bastienhubert), [#536](https://github.com/neo4j-labs/neodash/pull/536))
+
+- Report Actions
+  - Fix on Style and Action modal that was preventing from setting params on low resolutions ([@mariusconjeaud](https://github.com/mariusconjeaud), [#533](https://github.com/neo4j-labs/neodash/pull/533))
+
+- Others
+  - New setting for parameters selector to allow selection of multiple values instead of one + Fix multi selector on dates ([@BennuFire](https://github.com/bennufire), [#535](https://github.com/neo4j-labs/neodash/pull/535))
+  - Fix bug where protocol was not set properly on share links ([@nielsdejong](https://github.com/nielsdejong), [#521](https://github.com/neo4j-labs/neodash/pull/521))
+  - Update word-wrap from 1.2.3 to 1.2.4 ([@BennuFire](https://github.com/bennufire), [#526](https://github.com/neo4j-labs/neodash/pull/526) [#527](https://github.com/neo4j-labs/neodash/pull/527))
+
 ## NeoDash 2.3.0
 NeoDash 2.3 is out! This release brings a brand new look-and-feel, improved speed for large dashboards, and a new extension for querying Neo4j with natural language (using LLMs).
 

diff --git a/cypress/support/index.js b/cypress/support/index.js
@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands';
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')
diff --git a/docs/modules/ROOT/pages/developer-guide/deploy-a-build.adoc b/docs/modules/ROOT/pages/developer-guide/deploy-a-build.adoc
@@ -37,7 +37,7 @@ Depending on the webserver type and version, this could be different directory.
 As an example - to copy the files to an nginx webserver using `scp`:
 
 ```bash
-scp neodash-2.3.0 username@host:/usr/share/nginx/html
+scp neodash-2.3.1 username@host:/usr/share/nginx/html
 ```
 
 NeoDash should now be visible by visiting your (sub)domain in the browser.

diff --git a/docs/modules/ROOT/pages/user-guide/extensions/natural-language-queries.adoc b/docs/modules/ROOT/pages/user-guide/extensions/natural-language-queries.adoc
@@ -11,7 +11,7 @@ To enable Natural Language Queries in NeoDash, follow these configuration steps:
 1. Open NeoDash and navigate to the "Extensions" section in the left sidebar.
 2. Locate the "Natural Language Queries" extension and click on it to activate it.
 3. Once activated, a new button will appear in the sidebar(see image below). Click on the button to open the configuration window.
-4. In the configuration window, you will be prompted to provide the necessary information to connect to the Language Model (LLM). Enter the model provider, API key, and select the desired model to use.
+4. In the configuration window, you will be prompted to provide the necessary information to connect to the Language Model (LLM). Enter the model provider, API key, deployment url if needed by the model provider, and select the desired model to use.
 5. After providing the required information, click on the "Start Querying" button to finalize the configuration.
 
 image::extensionbutton.png[Extension Button enables Natural Language Queries button in the sidebar]

diff --git a/gallery/yarn.lock b/gallery/yarn.lock
@@ -9453,9 +9453,9 @@ which@^2.0.1:
     isexe "^2.0.0"
 
 word-wrap@^1.2.3, word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 [email protected]:
   version "6.5.4"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neodash",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "NeoDash - Neo4j Dashboard Builder",
   "neo4jDesktop": {
     "apiVersion": "^1.2.0"
@@ -34,6 +34,7 @@
   "keywords": [],
   "author": "Neo4j Labs",
   "dependencies": {
+    "@azure/openai": "^1.0.0-beta.2",
     "@codemirror/lang-markdown": "^6.1.1",
     "@codemirror/language-data": "^6.3.1",
     "@mui/icons-material": "^5.11.16",

diff --git a/release-notes.md b/release-notes.md
@@ -1,29 +1,21 @@
-## NeoDash 2.3.0
-NeoDash 2.3 is out! This release brings a brand new look-and-feel, improved speed for large dashboards, and a new extension for querying Neo4j with natural language (using LLMs).
+## NeoDash 2.3.1
+What's new in NeoDash 2.3.1? A few bug fixes, improvement of natural language queries with support of Azure Open AI and parameters, Graph Vizualization relationship styling and more below!
 
-Highlights:
-- Write **[Natural Language Queries](https://neo4j.com/labs/neodash/2.3/user-guide/extensions/natural-language-queries/)** and use OpenAI to generate Cypher queries for your visualizations. (OpenAI API key required)
-- UI updated to use the **[Neo4j Design Language](https://www.neo4j.design/)**, giving NeoDash a similar look-and-feel to other Neo4j tools.
-- Customize branding, colors dynamically with a new [Style Configuration File](https://neo4j.com/labs/neodash/2.3/developer-guide/style-configuration).
-
-Other changes:
-- Fixed issues with date picker / free-text parameter sometimes not initializing.
-- Improved documentation by fixing broken links, and adding more details around complex concepts. 
-- **Pro Extensions have evolved to open Expert Extensions.**
-- Fixed issue where deep-linked parameters were not set from the URL.
-- Added option to specify absolute width for table columns (in pixels or as percentages).
-- Fixed map charts to auto-cluster markers when they collide, or are too close together.
-- ... and dozens of other improvements!
+- Natural language queries
+  - **Support of Azure Open AI** ([@BennuFire](https://github.com/bennufire), [#515](https://github.com/neo4j-labs/neodash/pull/515))
+  - Support parameters on natural language queries ([@BennuFire](https://github.com/bennufire), [#514](https://github.com/neo4j-labs/neodash/pull/514))
 
+- Graph Visualization
+  - Added styling rules for relationship color ([@brahmprakashMishra](https://github.com/brahmprakashMishra) [@BennuFire](https://github.com/bennufire), [#537](https://github.com/neo4j-labs/neodash/pull/537))
 
+- Table Chart
+  - Update TableChart to use first returned row values as titles when transposed ([@bastienhubert](https://github.com/bastienhubert), [#513](https://github.com/neo4j-labs/neodash/pull/513))
+  - Fix falsy boolean display on table ([@bastienhubert](https://github.com/bastienhubert), [#536](https://github.com/neo4j-labs/neodash/pull/536))
 
-Contributors to this release:
-- [Alfredo Rubin](https://github.com/alfredorubin96)
-- [Harold Agudelo](https://github.com/BennuFire)
-- [Aleksandar Simeunovic](https://github.com/AleSim94)
-- [Marius Conjeaud](https://github.com/mariusconjeaud)
-- [Brahm Prakash Mishra](https://github.com/brahmprakashMishra)
-- [Pierre Martignon](https://github.com/pierremartignon)
-- [Kim Zachariassen](https://github.com/KiZach)
-- [Paolo Baldini](https://github.com/8Rav3n)
-- [Niels de Jong](https://github.com/nielsdejong/)
+- Report Actions
+  - Fix on Style and Action modal that was preventing from setting params on low resolutions ([@mariusconjeaud](https://github.com/mariusconjeaud), [#533](https://github.com/neo4j-labs/neodash/pull/533))
+
+- Others
+  - New setting for parameters selector to allow selection of multiple values instead of one + Fix multi selector on dates ([@BennuFire](https://github.com/bennufire), [#535](https://github.com/neo4j-labs/neodash/pull/535))
+  - Fix bug where protocol was not set properly on share links ([@nielsdejong](https://github.com/nielsdejong), [#521](https://github.com/neo4j-labs/neodash/pull/521))
+  - Update word-wrap from 1.2.3 to 1.2.4 ([@BennuFire](https://github.com/bennufire), [#526](https://github.com/neo4j-labs/neodash/pull/526) [#527](https://github.com/neo4j-labs/neodash/pull/527))
diff --git a/src/application/ApplicationThunks.ts b/src/application/ApplicationThunks.ts
@@ -221,13 +221,12 @@ export const handleSharedDashboardsThunk = () => (dispatch: any) => {
         const database = connection.split('@')[1].split(':')[0];
         const url = connection.split('@')[1].split(':')[1];
         const port = connection.split('@')[1].split(':')[2];
-
         if (url == password) {
           // Special case where a connect link is generated without a password.
           // Here, the format is parsed incorrectly and we open the connection window instead.
 
           dispatch(resetShareDetails());
-          dispatch(setConnectionProperties('neo4j', url, '7687', database, username.split('@')[0], ''));
+          dispatch(setConnectionProperties(protocol, url, port, database, username.split('@')[0], ''));
           dispatch(setWelcomeScreenOpen(false));
           dispatch(setConnectionModalOpen(true));
           // window.history.pushState({}, document.title, "/");

diff --git a/src/card/Card.tsx b/src/card/Card.tsx
@@ -175,6 +175,7 @@ const NeoCard = ({
             height={report.height}
             heightPx={height}
             fields={report.fields}
+            schema={report.schema}
             type={report.type}
             expanded={expanded}
             extensions={extensions}
@@ -207,7 +208,7 @@ const NeoCard = ({
   // Look into React Portals: https://stackoverflow.com/questions/61432878/how-to-render-child-component-outside-of-its-parent-component-dom-hierarchy
   if (expanded) {
     return (
-      <Dialog size='large' open={expanded} aria-labelledby='form-dialog-title' style={{ maxWidth: '100%' }}>
+      <Dialog open={expanded} aria-labelledby='form-dialog-title' className='dialog-xxl'>
         <Dialog.Content style={{ height: document.documentElement.clientHeight }}>{component}</Dialog.Content>
       </Dialog>
     );

diff --git a/src/card/CardActions.ts b/src/card/CardActions.ts
@@ -50,6 +50,12 @@ export const updateFields = (pagenumber: number, id: number, fields: any) => ({
   payload: { pagenumber, id, fields },
 });
 
+export const UPDATE_SCHEMA = 'PAGE/CARD/UPDATE_SCHEMA';
+export const updateSchema = (pagenumber: number, id: number, schema: any) => ({
+  type: UPDATE_SCHEMA,
+  payload: { pagenumber, id, schema },
+});
+
 export const UPDATE_SELECTION = 'PAGE/CARD/UPDATE_SELECTION';
 export const updateSelection = (pagenumber: number, id: number, selectable: any, field: any) => ({
   type: UPDATE_SELECTION,

diff --git a/src/card/CardReducer.ts b/src/card/CardReducer.ts
@@ -5,6 +5,7 @@ import {
   UPDATE_ALL_SELECTIONS,
   UPDATE_CYPHER_PARAMETERS,
   UPDATE_FIELDS,
+  UPDATE_SCHEMA,
   UPDATE_REPORT_QUERY,
   UPDATE_REPORT_SETTING,
   UPDATE_REPORT_SIZE,
@@ -72,6 +73,11 @@ export const cardReducer = (state = CARD_INITIAL_STATE, action: { type: any; pay
       state = update(state, { fields: fields });
       return state;
     }
+    case UPDATE_SCHEMA: {
+      const { schema } = payload;
+      state = update(state, { schema: schema });
+      return state;
+    }
     case UPDATE_REPORT_TYPE: {
       const { type } = payload;
       state = update(state, { type: type });