Skip to content

Commit 393aaad

Browse files
Release 2.3.4 (#580)
* Improved contrast for light and dark theme interfaces * Improve styling for actions model. Improved robustness of card settings content * First draft * Fix editing * Clean console * Clean drawer * Fixed issue where users cannot return to edit mode after turning off editing. Make extensions a seperate FAB. Improved styling for rule-based styling creation modal * circular dependencies * circular dependencies 2 * circular dependencies 3 * circular dependencies 4 * circular dependencies 5 * Last clean * Deleting Sidebar and Workflow * Final touch * Icons migration 1 * Icons material free * Reducing duplication * Smells * uuid migration * Added user agent to driver object * Bumped version * Added better version format * Moving circular to dev dep * Smells * Adding release notes * Updated Github runners * Fixed IT test for advanced settings * remove luma + markers pin * Selector options * Fixed double scroll bar * Tooltips nivo contrast * Runs on non drafts * Color picker selection * Version bump and release notes * Fix on Nivo Canvas * Fixing unused import * Fix version 2.3.4 (#581) * Hotfix for outdated version config on some components --------- Co-authored-by: Niels de Jong <[email protected]>
1 parent 693bfb2 commit 393aaad

File tree

19 files changed

+109
-49
lines changed

19 files changed

+109
-49
lines changed

.github/workflows/develop-deployment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66

77
jobs:
88
build-test:
9+
if: github.event.pull_request.draft == false
910
runs-on: neodash-runners
1011
strategy:
1112
matrix:

.github/workflows/develop-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66

77
jobs:
88
build-test:
9+
if: github.event.pull_request.draft == false
910
runs-on: neodash-runners
1011
strategy:
1112
matrix:

.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.3
82+
tags: ${{ secrets.DOCKER_HUB_LABS_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_LABS_USERNAME }}/neodash:2.3.4
8383
build-docker-legacy:
8484
needs: build-test
8585
runs-on: neodash-runners
@@ -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.3
106+
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.3.4
107107
deploy-gallery:
108108
runs-on: neodash-runners
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.3"
46+
LABEL version="2.3.4"

changelog.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## NeoDash 2.3.3
1+
## NeoDash 2.3.3 & 2.3.4
22
This is a bugfix / stability release directly following 2.3.2.
33

44
Improvements:
@@ -7,6 +7,7 @@ Improvements:
77
- Improved contrast for light and dark theme. ([@nielsdejong](https://github.com/nielsdejong), [#545](https://github.com/neo4j-labs/neodash/pull/566))
88
- Fixed issue where dashboards were locked in read-only mode, after toggling in the dashboard settings. ([@nielsdejong](https://github.com/nielsdejong), [#545](https://github.com/neo4j-labs/neodash/pull/566))
99
- Fixed issue where editing the name of a non-selected page changed the wrong page data. ([@BennuFire](https://github.com/BennuFire), [#545](https://github.com/neo4j-labs/neodash/pull/571))
10+
- Fixed issue where color picker was only working on popup selections. ([@BennuFire](https://github.com/BennuFire), [#579](https://github.com/neo4j-labs/neodash/pull/579))
1011
- Add user agent to driver session for better logging of NeoDash queries. ([@nielsdejong](https://github.com/nielsdejong), [#545](https://github.com/neo4j-labs/neodash/pull/574))
1112

1213

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.3 username@host:/usr/share/nginx/html
40+
scp neodash-2.3.4 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.3",
3+
"version": "2.3.4",
44
"description": "NeoDash - Neo4j Dashboard Builder",
55
"neo4jDesktop": {
66
"apiVersion": "^1.2.0"

release-notes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## NeoDash 2.3.3
1+
## NeoDash 2.3.3 & 2.3.4
22
This is a bugfix / stability release directly following 2.3.2.
33

44
Improvements:
@@ -7,4 +7,5 @@ Improvements:
77
- Improved contrast for light and dark theme. ([@nielsdejong](https://github.com/nielsdejong), [#545](https://github.com/neo4j-labs/neodash/pull/566))
88
- Fixed issue where dashboards were locked in read-only mode, after toggling in the dashboard settings. ([@nielsdejong](https://github.com/nielsdejong), [#545](https://github.com/neo4j-labs/neodash/pull/566))
99
- Fixed issue where editing the name of a non-selected page changed the wrong page data. ([@BennuFire](https://github.com/BennuFire), [#545](https://github.com/neo4j-labs/neodash/pull/571))
10+
- Fixed issue where color picker was only working on popup selections. ([@BennuFire](https://github.com/BennuFire), [#579](https://github.com/neo4j-labs/neodash/pull/579))
1011
- Add user agent to driver session for better logging of NeoDash queries. ([@nielsdejong](https://github.com/nielsdejong), [#545](https://github.com/neo4j-labs/neodash/pull/574))

src/card/view/CardView.tsx

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@ import NeoCardViewHeader from './CardViewHeader';
44
import NeoCardViewFooter from './CardViewFooter';
55
import { CardContent } from '@mui/material';
66
import NeoCodeEditorComponent from '../../component/editor/CodeEditorComponent';
7-
87
import { CARD_FOOTER_HEIGHT, CARD_HEADER_HEIGHT } from '../../config/CardConfig';
98
import { getReportTypes } from '../../extensions/ExtensionUtils';
109
import NeoCodeViewerComponent from '../../component/editor/CodeViewerComponent';
1110
import { NeoReportWrapper } from '../../report/ReportWrapper';
1211
import { identifyStyleRuleParameters } from '../../extensions/styling/StyleRuleEvaluator';
13-
import { ThemeProvider } from '@mui/material/styles';
14-
import { lightTheme, darkHeaderTheme, luma } from '../../component/theme/Themes';
1512
import { IconButton } from '@neo4j-ndl/react';
1613
import { PlayCircleIconSolid } from '@neo4j-ndl/react/icons';
1714
import { extensionEnabled } from '../../utils/ReportUtils';
@@ -79,30 +76,22 @@ const NeoCardView = ({
7976

8077
// @ts-ignore
8178
const reportHeader = (
82-
<ThemeProvider
83-
theme={
84-
settings.backgroundColor && luma(settings.backgroundColor) < (dashboardSettings.darkLuma || 40)
85-
? darkHeaderTheme
86-
: lightTheme
87-
}
88-
>
89-
<NeoCardViewHeader
90-
title={title}
91-
editable={editable}
92-
description={settings.description}
93-
fullscreenEnabled={settings.fullscreenEnabled}
94-
downloadImageEnabled={settings.downloadImageEnabled}
95-
refreshButtonEnabled={settings.refreshButtonEnabled}
96-
onTitleUpdate={onTitleUpdate}
97-
onToggleCardSettings={onToggleCardSettings}
98-
onManualRefreshCard={() => setLastRunTimestamp(Date.now())}
99-
settings={settings}
100-
onDownloadImage={onDownloadImage}
101-
onToggleCardExpand={onToggleCardExpand}
102-
expanded={expanded}
103-
parameters={getLocalParameters(title)}
104-
></NeoCardViewHeader>
105-
</ThemeProvider>
79+
<NeoCardViewHeader
80+
title={title}
81+
editable={editable}
82+
description={settings.description}
83+
fullscreenEnabled={settings.fullscreenEnabled}
84+
downloadImageEnabled={settings.downloadImageEnabled}
85+
refreshButtonEnabled={settings.refreshButtonEnabled}
86+
onTitleUpdate={onTitleUpdate}
87+
onToggleCardSettings={onToggleCardSettings}
88+
onManualRefreshCard={() => setLastRunTimestamp(Date.now())}
89+
settings={settings}
90+
onDownloadImage={onDownloadImage}
91+
onToggleCardExpand={onToggleCardExpand}
92+
expanded={expanded}
93+
parameters={getLocalParameters(title)}
94+
></NeoCardViewHeader>
10695
);
10796

10897
// @ts-ignore

src/chart/Chart.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export interface ChartProps {
1919
updateReportSetting?: (name, value) => void; // Callback to update a setting for this report.
2020
fields: (fields) => string[]; // List of fields (return values) available for the report.
2121
setFields?: (fields) => void; // Update the list of fields for this report.
22+
theme?: string; // Dashboard theme value.
2223
}
2324

2425
/**

0 commit comments

Comments
 (0)