Skip to content

Commit a607b62

Browse files
BennuFireBennuFire
authored
Merge branch 'develop' into si/fixSSOMultipleProviders
2 parents 9c758c8 + a5a5da1 commit a607b62

File tree

15 files changed

+57
-35
lines changed

15 files changed

+57
-35
lines changed

‎docs/modules/ROOT/pages/quickstart.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ https://neodash.graphapp.io.
88
App Gallery].
99
. Using Docker:
1010
```
11-
docker pull neo4jlabs/neodash:latest
11+
docker pull neo4jlabs/neodash:latest
1212
docker run -it --rm -p 5005:5005 neo4jlabs/neodash
1313
```
1414

‎docs/modules/ROOT/pages/user-guide/reports/pie-chart.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ slice.
7373
|Margin Left (px) |number |50 |The margin in pixels on the left side of
7474
the visualization.
7575

76-
|Margin Right (px) |number |24 |The margin in pixels on the right side
76+
|Margin Right (px) |number |50 |The margin in pixels on the right side
7777
of the visualization.
7878

79-
|Margin Top (px) |number |24 |The margin in pixels on the top side of
79+
|Margin Top (px) |number |50 |The margin in pixels on the top side of
8080
the visualization.
8181

82-
|Margin Bottom (px) |number |40 |The margin in pixels on the bottom side
82+
|Margin Bottom (px) |number |50 |The margin in pixels on the bottom side
8383
of the visualization.
8484

8585
|Hide Selections |on/off |off |If enabled, hides the property selector

‎public/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
</head>
3131

3232
<body>
33+
<div id="overlay"></div>
3334
<div id="root"></div>
3435
<noscript>Please enable JavaScript to view this site.</noscript>
3536
<script src="bundle.js"></script>

‎public/style.css

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,4 +228,11 @@
228228
transform: scale(0.95);
229229
box-shadow: 0 0 0 0 rgba(0, 0, 0, 0);
230230
}
231-
}
231+
}
232+
233+
/* Workaround for Needle not handling menu placement of dropdowns on modals */
234+
#overlay {
235+
z-index: 99 !important;
236+
position: absolute;
237+
}
238+
/* End workaround */

‎src/application/ApplicationThunks.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export const createConnectionThunk =
125125
query,
126126
parameters,
127127
1,
128-
() => {},
128+
() => { },
129129
(records) => validateConnection(records)
130130
);
131131
} catch (e) {
@@ -255,7 +255,7 @@ export const handleSharedDashboardsThunk = () => (dispatch: any) => {
255255
dispatch(onConfirmLoadSharedDashboardThunk());
256256
}
257257

258-
window.history.pushState({}, document.title, '/');
258+
window.history.pushState({}, document.title, window.location.pathname);
259259
} else {
260260
dispatch(setConnectionModalOpen(false));
261261
// dispatch(setWelcomeScreenOpen(false));
@@ -274,7 +274,7 @@ export const handleSharedDashboardsThunk = () => (dispatch: any) => {
274274
false
275275
)
276276
);
277-
window.history.pushState({}, document.title, '/');
277+
window.history.pushState({}, document.title, window.location.pathname);
278278
}
279279
} else {
280280
// dispatch(resetShareDetails());

‎src/card/settings/CardSettings.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ const NeoCardSettings = ({
9191
);
9292

9393
return (
94-
<div className={`card-view n-bg-palette-neutral-bg-weak ${expanded ? 'expanded' : ''} n-overflow-y-auto n-h-full`}>
94+
<div
95+
className={`card-view n-bg-palette-neutral-bg-weak n-text-palette-neutral-text-default ${
96+
expanded ? 'expanded' : ''
97+
} n-overflow-y-auto n-h-full`}
98+
>
9599
{cardSettingsHeader}
96100
<ReportItemContainer style={{ height: reportHeight }} className='-n-mt-2'>
97101
{cardSettingsContent}

‎src/card/settings/CardSettingsContent.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ const NeoCardSettingsContent = ({
111111
label: report?.label || '',
112112
value: report?.label || '',
113113
},
114-
menuPortalTarget: document.querySelector('body'),
114+
menuPortalTarget: document.querySelector('#overlay'),
115115
}}
116116
fluid
117117
style={{ marginLeft: '0px', marginRight: '10px', width: '47%', maxWidth: '200px', display: 'inline-block' }}
@@ -133,7 +133,7 @@ const NeoCardSettingsContent = ({
133133
value: database,
134134
})),
135135
value: { label: databaseText, value: databaseText },
136-
menuPortalTarget: document.querySelector('body'),
136+
menuPortalTarget: document.querySelector('#overlay'),
137137
}}
138138
fluid
139139
style={{ marginLeft: '0px', marginRight: '10px', width: '47%', maxWidth: '200px', display: 'inline-block' }}

‎src/card/view/CardView.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,9 @@ const NeoCardView = ({
213213

214214
return (
215215
<div
216-
className={`card-view n-bg-palette-neutral-bg-weak ${expanded ? 'expanded' : ''}`}
216+
className={`card-view n-bg-palette-neutral-bg-weak n-text-palette-neutral-text-default ${
217+
expanded ? 'expanded' : ''
218+
}`}
217219
style={settings && settings.backgroundColor ? { backgroundColor: settings.backgroundColor } : {}}
218220
>
219221
{reportHeader}

‎src/card/view/CardViewFooter.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const NeoCardViewFooter = ({
121121
: { label: selection[selectable], value: selection[selectable] },
122122
isMulti: selectableFields[selectable].multiple,
123123
isClearable: false,
124-
menuPortalTarget: document.querySelector('body'),
124+
menuPortalTarget: document.querySelector('#overlay'),
125125
}}
126126
fluid
127127
style={{

‎src/card/view/CardViewHeader.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ const NeoCardViewHeader = ({
7171
text: {
7272
primary: 'rgb(var(--palette-neutral-text))',
7373
},
74+
action: {
75+
disabled: 'rgb(var(--palette-neutral-text-weak))',
76+
},
7477
},
7578
});
7679

@@ -103,7 +106,7 @@ const NeoCardViewHeader = ({
103106
onBlur={() => {
104107
setEditing(false);
105108
}}
106-
className={'n-text-palette-neutral-text-default no-underline large'}
109+
className={'no-underline large'}
107110
label=''
108111
disabled={!editable}
109112
placeholder='Report name...'
@@ -117,6 +120,11 @@ const NeoCardViewHeader = ({
117120
size={'small'}
118121
style={{ paddingTop: '0px important!' }}
119122
variant={'standard'}
123+
sx={{
124+
'& .MuiInputBase-input.Mui-disabled': {
125+
WebkitTextFillColor: 'inherit',
126+
},
127+
}}
120128
/>
121129
</td>
122130
</tr>

0 commit comments

Comments
 (0)