Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing dm components #2860

Merged
merged 16 commits into from
Dec 11, 2024
Merged

Fixing dm components #2860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
beda8a8
Corrected the rendering of custom JSON config components
GermanBluefox Dec 10, 2024
a48b070
Corrected news dialog
GermanBluefox Dec 10, 2024
7396edf
Corrected news dialog
GermanBluefox Dec 10, 2024
d5bbb0b
Trying to fix CI
GermanBluefox Dec 11, 2024
235a035
Trying to fix CI
GermanBluefox Dec 11, 2024
8c052f0
Trying to fix CI
GermanBluefox Dec 11, 2024
3e40b8c
Trying to fix CI
GermanBluefox Dec 11, 2024
6f22517
Trying to fix CI
GermanBluefox Dec 11, 2024
15bc298
Trying to fix CI
GermanBluefox Dec 11, 2024
1a295d4
Trying to fix CI
GermanBluefox Dec 11, 2024
2984d17
Trying to fix CI
GermanBluefox Dec 11, 2024
b55fd09
Trying to fix CI
GermanBluefox Dec 11, 2024
edf206e
Fixing dialog in dm-component
GermanBluefox Dec 11, 2024
98a4458
Merge branch 'master' into fixing-dm-components
GermanBluefox Dec 11, 2024
905f707
Fixing CI pipeline
GermanBluefox Dec 11, 2024
f0f9b4d
Fixing CI pipeline
GermanBluefox Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions .github/workflows/create-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,19 @@ jobs:
publish-config:
runs-on: ubuntu-20.04

strategy:
matrix:
node: [20.x] # This should be LTS

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0 # Fetch the history, or this action won't work

- name: Use Node.js ${{ matrix.node }}
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
node-version: 20.x

- name: Install dependencies
run: npm ci -f
- name: Install Dependencies
run: npm run install-monorepo

- name: 'Build backend'
run: npm run build:backend -w packages/admin
Expand Down
67 changes: 8 additions & 59 deletions .github/workflows/test-and-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,43 +30,21 @@ jobs:
with:
node-version: 20.x

- name: 'Install'
run: npm i -f

- name: 'Install Adapter'
run: npm i -w packages/admin -f

- name: 'Install FE'
run: |
cd packages/admin/src-admin
npm i -f

- name: 'Lint Backend'
run: npm run lint-backend -w packages/admin
- name: Install Dependencies
run: npm run install-monorepo

- name: 'Build backend'
run: npm run build:backend -w packages/admin

- name: 'Build adapter-react-v5'
run: npm run build -w packages/adapter-react-v5

- name: 'Build JsonConfig'
run: npm run build -w packages/jsonConfig

- name: 'Build dm-gui-components'
run: npm run build -w packages/dm-gui-components

- name: Check TypeScript files
run: |
cd packages/admin/src-admin
npm run check-ts
# Wait till js-controller 7 types are available
continue-on-error: true

- name: 'Build'
run: |
npm run clean
NODE_OPTIONS=--max_old_space_size=4096 npm run build
- name: Build
run: NODE_OPTIONS=--max_old_space_size=8192 npm run build

# Runs adapter tests on all supported node versions and OSes
adapter-tests:
Expand Down Expand Up @@ -110,43 +88,14 @@ jobs:
with:
node-version: 20.x

- name: 'Install'
run: npm i -f

- name: 'Install Adapter'
run: npm i -w packages/admin -f

- name: 'Install FE'
run: |
cd packages/admin/src-admin
npm i -f

- name: 'Lint Backend'
run: npm run lint-backend -w packages/admin
- name: Install Dependencies
run: npm run install-monorepo

- name: 'Build backend'
run: npm run build:backend -w packages/admin

- name: 'Build adapter-react-v5'
run: npm run build -w packages/adapter-react-v5

- name: 'Build JsonConfig'
run: npm run build -w packages/jsonConfig

- name: 'Build dm-gui-components'
run: npm run build -w packages/dm-gui-components

- name: Check TypeScript files
run: |
cd packages/admin/src-admin
npm run check-ts
# Wait till js-controller 7 types are available
continue-on-error: true

- name: 'Build'
run: |
npm run clean
NODE_OPTIONS=--max_old_space_size=4096 npm run build
- name: Build
run: NODE_OPTIONS=--max_old_space_size=8192 npm run build

- name: Run GUI tests
run: npm run test:gui -w packages/admin/
Expand Down
12 changes: 9 additions & 3 deletions packages/admin/src-admin/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2411,9 +2411,13 @@ class App extends Router<AppProps, AppState> {
if (this.state.user && this.props.width !== 'xs' && this.props.width !== 'sm') {
return (
<div>
{this.state.systemConfig.common.siteName ? (
<div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
) : null}
{
// @ts-expect-error fixed in js-controller 7
this.state.systemConfig.common.siteName ? (
// @ts-expect-error fixed in js-controller 7
<div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
) : null
}

<Box
component="div"
Expand Down Expand Up @@ -2456,7 +2460,9 @@ class App extends Router<AppProps, AppState> {
</div>
);
}
// @ts-expect-error fixed in js-controller 7
if (this.props.width !== 'xs' && this.props.width !== 'sm' && this.state.systemConfig.common.siteName) {
// @ts-expect-error fixed in js-controller 7
return <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>;
}
return null;
Expand Down
2 changes: 2 additions & 0 deletions packages/admin/src-admin/src/components/Object/ObjectChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
from: false,
ack: false,
q: false,
// @ts-expect-error fixed in js-controller 7
addId: false,
aggregate: 'none',
})
Expand Down Expand Up @@ -565,6 +566,7 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
from: false,
ack: false,
q: false,
// @ts-expect-error fixed in js-controller 7
addId: false,
aggregate: 'none',
returnNewestEntries: true,
Expand Down
2 changes: 2 additions & 0 deletions packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
from: true,
ack: true,
q: true,
// @ts-expect-error fixed in js-controller 7
addId: false,
aggregate: 'none',
returnNewestEntries: true,
Expand Down Expand Up @@ -633,6 +634,7 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
from: false,
ack: false,
q: false,
// @ts-expect-error fixed in js-controller 7
addId: false,
aggregate: 'none',
})
Expand Down
2 changes: 2 additions & 0 deletions packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,13 +655,15 @@ class MainSettingsDialog extends BaseSystemSettingsDialog<Props, State> {
variant="standard"
id="siteName"
label={this.props.t('Site name')}
// @ts-expect-error Fixed in js-controller 7
value={this.props.data.common.siteName || ''}
onChange={e => this.doChange('siteName', e.target.value)}
helperText={this.props.t(
"This name will be shown in admin's header. Just to identify the whole installation",
)}
slotProps={{
input: {
// @ts-expect-error Fixed in js-controller 7
endAdornment: this.props.data.common.siteName ? (
<InputAdornment position="end">
<IconButton
Expand Down
1 change: 1 addition & 0 deletions packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ class RepositoriesDialog extends BaseSystemSettingsDialog<RepositoriesDialogProp
<span>
<Checkbox
disabled
// @ts-expect-error Fixed in js-controller 7
checked={this.props.repoInfo[item.title]?.stable}
indeterminate={!this.props.repoInfo[item.title]}
/>
Expand Down
1 change: 1 addition & 0 deletions packages/dm-gui-components/src/Communication.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,7 @@ class Communication<P extends CommunicationProps, S extends CommunicationState>
open={!0}
onClose={() => this.state.form?.handleClose && this.state.form.handleClose()}
hideBackdrop
fullWidth
maxWidth={this.state.form.maxWidth || 'md'}
>
{this.state.form?.title ? (
Expand Down
Loading