@iobroker/adapter-react-v5 8.2.12 → 8.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -2
- package/build/Components/DeviceType/DeviceTypeSelector.js +2 -2
- package/build/Components/DeviceType/DeviceTypeSelector.js.map +1 -1
- package/build/Components/FileBrowser.js +1 -1
- package/build/Components/FileBrowser.js.map +1 -1
- package/build/Components/Image.js +8 -4
- package/build/Components/Image.js.map +1 -1
- package/build/Components/IobUri.js +3 -3
- package/build/Components/IobUri.js.map +1 -1
- package/build/Components/ObjectBrowser.d.ts +2 -2
- package/build/Components/ObjectBrowser.js +46 -38
- package/build/Components/ObjectBrowser.js.map +1 -1
- package/build/Components/Schedule.d.ts +26 -1
- package/build/Components/Schedule.js +37 -24
- package/build/Components/Schedule.js.map +1 -1
- package/build/Components/SelectWithIcon.js +1 -1
- package/build/Components/SelectWithIcon.js.map +1 -1
- package/build/Components/TextWithIcon.js.map +1 -1
- package/build/Components/TreeTable.js +3 -3
- package/build/Components/TreeTable.js.map +1 -1
- package/build/Components/Utils.d.ts +1 -1
- package/build/Components/Utils.js +2 -2
- package/build/Components/Utils.js.map +1 -1
- package/build/Components/objectBrowserUtils.js +9 -6
- package/build/Components/objectBrowserUtils.js.map +1 -1
- package/build/LegacyConnection.d.ts +2 -2
- package/build/LegacyConnection.js.map +1 -1
- package/package.json +4 -4
|
@@ -82,10 +82,14 @@ export class Image extends Component {
|
|
|
82
82
|
try {
|
|
83
83
|
src = atob(src);
|
|
84
84
|
const svg = getElementFromSource(src);
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
svg
|
|
88
|
-
|
|
85
|
+
let inner;
|
|
86
|
+
let svgProps;
|
|
87
|
+
if (svg) {
|
|
88
|
+
inner = svg.innerHTML;
|
|
89
|
+
svgProps = serializeAttrs(svg.attributes);
|
|
90
|
+
svg.remove();
|
|
91
|
+
}
|
|
92
|
+
return (React.createElement(Box, { component: "svg", sx: this.props.sx, className: this.props.className, style: this.state.color ? { color: this.state.color } : undefined, ...svgProps, dangerouslySetInnerHTML: { __html: inner || '' } }));
|
|
89
93
|
}
|
|
90
94
|
catch {
|
|
91
95
|
// ignore
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.js","sourceRoot":"./src/","sources":["Components/Image.tsx"],"names":[],"mappings":"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","sourcesContent":["import React, { type JSX, Component } from 'react';\n\nimport { Box, type SxProps } from '@mui/material';\n\nimport { IconNoIcon } from '../icons/IconNoIcon';\n\nfunction getElementFromSource(src: string): HTMLElement | null {\n const svgContainer = document.createElement('div');\n svgContainer.innerHTML = src;\n const svg: HTMLElement = svgContainer.firstElementChild as HTMLElement;\n if (svg?.remove) {\n svg.remove();\n } else if (svg) {\n svgContainer.removeChild(svg);\n }\n\n svgContainer.remove();\n return svg;\n}\n\nfunction serializeAttrs(map?: NamedNodeMap): Record<string, string> {\n const ret: Record<string, string> = {};\n if (!map) {\n return ret;\n }\n for (let prop, i = 0; i < map.length; i++) {\n const key = map[i].name;\n if (key === 'class') {\n prop = 'className';\n } else if (!key.startsWith('data-')) {\n prop = key.replace(/[-|:]([a-z])/g, g => g[1].toUpperCase());\n } else {\n prop = key;\n }\n\n ret[prop] = map[i].value;\n }\n return ret;\n}\n\ninterface ImageProps {\n /* The color */\n color?: string;\n /* The source of the image */\n src?: string;\n /* The image prefix (default: './files/') */\n imagePrefix?: string;\n /* The CSS class name */\n className?: string;\n /* Show image errors (or just show no image)? */\n showError?: boolean;\n sx?: SxProps;\n}\n\ninterface ImageState {\n svg?: boolean;\n created?: boolean;\n color?: string;\n src?: string;\n imgError?: boolean;\n showError?: boolean;\n}\n\n/**\n * A component for displaying an image.\n */\nexport class Image extends Component<ImageProps, ImageState> {\n private svg: JSX.Element | null;\n\n static REMOTE_SERVER: boolean = window.location.hostname.includes('iobroker.in');\n\n static REMOTE_PREFIX: string = window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/') + 1);\n\n constructor(props: ImageProps) {\n super(props);\n this.state = {\n svg: !!this.props.src?.startsWith('data:'),\n created: true,\n color: this.props.color || '',\n src: this.props.src || '',\n imgError: false,\n showError: !!this.props.showError,\n };\n\n this.svg = this.state.svg && this.state.src ? this.getSvgFromData(this.state.src) : null;\n }\n\n static getDerivedStateFromProps(props: ImageProps, state: ImageState): Partial<ImageState> | null {\n const newState: ImageState = {};\n let changed = false;\n\n if (props && state && props.src !== state.src) {\n newState.src = props.src;\n newState.svg = props.src?.startsWith('data:');\n newState.created = false;\n changed = true;\n }\n\n if (props && state && props.color !== state.color) {\n newState.color = props.color;\n newState.created = false;\n changed = true;\n }\n\n if (props && state && props.showError !== state.showError) {\n newState.showError = props.showError;\n changed = true;\n }\n\n return changed ? newState : null;\n }\n\n getSvgFromData(src: string): JSX.Element | null {\n const len = 'data:image/svg+xml;base64,';\n if (!src.startsWith(len)) {\n return null;\n }\n src = src.substring(len.length);\n try {\n src = atob(src);\n const svg: HTMLElement = getElementFromSource(src);\n const inner = svg.innerHTML;\n const svgProps = serializeAttrs(svg.attributes);\n\n svg.remove();\n\n return (\n <Box\n component=\"svg\"\n sx={this.props.sx}\n className={this.props.className}\n style={this.state.color ? { color: this.state.color } : undefined}\n {...svgProps}\n dangerouslySetInnerHTML={{ __html: inner }}\n />\n );\n } catch {\n // ignore\n }\n return null;\n }\n\n render(): JSX.Element | null {\n if (this.state.svg) {\n if (!this.state.created) {\n setTimeout(() => {\n this.svg = this.state.src ? this.getSvgFromData(this.state.src) : null;\n this.setState({ created: true });\n }, 50);\n }\n\n return this.svg;\n }\n if (this.state.src) {\n if (this.state.imgError || !this.state.src) {\n return <IconNoIcon className={this.props.className} />;\n }\n if (\n Image.REMOTE_SERVER &&\n !this.state.src.startsWith('http://') &&\n !this.state.src.startsWith('https://')\n ) {\n let src = (this.props.imagePrefix || '') + this.state.src;\n if (src.startsWith('./')) {\n src = Image.REMOTE_PREFIX + src.substring(2);\n } else if (!src.startsWith('/')) {\n src = Image.REMOTE_PREFIX + src;\n }\n return (\n <Box\n component=\"img\"\n sx={this.props.sx}\n className={this.props.className}\n src={`https://remote-files.iobroker.in${src}`}\n alt=\"\"\n onError={() =>\n this.props.showError ? this.setState({ imgError: true }) : this.setState({ src: '' })\n }\n />\n );\n }\n\n return (\n <Box\n component=\"img\"\n sx={this.props.sx}\n className={this.props.className}\n src={(this.props.imagePrefix || '') + this.state.src}\n alt=\"\"\n onError={() =>\n this.props.showError ? this.setState({ imgError: true }) : this.setState({ src: '' })\n }\n />\n );\n }\n\n return null;\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"Image.js","sourceRoot":"./src/","sources":["Components/Image.tsx"],"names":[],"mappings":"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","sourcesContent":["import React, { type JSX, Component } from 'react';\n\nimport { Box, type SxProps } from '@mui/material';\n\nimport { IconNoIcon } from '../icons/IconNoIcon';\n\nfunction getElementFromSource(src: string): HTMLElement | null {\n const svgContainer = document.createElement('div');\n svgContainer.innerHTML = src;\n const svg: HTMLElement = svgContainer.firstElementChild as HTMLElement;\n if (svg?.remove) {\n svg.remove();\n } else if (svg) {\n svgContainer.removeChild(svg);\n }\n\n svgContainer.remove();\n return svg;\n}\n\nfunction serializeAttrs(map?: NamedNodeMap): Record<string, string> {\n const ret: Record<string, string> = {};\n if (!map) {\n return ret;\n }\n for (let prop, i = 0; i < map.length; i++) {\n const key = map[i].name;\n if (key === 'class') {\n prop = 'className';\n } else if (!key.startsWith('data-')) {\n prop = key.replace(/[-|:]([a-z])/g, g => g[1].toUpperCase());\n } else {\n prop = key;\n }\n\n ret[prop] = map[i].value;\n }\n return ret;\n}\n\ninterface ImageProps {\n /* The color */\n color?: string;\n /* The source of the image */\n src?: string;\n /* The image prefix (default: './files/') */\n imagePrefix?: string;\n /* The CSS class name */\n className?: string;\n /* Show image errors (or just show no image)? */\n showError?: boolean;\n sx?: SxProps;\n}\n\ninterface ImageState {\n svg?: boolean;\n created?: boolean;\n color?: string;\n src?: string;\n imgError?: boolean;\n showError?: boolean;\n}\n\n/**\n * A component for displaying an image.\n */\nexport class Image extends Component<ImageProps, ImageState> {\n private svg: JSX.Element | null;\n\n static REMOTE_SERVER: boolean = window.location.hostname.includes('iobroker.in');\n\n static REMOTE_PREFIX: string = window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/') + 1);\n\n constructor(props: ImageProps) {\n super(props);\n this.state = {\n svg: !!this.props.src?.startsWith('data:'),\n created: true,\n color: this.props.color || '',\n src: this.props.src || '',\n imgError: false,\n showError: !!this.props.showError,\n };\n\n this.svg = this.state.svg && this.state.src ? this.getSvgFromData(this.state.src) : null;\n }\n\n static getDerivedStateFromProps(props: ImageProps, state: ImageState): Partial<ImageState> | null {\n const newState: ImageState = {};\n let changed = false;\n\n if (props && state && props.src !== state.src) {\n newState.src = props.src;\n newState.svg = props.src?.startsWith('data:');\n newState.created = false;\n changed = true;\n }\n\n if (props && state && props.color !== state.color) {\n newState.color = props.color;\n newState.created = false;\n changed = true;\n }\n\n if (props && state && props.showError !== state.showError) {\n newState.showError = props.showError;\n changed = true;\n }\n\n return changed ? newState : null;\n }\n\n getSvgFromData(src: string): JSX.Element | null {\n const len = 'data:image/svg+xml;base64,';\n if (!src.startsWith(len)) {\n return null;\n }\n src = src.substring(len.length);\n try {\n src = atob(src);\n const svg: HTMLElement | null = getElementFromSource(src);\n let inner: string | undefined;\n let svgProps: Record<string, string> | undefined;\n if (svg) {\n inner = svg.innerHTML;\n svgProps = serializeAttrs(svg.attributes);\n svg.remove();\n }\n\n return (\n <Box\n component=\"svg\"\n sx={this.props.sx}\n className={this.props.className}\n style={this.state.color ? { color: this.state.color } : undefined}\n {...svgProps}\n dangerouslySetInnerHTML={{ __html: inner || '' }}\n />\n );\n } catch {\n // ignore\n }\n return null;\n }\n\n render(): JSX.Element | null {\n if (this.state.svg) {\n if (!this.state.created) {\n setTimeout(() => {\n this.svg = this.state.src ? this.getSvgFromData(this.state.src) : null;\n this.setState({ created: true });\n }, 50);\n }\n\n return this.svg;\n }\n if (this.state.src) {\n if (this.state.imgError || !this.state.src) {\n return <IconNoIcon className={this.props.className} />;\n }\n if (\n Image.REMOTE_SERVER &&\n !this.state.src.startsWith('http://') &&\n !this.state.src.startsWith('https://')\n ) {\n let src = (this.props.imagePrefix || '') + this.state.src;\n if (src.startsWith('./')) {\n src = Image.REMOTE_PREFIX + src.substring(2);\n } else if (!src.startsWith('/')) {\n src = Image.REMOTE_PREFIX + src;\n }\n return (\n <Box\n component=\"img\"\n sx={this.props.sx}\n className={this.props.className}\n src={`https://remote-files.iobroker.in${src}`}\n alt=\"\"\n onError={() =>\n this.props.showError ? this.setState({ imgError: true }) : this.setState({ src: '' })\n }\n />\n );\n }\n\n return (\n <Box\n component=\"img\"\n sx={this.props.sx}\n className={this.props.className}\n src={(this.props.imagePrefix || '') + this.state.src}\n alt=\"\"\n onError={() =>\n this.props.showError ? this.setState({ imgError: true }) : this.setState({ src: '' })\n }\n />\n );\n }\n\n return null;\n }\n}\n"]}
|
|
@@ -43,7 +43,7 @@ export function iobUriParse(uri) {
|
|
|
43
43
|
result.type = 'file';
|
|
44
44
|
uri = uri.replace('iobfile://', '');
|
|
45
45
|
const parts = uri.split('/');
|
|
46
|
-
result.address = parts.shift();
|
|
46
|
+
result.address = parts.shift() || '';
|
|
47
47
|
result.path = parts.join('/'); // main/img/hello.png
|
|
48
48
|
}
|
|
49
49
|
else if (uri.startsWith('http://') || uri.startsWith('https://')) {
|
|
@@ -97,7 +97,7 @@ export function iobUriParse(uri) {
|
|
|
97
97
|
}
|
|
98
98
|
else {
|
|
99
99
|
// it is a file
|
|
100
|
-
result.address = parts.shift();
|
|
100
|
+
result.address = parts.shift() || '';
|
|
101
101
|
result.type = 'file';
|
|
102
102
|
result.path = parts.join('/');
|
|
103
103
|
}
|
|
@@ -146,7 +146,7 @@ export async function iobUriRead(uri, socket) {
|
|
|
146
146
|
return state?.[uri.path];
|
|
147
147
|
}
|
|
148
148
|
if (uri.type === 'file') {
|
|
149
|
-
return await socket.readFile(uri.address, uri.path, true);
|
|
149
|
+
return await socket.readFile(uri.address, uri.path || '', true);
|
|
150
150
|
}
|
|
151
151
|
if (uri.type === 'http') {
|
|
152
152
|
return fetch(uri.address)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IobUri.js","sourceRoot":"./src/","sources":["Components/IobUri.tsx"],"names":[],"mappings":"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","sourcesContent":["import type { Connection } from '../index';\n\nexport type IobUri = string;\nexport type IobUriType = 'object' | 'state' | 'file' | 'http' | 'base64';\n\nexport type IobUriParsed = { type: IobUriType; address: string; path?: string };\n\nexport function iobUriToString(uri: IobUriParsed): IobUri {\n if (uri.type === 'object') {\n return `iobobject://${uri.address}/${uri.path || ''}`;\n }\n if (uri.type === 'state') {\n return `iobstate://${uri.address}`;\n }\n if (uri.type === 'file') {\n return `iobfile://${uri.address}/${uri.path || ''}`;\n }\n if (uri.type === 'http') {\n return uri.address;\n }\n if (uri.path?.includes('/')) {\n return `iobfile://${uri.address}/${uri.path}`;\n }\n if (uri.path) {\n return `iobobject://${uri.address}/${uri.path}`;\n }\n return `iobstate://${uri.address}`;\n}\n\n/** Parse ioBroker URI */\nexport function iobUriParse(uri: string): IobUriParsed {\n const result: IobUriParsed = {\n type: 'object',\n address: '',\n };\n if (uri.startsWith('iobobject://')) {\n result.type = 'object';\n uri = uri.replace('iobobject://', '');\n const parts = uri.split('/');\n result.address = parts[0];\n result.path = parts[1]; // native.schemas.myObject\n } else if (uri.startsWith('iobstate://')) {\n result.type = 'state';\n uri = uri.replace('iobstate://', '');\n const parts = uri.split('/');\n result.address = parts[0];\n result.path = parts[1]; // val, ts, lc, from, q, ...\n } else if (uri.startsWith('iobfile://')) {\n result.type = 'file';\n uri = uri.replace('iobfile://', '');\n const parts = uri.split('/');\n result.address = parts.shift();\n result.path = parts.join('/'); // main/img/hello.png\n } else if (uri.startsWith('http://') || uri.startsWith('https://')) {\n result.type = 'http';\n result.address = uri; // https://googlw.com/path/uri?lakds=7889\n } else if (uri.startsWith('data:')) {\n // data:image/jpeg;base64,\n result.type = 'base64';\n result.address = uri; // data:image/jpeg;base64,...\n } else {\n // no protocol provided\n const parts = uri.split('/');\n if (parts.length === 2) {\n result.address = parts[0];\n result.path = parts[1];\n if (result.path.includes('.')) {\n result.type = 'object';\n } else if (result.path) {\n if (\n result.path === 'val' ||\n result.path === 'q' ||\n result.path === 'ack' ||\n result.path === 'ts' ||\n result.path === 'lc' ||\n result.path === 'from' ||\n result.path === 'user' ||\n result.path === 'expire' ||\n result.path === 'c'\n ) {\n result.type = 'state';\n } else if (\n result.path === 'common' ||\n result.path === 'native' ||\n result.path === 'from' ||\n result.path === 'acl' ||\n result.path === 'type'\n ) {\n result.type = 'object';\n } else {\n throw new Error(`Unknown path: ${result.path}`);\n }\n } else {\n result.type = 'state';\n }\n } else if (parts.length === 1) {\n result.address = parts[0];\n result.type = 'state';\n } else {\n // it is a file\n result.address = parts.shift();\n result.type = 'file';\n result.path = parts.join('/');\n }\n }\n return result;\n}\n\nexport function getAttrInObject(\n obj: Record<string, any> | null | undefined,\n path: string[] | undefined,\n _position?: number,\n): any {\n _position ||= 0;\n if (obj === undefined || obj === null || !path) {\n return obj;\n }\n if (path.length - 1 === _position) {\n return obj[path[_position]];\n }\n if (typeof obj === 'object') {\n return getAttrInObject(obj[path[_position]], path, _position + 1);\n }\n return undefined;\n}\n\nexport function setAttrInObject(\n obj: Record<string, any> | null | undefined,\n path: string[] | undefined,\n value: any,\n _position?: number,\n): any {\n _position ||= 0;\n if (obj === undefined || obj === null || !path) {\n return value;\n }\n if (path.length - 1 === _position) {\n obj[path[_position]] = value;\n return obj;\n }\n if (typeof obj === 'object') {\n return setAttrInObject(obj[path[_position]], path, value, _position + 1);\n }\n}\n\nexport async function iobUriRead(uri: IobUri | IobUriParsed, socket: Connection): Promise<any> {\n if (typeof uri === 'string') {\n uri = iobUriParse(uri);\n }\n if (uri.type === 'object') {\n const obj: ioBroker.Object | null | undefined = await socket.getObject(uri.address);\n return getAttrInObject(obj, uri.path?.split('.'));\n }\n if (uri.type === 'state') {\n const state: ioBroker.State | null | undefined = await socket.getState(uri.address);\n if (!uri.path) {\n return state;\n }\n return (state as Record<string, any>)?.[uri.path];\n }\n if (uri.type === 'file') {\n return await socket.readFile(uri.address, uri.path, true);\n }\n if (uri.type === 'http') {\n return fetch(uri.address)\n .then(response => response.text())\n .then(text => {\n if ((text.startsWith('{') && text.endsWith('}')) || (text.startsWith('[') && text.endsWith(']'))) {\n try {\n return JSON.parse(text);\n } catch {\n // ignore\n }\n }\n return text;\n });\n }\n throw new Error(`Unknown type: ${uri.type}`);\n}\n"]}
|
|
1
|
+
{"version":3,"file":"IobUri.js","sourceRoot":"./src/","sources":["Components/IobUri.tsx"],"names":[],"mappings":"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","sourcesContent":["import type { Connection } from '../index';\n\nexport type IobUri = string;\nexport type IobUriType = 'object' | 'state' | 'file' | 'http' | 'base64';\n\nexport type IobUriParsed = { type: IobUriType; address: string; path?: string };\n\nexport function iobUriToString(uri: IobUriParsed): IobUri {\n if (uri.type === 'object') {\n return `iobobject://${uri.address}/${uri.path || ''}`;\n }\n if (uri.type === 'state') {\n return `iobstate://${uri.address}`;\n }\n if (uri.type === 'file') {\n return `iobfile://${uri.address}/${uri.path || ''}`;\n }\n if (uri.type === 'http') {\n return uri.address;\n }\n if (uri.path?.includes('/')) {\n return `iobfile://${uri.address}/${uri.path}`;\n }\n if (uri.path) {\n return `iobobject://${uri.address}/${uri.path}`;\n }\n return `iobstate://${uri.address}`;\n}\n\n/** Parse ioBroker URI */\nexport function iobUriParse(uri: string): IobUriParsed {\n const result: IobUriParsed = {\n type: 'object',\n address: '',\n };\n if (uri.startsWith('iobobject://')) {\n result.type = 'object';\n uri = uri.replace('iobobject://', '');\n const parts = uri.split('/');\n result.address = parts[0];\n result.path = parts[1]; // native.schemas.myObject\n } else if (uri.startsWith('iobstate://')) {\n result.type = 'state';\n uri = uri.replace('iobstate://', '');\n const parts = uri.split('/');\n result.address = parts[0];\n result.path = parts[1]; // val, ts, lc, from, q, ...\n } else if (uri.startsWith('iobfile://')) {\n result.type = 'file';\n uri = uri.replace('iobfile://', '');\n const parts = uri.split('/');\n result.address = parts.shift() || '';\n result.path = parts.join('/'); // main/img/hello.png\n } else if (uri.startsWith('http://') || uri.startsWith('https://')) {\n result.type = 'http';\n result.address = uri; // https://googlw.com/path/uri?lakds=7889\n } else if (uri.startsWith('data:')) {\n // data:image/jpeg;base64,\n result.type = 'base64';\n result.address = uri; // data:image/jpeg;base64,...\n } else {\n // no protocol provided\n const parts = uri.split('/');\n if (parts.length === 2) {\n result.address = parts[0];\n result.path = parts[1];\n if (result.path.includes('.')) {\n result.type = 'object';\n } else if (result.path) {\n if (\n result.path === 'val' ||\n result.path === 'q' ||\n result.path === 'ack' ||\n result.path === 'ts' ||\n result.path === 'lc' ||\n result.path === 'from' ||\n result.path === 'user' ||\n result.path === 'expire' ||\n result.path === 'c'\n ) {\n result.type = 'state';\n } else if (\n result.path === 'common' ||\n result.path === 'native' ||\n result.path === 'from' ||\n result.path === 'acl' ||\n result.path === 'type'\n ) {\n result.type = 'object';\n } else {\n throw new Error(`Unknown path: ${result.path}`);\n }\n } else {\n result.type = 'state';\n }\n } else if (parts.length === 1) {\n result.address = parts[0];\n result.type = 'state';\n } else {\n // it is a file\n result.address = parts.shift() || '';\n result.type = 'file';\n result.path = parts.join('/');\n }\n }\n return result;\n}\n\nexport function getAttrInObject(\n obj: Record<string, any> | null | undefined,\n path: string[] | undefined,\n _position?: number,\n): any {\n _position ||= 0;\n if (obj === undefined || obj === null || !path) {\n return obj;\n }\n if (path.length - 1 === _position) {\n return obj[path[_position]];\n }\n if (typeof obj === 'object') {\n return getAttrInObject(obj[path[_position]], path, _position + 1);\n }\n return undefined;\n}\n\nexport function setAttrInObject(\n obj: Record<string, any> | null | undefined,\n path: string[] | undefined,\n value: any,\n _position?: number,\n): any {\n _position ||= 0;\n if (obj === undefined || obj === null || !path) {\n return value;\n }\n if (path.length - 1 === _position) {\n obj[path[_position]] = value;\n return obj;\n }\n if (typeof obj === 'object') {\n return setAttrInObject(obj[path[_position]], path, value, _position + 1);\n }\n}\n\nexport async function iobUriRead(uri: IobUri | IobUriParsed, socket: Connection): Promise<any> {\n if (typeof uri === 'string') {\n uri = iobUriParse(uri);\n }\n if (uri.type === 'object') {\n const obj: ioBroker.Object | null | undefined = await socket.getObject(uri.address);\n return getAttrInObject(obj, uri.path?.split('.'));\n }\n if (uri.type === 'state') {\n const state: ioBroker.State | null | undefined = await socket.getState(uri.address);\n if (!uri.path) {\n return state;\n }\n return (state as Record<string, any>)?.[uri.path];\n }\n if (uri.type === 'file') {\n return await socket.readFile(uri.address, uri.path || '', true);\n }\n if (uri.type === 'http') {\n return fetch(uri.address)\n .then(response => response.text())\n .then(text => {\n if ((text.startsWith('{') && text.endsWith('}')) || (text.startsWith('[') && text.endsWith(']'))) {\n try {\n return JSON.parse(text);\n } catch {\n // ignore\n }\n }\n return text;\n });\n }\n throw new Error(`Unknown type: ${uri.type}`);\n}\n"]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright 2020-
|
|
2
|
+
* Copyright 2020-2026, Denis Haev <dogafox@gmail.com>
|
|
3
3
|
*
|
|
4
4
|
* MIT License
|
|
5
5
|
*
|
|
@@ -225,7 +225,7 @@ export declare class ObjectBrowserClass extends Component<ObjectBrowserProps, Ob
|
|
|
225
225
|
*/
|
|
226
226
|
renderItem(root: TreeItem, isExpanded: boolean | undefined, counter?: {
|
|
227
227
|
count: number;
|
|
228
|
-
}): JSX.Element[];
|
|
228
|
+
}): (JSX.Element | null)[];
|
|
229
229
|
private calculateColumnsVisibility;
|
|
230
230
|
resizerMouseMove: (e: MouseEvent) => void;
|
|
231
231
|
resizerMouseUp: () => void;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright 2020-
|
|
2
|
+
* Copyright 2020-2026, Denis Haev <dogafox@gmail.com>
|
|
3
3
|
*
|
|
4
4
|
* MIT License
|
|
5
5
|
*
|
|
@@ -37,6 +37,7 @@ const COLOR_NAME_CONNECTED_DARK = '#57ff45';
|
|
|
37
37
|
const COLOR_NAME_CONNECTED_LIGHT = '#098c04';
|
|
38
38
|
const COLOR_NAME_DISCONNECTED_DARK = '#f3ad11';
|
|
39
39
|
const COLOR_NAME_DISCONNECTED_LIGHT = '#6c5008';
|
|
40
|
+
const DEFAULT_DATE_FORMAT = 'YYYY.MM.DD';
|
|
40
41
|
const styles = {
|
|
41
42
|
toolbar: {
|
|
42
43
|
minHeight: 38, // Theme.toolbar.height,
|
|
@@ -825,7 +826,7 @@ export class ObjectBrowserClass extends Component {
|
|
|
825
826
|
resizerActiveDiv = null;
|
|
826
827
|
resizerNextDiv = null;
|
|
827
828
|
storedWidths = null;
|
|
828
|
-
systemConfig;
|
|
829
|
+
systemConfig = null;
|
|
829
830
|
objects;
|
|
830
831
|
defaultHistory = '';
|
|
831
832
|
ctrlPressed = false;
|
|
@@ -1129,22 +1130,19 @@ export class ObjectBrowserClass extends Component {
|
|
|
1129
1130
|
Object.assign(objects || {}, moreObjects);
|
|
1130
1131
|
}
|
|
1131
1132
|
}
|
|
1132
|
-
this.systemConfig
|
|
1133
|
-
|
|
1134
|
-
objects?.['system.config'] ||
|
|
1133
|
+
this.systemConfig ||=
|
|
1134
|
+
objects?.['system.config'] ||
|
|
1135
1135
|
(await props.socket.getObject('system.config'));
|
|
1136
|
-
this.systemConfig.common
|
|
1137
|
-
this.systemConfig.common.defaultNewAcl
|
|
1136
|
+
this.systemConfig.common ||= {};
|
|
1137
|
+
this.systemConfig.common.defaultNewAcl ||= {
|
|
1138
1138
|
object: 0,
|
|
1139
1139
|
state: 0,
|
|
1140
1140
|
file: 0,
|
|
1141
1141
|
owner: 'system.user.admin',
|
|
1142
1142
|
ownerGroup: 'system.group.administrator',
|
|
1143
1143
|
};
|
|
1144
|
-
this.systemConfig.common.defaultNewAcl.owner
|
|
1145
|
-
|
|
1146
|
-
this.systemConfig.common.defaultNewAcl.ownerGroup =
|
|
1147
|
-
this.systemConfig.common.defaultNewAcl.ownerGroup || 'system.group.administrator';
|
|
1144
|
+
this.systemConfig.common.defaultNewAcl.owner ||= 'system.user.admin';
|
|
1145
|
+
this.systemConfig.common.defaultNewAcl.ownerGroup ||= 'system.group.administrator';
|
|
1148
1146
|
if (typeof this.systemConfig.common.defaultNewAcl.state !== 'number') {
|
|
1149
1147
|
// TODO: may be convert here from string
|
|
1150
1148
|
this.systemConfig.common.defaultNewAcl.state = 0x664;
|
|
@@ -1728,7 +1726,7 @@ export class ObjectBrowserClass extends Component {
|
|
|
1728
1726
|
let cColumns;
|
|
1729
1727
|
if (columns) {
|
|
1730
1728
|
cColumns = aColumns
|
|
1731
|
-
|
|
1729
|
+
?.map((_item) => {
|
|
1732
1730
|
if (typeof _item !== 'object') {
|
|
1733
1731
|
return { path: _item, name: _item.split('.').pop() };
|
|
1734
1732
|
}
|
|
@@ -1768,7 +1766,7 @@ export class ObjectBrowserClass extends Component {
|
|
|
1768
1766
|
else {
|
|
1769
1767
|
cColumns = null;
|
|
1770
1768
|
}
|
|
1771
|
-
if (cColumns
|
|
1769
|
+
if (cColumns && cColumns.length) {
|
|
1772
1770
|
columnsForAdmin ||= {};
|
|
1773
1771
|
columnsForAdmin[obj.common.name] = cColumns.sort((a, b) => a.path > b.path ? -1 : a.path < b.path ? 1 : 0);
|
|
1774
1772
|
}
|
|
@@ -1979,7 +1977,7 @@ export class ObjectBrowserClass extends Component {
|
|
|
1979
1977
|
} }));
|
|
1980
1978
|
}
|
|
1981
1979
|
getFilterSelect(name, values) {
|
|
1982
|
-
return (React.createElement(CustomFilterSelect, { key: `${name}_${this.state.filterKey}`, name: name, texts: this.texts, initialValue: this.state.filter[name] || [], values: values, onChange: (name, value) => {
|
|
1980
|
+
return (React.createElement(CustomFilterSelect, { key: `${name}_${this.state.filterKey}`, name: name, texts: this.texts, initialValue: this.state.filter[name] || [], values: values || [], onChange: (name, value) => {
|
|
1983
1981
|
const filter = { ...this.state.filter };
|
|
1984
1982
|
if (value === undefined) {
|
|
1985
1983
|
delete filter[name];
|
|
@@ -2052,6 +2050,9 @@ export class ObjectBrowserClass extends Component {
|
|
|
2052
2050
|
this.setState({ expanded: [], depth: 0, selected: [] }, () => this.onAfterSelect());
|
|
2053
2051
|
}
|
|
2054
2052
|
expandDepth(root, depth, expanded) {
|
|
2053
|
+
if (!this.root) {
|
|
2054
|
+
throw new Error('No root');
|
|
2055
|
+
}
|
|
2055
2056
|
root ||= this.root;
|
|
2056
2057
|
if (depth > 0) {
|
|
2057
2058
|
root.children?.forEach(item => {
|
|
@@ -2329,7 +2330,7 @@ export class ObjectBrowserClass extends Component {
|
|
|
2329
2330
|
return null;
|
|
2330
2331
|
}
|
|
2331
2332
|
const ObjectMoveRenameDialog = this.props.objectMoveRenameDialog;
|
|
2332
|
-
return (React.createElement(ObjectMoveRenameDialog, { expertMode: this.props.expertMode, onClose: () => this.setState({ showRenameDialog: null }), id: this.state.showRenameDialog.id, childrenIds: this.state.showRenameDialog.childrenIds, theme: this.props.theme, socket: this.props.socket, t: this.props.t, objectType: this.objects[this.state.showRenameDialog.id]?.type }));
|
|
2333
|
+
return (React.createElement(ObjectMoveRenameDialog, { expertMode: !!this.props.expertMode, onClose: () => this.setState({ showRenameDialog: null }), id: this.state.showRenameDialog.id, childrenIds: this.state.showRenameDialog.childrenIds, theme: this.props.theme, socket: this.props.socket, t: this.props.t, objectType: this.objects[this.state.showRenameDialog.id]?.type }));
|
|
2333
2334
|
}
|
|
2334
2335
|
async parseJsonFile(contents) {
|
|
2335
2336
|
try {
|
|
@@ -2402,8 +2403,7 @@ export class ObjectBrowserClass extends Component {
|
|
|
2402
2403
|
if (f) {
|
|
2403
2404
|
const r = new FileReader();
|
|
2404
2405
|
r.onload = (e) => {
|
|
2405
|
-
|
|
2406
|
-
return null;
|
|
2406
|
+
this.parseJsonFile(e.target?.result).catch(e => console.log(`Cannot parse file: ${e}`));
|
|
2407
2407
|
};
|
|
2408
2408
|
r.readAsText(f);
|
|
2409
2409
|
}
|
|
@@ -2489,10 +2489,10 @@ export class ObjectBrowserClass extends Component {
|
|
|
2489
2489
|
input.click();
|
|
2490
2490
|
}
|
|
2491
2491
|
renderInputJsonDialog() {
|
|
2492
|
-
const ObjectBrowserInsertJsonObjects = this.props.objectBrowserInsertJsonObjects;
|
|
2493
2492
|
if (!this.state.showImportDialog) {
|
|
2494
2493
|
return null;
|
|
2495
2494
|
}
|
|
2495
|
+
const ObjectBrowserInsertJsonObjects = this.props.objectBrowserInsertJsonObjects;
|
|
2496
2496
|
return (React.createElement(ObjectBrowserInsertJsonObjects, { onClose: (text) => {
|
|
2497
2497
|
this.setState({ showImportDialog: false });
|
|
2498
2498
|
if (text) {
|
|
@@ -2762,8 +2762,8 @@ export class ObjectBrowserClass extends Component {
|
|
|
2762
2762
|
: 0;
|
|
2763
2763
|
const aclSystemConfig = item.data.obj.acl &&
|
|
2764
2764
|
(item.data.obj.type === 'state'
|
|
2765
|
-
? this.systemConfig
|
|
2766
|
-
: this.systemConfig
|
|
2765
|
+
? this.systemConfig?.common.defaultNewAcl.state
|
|
2766
|
+
: this.systemConfig?.common.defaultNewAcl.object);
|
|
2767
2767
|
const showEdit = this.state.filter.expertMode || isNonExpertId(item.data.id);
|
|
2768
2768
|
return [
|
|
2769
2769
|
this.state.filter.expertMode && this.props.objectEditOfAccessControl ? (React.createElement(Tooltip, { key: "acl", title: item.data.aclTooltip, slotProps: { popper: { sx: styles.tooltip } } },
|
|
@@ -2877,8 +2877,10 @@ export class ObjectBrowserClass extends Component {
|
|
|
2877
2877
|
state,
|
|
2878
2878
|
obj: obj,
|
|
2879
2879
|
texts: this.texts,
|
|
2880
|
-
dateFormat: this.props.dateFormat || this.systemConfig
|
|
2881
|
-
isFloatComma: this.props.isFloatComma === undefined
|
|
2880
|
+
dateFormat: this.props.dateFormat || this.systemConfig?.common.dateFormat || DEFAULT_DATE_FORMAT,
|
|
2881
|
+
isFloatComma: this.props.isFloatComma === undefined
|
|
2882
|
+
? (this.systemConfig?.common.isFloatComma ?? true)
|
|
2883
|
+
: this.props.isFloatComma,
|
|
2882
2884
|
full: true,
|
|
2883
2885
|
});
|
|
2884
2886
|
const valFullRx = [];
|
|
@@ -2952,9 +2954,9 @@ export class ObjectBrowserClass extends Component {
|
|
|
2952
2954
|
state,
|
|
2953
2955
|
obj: obj,
|
|
2954
2956
|
texts: this.texts,
|
|
2955
|
-
dateFormat: this.props.dateFormat || this.systemConfig
|
|
2957
|
+
dateFormat: this.props.dateFormat || this.systemConfig?.common.dateFormat || DEFAULT_DATE_FORMAT,
|
|
2956
2958
|
isFloatComma: this.props.isFloatComma === undefined
|
|
2957
|
-
? this.systemConfig
|
|
2959
|
+
? (this.systemConfig?.common.isFloatComma ?? true)
|
|
2958
2960
|
: this.props.isFloatComma,
|
|
2959
2961
|
});
|
|
2960
2962
|
const valTextRx = [];
|
|
@@ -3143,7 +3145,7 @@ export class ObjectBrowserClass extends Component {
|
|
|
3143
3145
|
if (this.state.roleDialog && this.props.objectBrowserEditRole) {
|
|
3144
3146
|
const ObjectBrowserEditRole = this.props.objectBrowserEditRole;
|
|
3145
3147
|
return (React.createElement(ObjectBrowserEditRole, { key: "objectBrowserEditRole", id: this.state.roleDialog, socket: this.props.socket, t: this.props.t, roleArray: this.info.roles, commonType: this.info.objects[this.state.roleDialog]?.common?.type, onClose: (obj) => {
|
|
3146
|
-
if (obj) {
|
|
3148
|
+
if (obj && this.state.roleDialog) {
|
|
3147
3149
|
this.info.objects[this.state.roleDialog] = obj;
|
|
3148
3150
|
}
|
|
3149
3151
|
this.setState({ roleDialog: null });
|
|
@@ -3350,7 +3352,7 @@ export class ObjectBrowserClass extends Component {
|
|
|
3350
3352
|
newValueTitle.push(`${this.texts.objectChangedBy} ${obj.user.replace(/^system\.user\./, '')}`);
|
|
3351
3353
|
}
|
|
3352
3354
|
if (obj.ts) {
|
|
3353
|
-
newValueTitle.push(`${this.texts.objectChangedByUser} ${Utils.formatDate(new Date(obj.ts), this.props.dateFormat || this.systemConfig
|
|
3355
|
+
newValueTitle.push(`${this.texts.objectChangedByUser} ${Utils.formatDate(new Date(obj.ts), this.props.dateFormat || this.systemConfig?.common.dateFormat || DEFAULT_DATE_FORMAT)}`);
|
|
3354
3356
|
}
|
|
3355
3357
|
}
|
|
3356
3358
|
let readWriteAlias = false;
|
|
@@ -3722,7 +3724,9 @@ export class ObjectBrowserClass extends Component {
|
|
|
3722
3724
|
...styles.cellRole,
|
|
3723
3725
|
width: this.props.width !== 'xs' ? this.columnsVisibility.timestamp : undefined,
|
|
3724
3726
|
} }, checkVisibleObjectType && this.states[id]?.ts
|
|
3725
|
-
? Utils.formatDate(new Date(this.states[id].ts), this.props.dateFormat ||
|
|
3727
|
+
? Utils.formatDate(new Date(this.states[id].ts), this.props.dateFormat ||
|
|
3728
|
+
this.systemConfig?.common.dateFormat ||
|
|
3729
|
+
DEFAULT_DATE_FORMAT)
|
|
3726
3730
|
: null)),
|
|
3727
3731
|
type: 'ts',
|
|
3728
3732
|
}
|
|
@@ -3734,7 +3738,9 @@ export class ObjectBrowserClass extends Component {
|
|
|
3734
3738
|
...styles.cellRole,
|
|
3735
3739
|
width: this.props.width !== 'xs' ? this.columnsVisibility.lastChange : undefined,
|
|
3736
3740
|
} }, checkVisibleObjectType && this.states[id]?.lc
|
|
3737
|
-
? Utils.formatDate(new Date(this.states[id].lc), this.props.dateFormat ||
|
|
3741
|
+
? Utils.formatDate(new Date(this.states[id].lc), this.props.dateFormat ||
|
|
3742
|
+
this.systemConfig?.common.dateFormat ||
|
|
3743
|
+
DEFAULT_DATE_FORMAT)
|
|
3738
3744
|
: null)),
|
|
3739
3745
|
type: 'lc',
|
|
3740
3746
|
}
|
|
@@ -3874,9 +3880,11 @@ export class ObjectBrowserClass extends Component {
|
|
|
3874
3880
|
state: this.states[id],
|
|
3875
3881
|
obj: this.objects[id],
|
|
3876
3882
|
texts: this.texts,
|
|
3877
|
-
dateFormat: this.props.dateFormat ||
|
|
3883
|
+
dateFormat: this.props.dateFormat ||
|
|
3884
|
+
this.systemConfig?.common.dateFormat ||
|
|
3885
|
+
DEFAULT_DATE_FORMAT,
|
|
3878
3886
|
isFloatComma: this.props.isFloatComma === undefined
|
|
3879
|
-
? this.systemConfig
|
|
3887
|
+
? (this.systemConfig?.common.isFloatComma ?? true)
|
|
3880
3888
|
: this.props.isFloatComma,
|
|
3881
3889
|
});
|
|
3882
3890
|
this.onCopy(e, valText.c !== undefined ? valText.c : valText.v.toString());
|
|
@@ -4552,10 +4560,10 @@ export class ObjectBrowserClass extends Component {
|
|
|
4552
4560
|
});
|
|
4553
4561
|
}
|
|
4554
4562
|
renderCustomDialog() {
|
|
4555
|
-
if (this.state.customDialog && this.props.objectCustomDialog) {
|
|
4563
|
+
if (this.state.customDialog && this.props.objectCustomDialog && this.systemConfig) {
|
|
4556
4564
|
const ObjectCustomDialog = this.props.objectCustomDialog;
|
|
4557
4565
|
return (React.createElement(ObjectCustomDialog, { reportChangedIds: (changedIds) => (this.changedIds = [...changedIds]), objectIDs: this.state.customDialog, allVisibleObjects: !!this.state.customDialogAll, expertMode: this.state.filter.expertMode, isFloatComma: this.props.isFloatComma === undefined
|
|
4558
|
-
? this.systemConfig
|
|
4566
|
+
? (this.systemConfig?.common.isFloatComma ?? true)
|
|
4559
4567
|
: this.props.isFloatComma, t: this.props.t, lang: this.props.lang, socket: this.props.socket, themeName: this.props.themeName, themeType: this.props.themeType, theme: this.props.theme, objects: this.objects, customsInstances: this.info.customs, onClose: () => {
|
|
4560
4568
|
this.pauseSubscribe(false);
|
|
4561
4569
|
this.setState({ customDialog: null });
|
|
@@ -4584,8 +4592,8 @@ export class ObjectBrowserClass extends Component {
|
|
|
4584
4592
|
return null;
|
|
4585
4593
|
}
|
|
4586
4594
|
const ObjectBrowserEditObject = this.props.objectBrowserEditObject;
|
|
4587
|
-
return (React.createElement(ObjectBrowserEditObject, { key: this.state.editObjectDialog, obj: this.objects[this.state.editObjectDialog], roleArray: this.info.roles, objects: this.objects, dateFormat: this.props.dateFormat || this.systemConfig
|
|
4588
|
-
? this.systemConfig
|
|
4595
|
+
return (React.createElement(ObjectBrowserEditObject, { key: this.state.editObjectDialog, obj: this.objects[this.state.editObjectDialog], roleArray: this.info.roles, objects: this.objects, dateFormat: this.props.dateFormat || this.systemConfig?.common.dateFormat || DEFAULT_DATE_FORMAT, isFloatComma: this.props.isFloatComma === undefined
|
|
4596
|
+
? (this.systemConfig?.common.isFloatComma ?? true)
|
|
4589
4597
|
: this.props.isFloatComma, themeType: this.props.themeType, theme: this.props.theme, socket: this.props.socket, dialogName: this.props.dialogName, aliasTab: this.state.editObjectAlias, t: this.props.t, expertMode: !!this.state.filter.expertMode, onNewObject: (obj) => this.props.socket
|
|
4590
4598
|
.setObject(obj._id, obj)
|
|
4591
4599
|
.then(() => this.setState({ editObjectDialog: obj._id, editObjectAlias: false }, () => this.onSelect(obj._id)))
|
|
@@ -4675,8 +4683,8 @@ export class ObjectBrowserClass extends Component {
|
|
|
4675
4683
|
const acl = obj.acl ? (obj.type === 'state' ? obj.acl.state : obj.acl.object) : 0;
|
|
4676
4684
|
const aclSystemConfig = obj.acl &&
|
|
4677
4685
|
(obj.type === 'state'
|
|
4678
|
-
? this.systemConfig
|
|
4679
|
-
: this.systemConfig
|
|
4686
|
+
? this.systemConfig?.common.defaultNewAcl.state
|
|
4687
|
+
: this.systemConfig?.common.defaultNewAcl.object);
|
|
4680
4688
|
showACL = Number.isNaN(Number(acl)) ? Number(aclSystemConfig).toString(16) : Number(acl).toString(16);
|
|
4681
4689
|
}
|
|
4682
4690
|
}
|
|
@@ -5010,8 +5018,8 @@ export class ObjectBrowserClass extends Component {
|
|
|
5010
5018
|
: typeof this.edit.val;
|
|
5011
5019
|
const role = this.objects[this.edit.id].common.role;
|
|
5012
5020
|
const ObjectBrowserValue = this.props.objectBrowserValue;
|
|
5013
|
-
return (React.createElement(ObjectBrowserValue, { t: this.props.t, lang: this.props.lang, type: type, role: role || '', states: Utils.getStates(this.objects[this.edit.id]), themeType: this.props.themeType, theme: this.props.theme, expertMode: !!this.state.filter.expertMode, value: this.edit.val, socket: this.props.socket, object: this.objects[this.edit.id], defaultHistory: this.defaultHistory, dateFormat: this.props.dateFormat || this.systemConfig
|
|
5014
|
-
? this.systemConfig
|
|
5021
|
+
return (React.createElement(ObjectBrowserValue, { t: this.props.t, lang: this.props.lang, type: type, role: role || '', states: Utils.getStates(this.objects[this.edit.id]), themeType: this.props.themeType, theme: this.props.theme, expertMode: !!this.state.filter.expertMode, value: this.edit.val, socket: this.props.socket, object: this.objects[this.edit.id], defaultHistory: this.defaultHistory, dateFormat: this.props.dateFormat || this.systemConfig?.common.dateFormat || DEFAULT_DATE_FORMAT, isFloatComma: this.props.isFloatComma === undefined
|
|
5022
|
+
? (this.systemConfig?.common.isFloatComma ?? true)
|
|
5015
5023
|
: this.props.isFloatComma, onClose: (res) => {
|
|
5016
5024
|
this.setState({ updateOpened: false });
|
|
5017
5025
|
if (res) {
|