Fixing dm components (#2860)

ioBroker · Dec 11, 2024 · 5fdaf06 · 5fdaf06
1 parent 7a7a77b
commit 5fdaf06
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 70 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -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

diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -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:
@@ -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/

diff --git a/packages/admin/src-admin/src/App.tsx b/packages/admin/src-admin/src/App.tsx
@@ -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"
@@ -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;

diff --git a/packages/admin/src-admin/src/components/Object/ObjectChart.tsx b/packages/admin/src-admin/src/components/Object/ObjectChart.tsx
@@ -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',
                 })
@@ -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,

diff --git a/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx b/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
@@ -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,
@@ -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',
             })

diff --git a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
@@ -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

diff --git a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx
@@ -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]}
                             />

diff --git a/packages/dm-gui-components/src/Communication.tsx b/packages/dm-gui-components/src/Communication.tsx
@@ -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 ? (