Skip to content

Commit 057741b

Browse files
committed
Merge remote-tracking branch 'origin/task/SideBarRemote' into task/SideBarRemote
2 parents 7d59020 + 7884a2b commit 057741b

File tree

7 files changed

+12
-9
lines changed

7 files changed

+12
-9
lines changed

.github/workflows/master-deployment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
context: .
8080
file: ./Dockerfile
8181
push: true
82-
tags: ${{ secrets.DOCKER_HUB_LABS_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_LABS_USERNAME }}/neodash:2.3.2
82+
tags: ${{ secrets.DOCKER_HUB_LABS_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_LABS_USERNAME }}/neodash:2.3.3
8383
build-docker-legacy:
8484
needs: build-test
8585
runs-on: ubuntu-latest
@@ -103,7 +103,7 @@ jobs:
103103
context: .
104104
file: ./Dockerfile
105105
push: true
106-
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.3.2
106+
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.3.3
107107
deploy-gallery:
108108
runs-on: ubuntu-latest
109109
strategy:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ USER nginx
4343
EXPOSE $NGINX_PORT
4444

4545
HEALTHCHECK cmd curl --fail "http://localhost:$NGINX_PORT" || exit 1
46-
LABEL version="2.3.2"
46+
LABEL version="2.3.3"

docs/modules/ROOT/pages/developer-guide/deploy-a-build.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Depending on the webserver type and version, this could be different directory.
3737
As an example - to copy the files to an nginx webserver using `scp`:
3838

3939
```bash
40-
scp neodash-2.3.2 username@host:/usr/share/nginx/html
40+
scp neodash-2.3.3 username@host:/usr/share/nginx/html
4141
```
4242

4343
NeoDash should now be visible by visiting your (sub)domain in the browser.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "neodash",
3-
"version": "2.3.2",
3+
"version": "2.3.3",
44
"description": "NeoDash - Neo4j Dashboard Builder",
55
"neo4jDesktop": {
66
"apiVersion": "^1.2.0"

src/application/ApplicationThunks.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import {
3838
setParametersToLoadAfterConnecting,
3939
setReportHelpModalOpen,
4040
} from './ApplicationActions';
41+
import { version } from '../modal/AboutModal';
4142

4243
/**
4344
* Application Thunks (https://redux.js.org/usage/writing-logic-thunks) handle complex state manipulations.
@@ -56,7 +57,7 @@ import {
5657
export const createConnectionThunk =
5758
(protocol, url, port, database, username, password) => (dispatch: any, getState: any) => {
5859
try {
59-
const driver = createDriver(protocol, url, port, username, password);
60+
const driver = createDriver(protocol, url, port, username, password, { userAgent: `neodash/v${version}` });
6061
// eslint-disable-next-line no-console
6162
console.log('Attempting to connect...');
6263
const validateConnection = (records) => {

src/dashboard/Dashboard.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import NeoDashboardConnectionUpdateHandler from '../component/misc/DashboardConn
1010
import { forceRefreshPage } from '../page/PageActions';
1111
import { getPageNumber } from '../settings/SettingsSelectors';
1212
import { createNotificationThunk } from '../page/PageThunks';
13+
import { version } from '../modal/AboutModal';
1314

1415
const Dashboard = ({
1516
pagenumber,
@@ -29,7 +30,8 @@ const Dashboard = ({
2930
connection.url,
3031
connection.port,
3132
connection.username,
32-
connection.password
33+
connection.password,
34+
{ userAgent: `neodash/v${version}` }
3335
);
3436
setDriver(newDriver);
3537
}

src/modal/AboutModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { Button, Dialog, TextLink } from '@neo4j-ndl/react';
33
import { BookOpenIconOutline, BeakerIconOutline } from '@neo4j-ndl/react/icons';
44
import { Section, SectionTitle, SectionContent } from './ModalUtils';
55

6-
export const NeoAboutModal = ({ open, handleClose, getDebugState }) => {
7-
const version = '2.3.2';
6+
export const version = '2.3.3';
87

8+
export const NeoAboutModal = ({ open, handleClose, getDebugState }) => {
99
const downloadDebugFile = () => {
1010
const element = document.createElement('a');
1111
const state = getDebugState();

0 commit comments

Comments
 (0)