Corrected build CI

ioBroker · Dec 8, 2024 · fe7ff6c · fe7ff6c
1 parent 8808e77
commit fe7ff6c
Show file tree

Hide file tree

Showing 10 changed files with 108 additions and 130 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/adapter-react-v5/package.json b/packages/adapter-react-v5/package.json
@@ -56,12 +56,12 @@
     "dependencies": {
         "@emotion/react": "^11.13.5",
         "@emotion/styled": "^11.13.5",
-        "@iobroker/js-controller-common": "^7.0.4",
-        "@iobroker/js-controller-common-db": "^7.0.4",
+        "@iobroker/js-controller-common": "^7.0.5",
+        "@iobroker/js-controller-common-db": "^7.0.5",
         "@iobroker/socket-client": "^3.1.3",
-        "@iobroker/types": "^7.0.4",
-        "@mui/icons-material": "^6.1.9",
-        "@mui/material": "^6.1.9",
+        "@iobroker/types": "^7.0.5",
+        "@mui/icons-material": "^6.1.10",
+        "@mui/material": "^6.1.10",
         "@sentry/browser": "^8.42.0",
         "cronstrue": "^2.52.0",
         "react-color": "^2.19.3",

diff --git a/packages/admin/package.json b/packages/admin/package.json
@@ -25,7 +25,7 @@
     "dependencies": {
         "@iobroker/adapter-core": "^3.2.3",
         "@iobroker/i18n": "^0.3.1",
-        "@iobroker/socket-classes": "^1.6.1",
+        "@iobroker/socket-classes": "^1.6.2",
         "@iobroker/webserver": "^1.0.6",
         "@iobroker/ws": "^2.0.0",
         "@iobroker/ws-server": "4.1.0",

diff --git a/packages/admin/src-admin/src/App.tsx b/packages/admin/src-admin/src/App.tsx
@@ -2411,13 +2411,9 @@ class App extends Router<AppProps, AppState> {
         if (this.state.user && this.props.width !== 'xs' && this.props.width !== 'sm') {
             return (
                 <div>
-                    {
-                        // @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
-                    }
+                    {this.state.systemConfig.common.siteName ? (
+                        <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
+                    ) : null}
 
                     <Box
                         component="div"
@@ -2460,9 +2456,7 @@ 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,7 +520,7 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
                     from: false,
                     ack: false,
                     q: false,
-                    addID: false,
+                    addId: false,
                     aggregate: 'none',
                 })
                 .then((values: { val: ioBroker.StateValue; ts: number }[]) => {
@@ -565,7 +565,7 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
             from: false,
             ack: false,
             q: false,
-            addID: false,
+            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,7 +522,7 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
                 from: true,
                 ack: true,
                 q: true,
-                addID: false,
+                addId: false,
                 aggregate: 'none',
                 returnNewestEntries: true,
             })
@@ -633,7 +633,7 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
                 from: false,
                 ack: false,
                 q: false,
-                addID: false,
+                addId: false,
                 aggregate: 'none',
             })
             .then((values: ioBroker.GetHistoryResult) => {

diff --git a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
@@ -19,8 +19,7 @@ import {
 
 import { Close as CloseIcon } from '@mui/icons-material';
 
-import { Marker } from 'leaflet';
-import type { DragEndEvent, LatLngTuple, Map } from 'leaflet';
+import { Marker, type DragEndEvent, type LatLngTuple, type Map } from 'leaflet';
 
 import { DialogConfirm, withWidth, I18n, type Translate } from '@iobroker/adapter-react-v5';
 import { type AdminGuiConfig } from '@/types';
@@ -656,15 +655,13 @@ 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,7 +459,6 @@ class RepositoriesDialog extends BaseSystemSettingsDialog<RepositoriesDialogProp
                         <span>
                             <Checkbox
                                 disabled
-                                // @ts-expect-error will be fixed in js-controller 7
                                 checked={this.props.repoInfo[item.title]?.stable}
                                 indeterminate={!this.props.repoInfo[item.title]}
                             />

diff --git a/packages/admin/src/lib/web.ts b/packages/admin/src/lib/web.ts
@@ -389,7 +389,6 @@ class Web {
             `system.adapter.${adapterName}`,
         );
 
-        // @ts-expect-error fixed in js-controller 7.x
         if (res?.common.adminUI?.config === 'json') {
             try {
                 const ajv = new Ajv({

diff --git a/packages/admin/src/main.ts b/packages/admin/src/main.ts
@@ -1949,7 +1949,6 @@ class Admin extends Adapter {
             );
             this.changedPasswords.push(found);
 
-            // @ts-expect-error types defined in js-controller 7
             await this.registerNotification('admin', 'wellKnownPassword', I18n.translate('User: %s', found.login), {
                 contextData: {
                     admin: {