@iobroker/adapter-react-v5 7.2.2 → 7.2.4

package/src/Components/ObjectBrowser.tsx

@@ -28,7 +28,6 @@ import {
     ListItem,
     ListItemButton,
     ListItemIcon,
-    ListItemSecondaryAction,
     ListItemText,
     Menu,
     MenuItem,
@@ -1111,11 +1110,14 @@ function binarySearch(list: string[], find: string, _start?: number, _end?: numb
 }
 
 function getName(name: ioBroker.StringOrTranslated, lang: ioBroker.Languages): string {
-    if (name && typeof name === 'object') {
+    if (typeof name === 'object') {
+        if (!name) {
+            return '';
+        }
         return (name[lang] || name.en || '').toString();
     }
 
-    return (name || '').toString();
+    return name ? name.toString() : '';
 }
 
 export function getSelectIdIconFromObjects(
@@ -3824,13 +3826,16 @@ export class ObjectBrowserClass extends Component<ObjectBrowserProps, ObjectBrow
         obj: ioBroker.AdapterObject,
     ): Record<string, CustomAdminColumnStored[]> | null {
         if (obj.common && obj.common.adminColumns && obj.common.name) {
-            let columns: string | (string | ioBroker.CustomAdminColumn)[] = obj.common.adminColumns;
+            const columns: string | (string | ioBroker.CustomAdminColumn)[] = obj.common.adminColumns;
+            let aColumns: (string | ioBroker.CustomAdminColumn)[] | undefined;
             if (columns && typeof columns !== 'object') {
-                columns = [columns];
+                aColumns = [columns];
+            } else if (columns) {
+                aColumns = columns as (string | ioBroker.CustomAdminColumn)[];
             }
             let cColumns: CustomAdminColumnStored[] | null;
             if (columns) {
-                cColumns = (columns as (string | ioBroker.CustomAdminColumn)[])
+                cColumns = aColumns
                     .map((_item: string | ioBroker.CustomAdminColumn) => {
                         if (typeof _item !== 'object') {
                             return { path: _item, name: _item.split('.').pop() };
@@ -3866,7 +3871,7 @@ export class ObjectBrowserClass extends Component<ObjectBrowserProps, ObjectBrow
                             objTypes: item.objTypes,
                         } as CustomAdminColumnStored;
                     })
-                    .filter(item => item) as CustomAdminColumnStored[];
+                    .filter((item: CustomAdminColumnStored) => item);
             } else {
                 cColumns = null;
             }
@@ -7753,22 +7758,30 @@ export class ObjectBrowserClass extends Component<ObjectBrowserProps, ObjectBrow
 
     /**
      * Find the id from the root
+     *
+     * @param root The current root
+     * @param id The object id to find
      */
-    private static getItemFromRoot(
-        /** The current root */
-        root: TreeItem,
-        /** the object id to find */
-        id: string,
-    ): TreeItem | null {
+    private static getItemFromRoot(root: TreeItem, id: string): TreeItem | null {
         const idArr = id.split('.');
         let currId = '';
         let _root: TreeItem | null | undefined = root;
 
-        for (const idEntry of idArr) {
+        for (let i = 0; i < idArr.length; i++) {
+            const idEntry = idArr[i];
             currId = currId ? `${currId}.${idEntry}` : idEntry;
-            _root = _root.children?.find(item => item.data.id === currId);
-            if (!_root) {
-                break;
+            let found = false;
+            if (_root.children) {
+                for (let j = 0; j < _root.children.length; j++) {
+                    if (_root.children[j].data.id === currId) {
+                        _root = _root.children[j];
+                        found = true;
+                        break;
+                    }
+                }
+            }
+            if (!found) {
+                return null;
             }
         }
 
@@ -8495,7 +8508,6 @@ export class ObjectBrowserClass extends Component<ObjectBrowserProps, ObjectBrow
                     !this.props.notEditable &&
                     this.props.objectBrowserAliasEditor &&
                     this.props.objectBrowserEditObject &&
-                    this.state.filter.expertMode &&
                     obj?.type === 'state' &&
                     // @ts-expect-error deprecated from js-controller 6
                     obj.common?.type !== 'file'
@@ -8630,9 +8642,9 @@ export class ObjectBrowserClass extends Component<ObjectBrowserProps, ObjectBrow
                                 {ITEMS[key].label}
                                 ...
                             </ListItemText>
-                            <ListItemSecondaryAction>
+                            <div style={{ ...styles.contextMenuKeys, opacity: 1 }}>
                                 <ArrowRightIcon />
-                            </ListItemSecondaryAction>
+                            </div>
                         </MenuItem>,
                     );
 

package/src/Components/Schedule.tsx

@@ -1,6 +1,17 @@
 import React, { Component, type JSX } from 'react';
 
-import { Input, Radio, FormControlLabel, FormGroup, Checkbox, MenuItem, Select, TextField, Box } from '@mui/material';
+import {
+    Input,
+    Radio,
+    FormControlLabel,
+    FormGroup,
+    Checkbox,
+    MenuItem,
+    Select,
+    TextField,
+    Box,
+    type Theme,
+} from '@mui/material';
 
 import I18n from '../i18n';
 import type { IobTheme } from '../types';
@@ -547,14 +558,14 @@ class Schedule extends Component<ScheduleProps, ScheduleState> {
                     // every minute
                     desc.push(I18n.t('sch_desc_everyMinute'));
                 } else {
-                    // every N minutes
+                    // every N minute
                     desc.push(I18n.t('sch_desc_everyNMinutes', schedule.time.interval.toString()));
                 }
             } else if (schedule.time.interval === 1) {
                 // every minute
                 desc.push(I18n.t('sch_desc_everyHour'));
             } else {
-                // every N minutes
+                // every N minute
                 desc.push(I18n.t('sch_desc_everyNHours', schedule.time.interval.toString()));
             }
 
@@ -650,6 +661,11 @@ class Schedule extends Component<ScheduleProps, ScheduleState> {
                                             style={{ ...styles.inputTime, marginRight: 10 }}
                                             key="exactTimeFrom"
                                             type="time"
+                                            sx={(theme: Theme) => ({
+                                                '& input[type="time"]::-webkit-calendar-picker-indicator': {
+                                                    filter: theme.palette.mode === 'dark' ? 'invert(80%)' : undefined,
+                                                },
+                                            })}
                                             value={this.state.schedule.time.start}
                                             // InputProps={{inputComponent: TextTime}}
                                             onChange={e => {
@@ -668,6 +684,11 @@ class Schedule extends Component<ScheduleProps, ScheduleState> {
                                             style={styles.inputTime}
                                             key="exactTimeTo"
                                             type="time"
+                                            sx={(theme: Theme) => ({
+                                                '& input[type="time"]::-webkit-calendar-picker-indicator': {
+                                                    filter: theme.palette.mode === 'dark' ? 'invert(80%)' : undefined,
+                                                },
+                                            })}
                                             value={this.state.schedule.time.end}
                                             // InputProps={{inputComponent: TextTime}}
                                             onChange={e => {
@@ -746,7 +767,7 @@ class Schedule extends Component<ScheduleProps, ScheduleState> {
                             </div>
                         )}
                     </div>
-                    {!schedule.time.exactTime && this.getPeriodSettingsMinutes()}
+                    {!schedule.time.exactTime && this.getPeriodSettingsMinutes(fromTo)}
                 </div>
             </div>
         );
@@ -810,13 +831,19 @@ class Schedule extends Component<ScheduleProps, ScheduleState> {
                             key="exactTimeValue"
                             value={this.state.schedule.time.start}
                             type="time"
-                            // inputComponent={TextTime}
+                            sx={(theme: Theme) => ({
+                                '& input[type="time"]::-webkit-calendar-picker-indicator': {
+                                    filter: theme.palette.mode === 'dark' ? 'invert(80%)' : undefined,
+                                },
+                            })}
                             onChange={e => {
                                 const _schedule = JSON.parse(JSON.stringify(this.state.schedule));
                                 _schedule.time.start = e.target.value;
                                 this.onChange(_schedule);
                             }}
-                            InputLabelProps={{ shrink: true }}
+                            slotProps={{
+                                inputLabel: { shrink: true },
+                            }}
                             margin="normal"
                         />
                     </div>
@@ -906,7 +933,9 @@ class Schedule extends Component<ScheduleProps, ScheduleState> {
                                     e.target.value,
                                 );
                             }}
-                            InputLabelProps={{ shrink: true }}
+                            slotProps={{
+                                inputLabel: { shrink: true },
+                            }}
                             label={I18n.t('sch_at')}
                             margin="normal"
                         />
@@ -1173,13 +1202,16 @@ class Schedule extends Component<ScheduleProps, ScheduleState> {
         ];
     }
 
-    getPeriodSettingsMinutes(): JSX.Element {
+    getPeriodSettingsMinutes(fromTo: boolean): JSX.Element {
         return (
-            <div style={{ display: 'inline-block' }}>
-                <label>{I18n.t('sch_every')}</label>
+            <div style={{ display: 'inline-block', marginTop: fromTo ? 15 : 'inherit' }}>
+                <label style={{ marginLeft: 4, marginRight: 4 }}>{I18n.t('sch_every')}</label>
                 <Input
                     value={this.state.schedule.time.interval}
-                    style={{ ...styles.inputEvery, verticalAlign: 'bottom' }}
+                    style={{
+                        ...styles.inputEvery,
+                        verticalAlign: 'bottom',
+                    }}
                     type="number"
                     inputProps={{ min: 1 }}
                     onChange={e => {
@@ -1882,7 +1914,9 @@ class Schedule extends Component<ScheduleProps, ScheduleState> {
                                 e.target.value,
                             );
                         }}
-                        InputLabelProps={{ shrink: true }}
+                        slotProps={{
+                            inputLabel: { shrink: true },
+                        }}
                         margin="normal"
                     />
                     <FormControlLabel
@@ -1931,7 +1965,9 @@ class Schedule extends Component<ScheduleProps, ScheduleState> {
                                     e.target.value,
                                 );
                             }}
-                            InputLabelProps={{ shrink: true }}
+                            slotProps={{
+                                inputLabel: { shrink: true },
+                            }}
                             margin="normal"
                         />
                     )}

package/src/Dialogs/SimpleCron.tsx

@@ -77,6 +77,7 @@ class DialogSimpleCron extends React.Component<DialogCronProps, DialogCronState>
                 <DialogActions>
                     <Button
                         variant="contained"
+                        disabled={!this.state.cron || this.state.cron.includes('_')}
                         onClick={() => this.handleOk()}
                         color="primary"
                         startIcon={<IconOk />}

package/src/icons/IconClosed.tsx

@@ -14,7 +14,7 @@ const IconClosed = (props: IconProps): React.JSX.Element => (
     >
         <path
             fill="currentColor"
-            d="M464 128H272l-64-64H48C21.49 64 0 85.49 0 112v288c0 26.51 21.49 48 48 48h416c26.51 0 48-21.49 48-48V176c0-26.51-21.49-48-48-48z"
+            d="m524,128l-192,0l-64,-64l-160,0c-26.51,0 -48,21.49 -48,48l0,288c0,26.51 21.49,48 48,48l416,0c26.51,0 48,-21.49 48,-48l0,-224c0,-26.51 -21.49,-48 -48,-48z"
         />
     </svg>
 );

package/src/icons/IconOpen.tsx

@@ -14,7 +14,7 @@ const IconOpen = (props: IconProps): JSX.Element => (
     >
         <path
             fill="currentColor"
-            d="M572.694 292.093L500.27 416.248A63.997 63.997 0 0 1 444.989 448H45.025c-18.523 0-30.064-20.093-20.731-36.093l72.424-124.155A64 64 0 0 1 152 256h399.964c18.523 0 30.064 20.093 20.73 36.093zM152 224h328v-48c0-26.51-21.49-48-48-48H272l-64-64H48C21.49 64 0 85.49 0 112v278.046l69.077-118.418C86.214 242.25 117.989 224 152 224z"
+            d="m631.75617,292.093l-72.424,124.155a63.997,63.997 0 0 1 -55.281,31.752l-399.964,0c-18.523,0 -30.064,-20.093 -20.731,-36.093l72.424,-124.155a64,64 0 0 1 55.282,-31.752l399.964,0c18.523,0 30.064,20.093 20.73,36.093zm-420.694,-68.093l328,0l0,-48c0,-26.51 -21.49,-48 -48,-48l-160,0l-64,-64l-160,0c-26.51,0 -48,21.49 -48,48l0,278.046l69.077,-118.418c17.137,-29.378 48.912,-47.628 82.923,-47.628z"
         />
     </svg>
 );