Skip to content

Commit

Permalink
* (bluefox) Migrated some files to typescript
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanBluefox committed May 14, 2024
1 parent f03291d commit 922faaa
Show file tree
Hide file tree
Showing 40 changed files with 199 additions and 196 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ packages/iobroker.vis-2/admin/i18n/flat.txt
beta
/io-package.json
/main.js
package-lock.json

build
/.vscode
src/dist
**/www
**/runtime
**/tmp
**/tmp
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,14 @@ E.g., if it was used in a menu and the menu is red, the circle would be red.
### **WORK IN PROGRESS**
-->
## Changelog
### **WORK IN PROGRESS**
* (bluefox) Migrated some files to typescript

### 2.9.60 (2024-05-07)
* (foxriver76) test automatic release

### 2.9.53 (2024-05-06)
* (bluefox) Allowed applying styles to jqui buttons
* (bluefox) Allowed applying styles to jQui buttons

### 2.9.52 (2024-04-25)
* (bluefox) Navigation was improved: adjustable menu width and bulk edit were added
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,26 @@
"@devbookhq/splitter": "^1.4.2",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@iobroker/adapter-react-v5": "^4.13.12",
"@iobroker/adapter-react-v5": "^4.13.13",
"@iobroker/type-detector": "^3.0.5",
"@iobroker/types": "^5.0.19",
"@iobroker/types": "^5.0.20-alpha.0-20240510-819f1976e",
"@iobroker/vis-2-widgets-react-dev": "^1.0.6",
"@iobroker/vis-2-widgets-testing": "^1.0.3",
"@material-icons/svg": "^1.0.33",
"@mui/icons-material": "^5.15.16",
"@mui/icons-material": "^5.15.17",
"@mui/material": "5.14.14",
"@mui/styles": "5.14.14",
"@mui/x-date-pickers": "^7.3.2",
"@reduxjs/toolkit": "^2.2.3",
"@sentry/browser": "^7.113.0",
"@sentry/integrations": "^7.113.0",
"@mui/x-date-pickers": "^7.4.0",
"@reduxjs/toolkit": "^2.2.4",
"@sentry/browser": "^8.0.0",
"@sentry/integrations": "^7.114.0",
"@tsconfig/node18": "^18.2.4",
"@types/dom-speech-recognition": "^0.0.4",
"@types/mocha": "^10.0.6",
"@types/react-beautiful-dnd": "^13.1.8",
"@types/uuid": "^9.0.8",
"ace-builds": "^1.33.1",
"chai": "^5.1.0",
"ace-builds": "^1.33.2",
"chai": "^4.4.1",
"craco-module-federation": "^1.1.0",
"dayjs": "^1.11.11",
"echarts": "^5.5.0",
Expand Down
78 changes: 0 additions & 78 deletions packages/iobroker.vis-2/io-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,84 +15,6 @@
"pl": "automatyczne zwolnienie badania",
"uk": "тест автоматичний реліз",
"zh-cn": "测试自动释放"
},
"2.9.59": {
"en": "test automatic release",
"de": "test automatische freigabe",
"ru": "автоматический выпуск",
"pt": "teste de liberação automática",
"nl": "automatische vrijgave van de test",
"fr": "essai de libération automatique",
"it": "prova rilascio automatico",
"es": "prueba de liberación automática",
"pl": "automatyczne zwolnienie badania",
"uk": "тест автоматичний реліз",
"zh-cn": "测试自动释放"
},
"2.9.58": {
"en": "test automatic release",
"de": "test automatische freigabe",
"ru": "автоматический выпуск",
"pt": "teste de liberação automática",
"nl": "automatische vrijgave van de test",
"fr": "essai de libération automatique",
"it": "prova rilascio automatico",
"es": "prueba de liberación automática",
"pl": "automatyczne zwolnienie badania",
"uk": "тест автоматичний реліз",
"zh-cn": "测试自动释放"
},
"2.9.57": {
"en": "test automatic release",
"de": "test automatische freigabe",
"ru": "автоматический выпуск",
"pt": "teste de liberação automática",
"nl": "automatische vrijgave van de test",
"fr": "essai de libération automatique",
"it": "prova rilascio automatico",
"es": "prueba de liberación automática",
"pl": "automatyczne zwolnienie badania",
"uk": "тест автоматичний реліз",
"zh-cn": "测试自动释放"
},
"2.9.56": {
"en": "test automatic release",
"de": "test automatische freigabe",
"ru": "автоматический выпуск",
"pt": "teste de liberação automática",
"nl": "automatische vrijgave van de test",
"fr": "essai de libération automatique",
"it": "prova rilascio automatico",
"es": "prueba de liberación automática",
"pl": "automatyczne zwolnienie badania",
"uk": "тест автоматичний реліз",
"zh-cn": "测试自动释放"
},
"2.9.55": {
"en": "test automatic release",
"de": "test automatische freigabe",
"ru": "автоматический выпуск",
"pt": "teste de liberação automática",
"nl": "automatische vrijgave van de test",
"fr": "essai de libération automatique",
"it": "prova rilascio automatico",
"es": "prueba de liberación automática",
"pl": "automatyczne zwolnienie badania",
"uk": "тест автоматичний реліз",
"zh-cn": "测试自动释放"
},
"2.9.54": {
"en": "test automatic release",
"de": "test automatische freigabe",
"ru": "автоматический выпуск",
"pt": "teste de liberação automática",
"nl": "automatische vrijgave van de test",
"fr": "essai de libération automatique",
"it": "prova rilascio automatico",
"es": "prueba de liberación automática",
"pl": "automatyczne zwolnienie badania",
"uk": "тест автоматичний реліз",
"zh-cn": "测试自动释放"
}
},
"title": "Visualisation Next Generation",
Expand Down
1 change: 1 addition & 0 deletions packages/iobroker.vis-2/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,7 @@ const POSSIBLE_WIDGET_SETS_LOCATIONS = [
path.normalize(`${__dirname}/../`),
path.normalize(`${__dirname}/node_modules/`),
path.normalize(`${__dirname}/../../`),
path.normalize(`${__dirname}/../../../`),
];

async function readAdapterList() {
Expand Down
8 changes: 4 additions & 4 deletions packages/iobroker.vis-2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"vis-2"
],
"dependencies": {
"@iobroker/adapter-core": "^3.0.6",
"@iobroker/adapter-core": "^3.1.4",
"axios": "^1.6.8",
"jsonwebtoken": "^9.0.2",
"mime": "^3.0.0"
Expand All @@ -34,15 +34,15 @@
"@alcalzone/release-script": "^3.7.0",
"@alcalzone/release-script-plugin-iobroker": "^3.7.0",
"@alcalzone/release-script-plugin-license": "^3.7.0",
"@iobroker/vis-2-widgets-testing": "^1.0.2",
"@iobroker/vis-2-widgets-testing": "^1.0.3",
"@tsconfig/node18": "^18.2.4",
"@types/mocha": "^10.0.6",
"chai": "^4.4.1",
"gulp": "^4.0.2",
"iobroker.web": "*",
"mocha": "^10.4.0",
"typescript": "^5.4.3",
"unzipper": "^0.10.14"
"typescript": "^5.4.5",
"unzipper": "^0.11.6"
},
"bugs": {
"url": "https://github.com/iobroker/iobroker.vis/issues"
Expand Down
2 changes: 1 addition & 1 deletion packages/iobroker.vis-2/src/public/lib/js/ace/ace.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/iobroker.vis-2/src/public/lib/js/ace/mode-html.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -1446,7 +1446,7 @@ const WidgetField = (props: WidgetFieldProps) => {
{idDialog &&
<MaterialIconSelector
themeType={props.themeType}
value={value}
value={value as string}
onClose={(icon: string | null) => {
setIdDialog(false);
if (icon !== null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';

import {
Dialog, Button, DialogActions, DialogContent, DialogTitle,
Expand All @@ -14,7 +13,15 @@ import { I18n, Utils } from '@iobroker/adapter-react-v5';

import CustomAceEditor from './CustomAceEditor';

class CodeDialog extends Component {
interface CodeDialogProps {
onClose: () => void;
title?: string;
themeType?: string;
code: string;
mode?: string;
}

class CodeDialog extends Component<CodeDialogProps> {
render() {
return <Dialog
open={!0}
Expand Down Expand Up @@ -45,6 +52,7 @@ class CodeDialog extends Component {
</Button>
<Button
variant="contained"
// @ts-expect-error grey is valid color
color="grey"
startIcon={<CloseIcon />}
onClick={() => this.props.onClose()}
Expand All @@ -56,12 +64,4 @@ class CodeDialog extends Component {
}
}

CodeDialog.propTypes = {
onClose: PropTypes.func.isRequired,
title: PropTypes.string,
themeType: PropTypes.string,
code: PropTypes.string.isRequired,
mode: PropTypes.string,
};

export default CodeDialog;
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import React from 'react';
import IODialog from './IODialog';

const CreateFirstProjectDialog = props => {
interface CreateFirstProjectDialogProps {
open: boolean;
onClose: () => void;
addProject: (name: string) => void;
}

const CreateFirstProjectDialog = (props: CreateFirstProjectDialogProps) => {
if (props.open) {
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/iobroker.vis-2/src/src/Components/IODialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ interface IODialogProps {
actionDisabled?: boolean;
actionNoClose?: boolean;
actionTitle?: string;
children: any;
children?: any;
closeTitle?: string;
closeDisabled?: boolean;
dialogActions?: any;
Expand Down
Loading

0 comments on commit 922faaa

Please sign in to comment.