Merge branch 'master' into check-passwords

ioBroker · Sep 28, 2024 · 1c46527 · 1c46527
2 parents 5f2f7a6 + 5cf0737
commit 1c46527
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -82,6 +82,7 @@ The icons may not be reused in other projects without the proper flaticon licens
 -->
 ### **WORK IN PROGRESS**
 * (@GermanBluefox) Added the check of well-known passwords for the linux systems
+* (@foxriver76) fixed wrongly displayed repository warning
 
 ### 7.1.5 (2024-09-26)
 * (bluefox) Added the read-only flag to the `state` JSON Config component

diff --git a/package.json b/package.json
@@ -70,9 +70,7 @@
         "@types/react": "^18.3.9",
         "@types/react-color": "^3.0.12",
         "@types/react-dom": "^18.3.0",
-        "@types/validator": "^13.12.2",
-        "@typescript-eslint/eslint-plugin": "^8.7.0",
-        "@typescript-eslint/parser": "^8.7.0",
+        "@types/validator": "^13.12.1",
         "babel": "^6.23.0",
         "babel-plugin-inline-json-import": "^0.3.2",
         "buffer": "^6.0.3",

diff --git a/packages/admin/eslint.config.mjs b/packages/admin/eslint.config.mjs
@@ -1,13 +1,5 @@
 import config from '@iobroker/eslint-config';
 
-// disable temporary the rule 'jsdoc/require-param' and enable 'jsdoc/require-jsdoc'
-config.forEach(rule => {
-    if (rule?.plugins?.jsdoc) {
-        rule.rules['jsdoc/require-jsdoc'] = 'off';
-        rule.rules['jsdoc/require-param'] = 'off';
-    }
-});
-
 export default [
     ...config,
     {
@@ -22,4 +14,11 @@ export default [
             },
         },
     },
+    {
+        // disable temporary the rule 'jsdoc/require-param' and enable 'jsdoc/require-jsdoc'
+        rules: {
+            'jsdoc/require-jsdoc': 'off',
+            'jsdoc/require-param': 'off'
+        }
+    }
 ];
diff --git a/packages/admin/src-admin/eslint.config.mjs b/packages/admin/src-admin/eslint.config.mjs
@@ -1,13 +1,5 @@
 import config, { reactConfig } from '@iobroker/eslint-config';
 
-// disable temporary the rule 'jsdoc/require-param' and enable 'jsdoc/require-jsdoc'
-config.forEach(rule => {
-    if (rule?.plugins?.jsdoc) {
-        rule.rules['jsdoc/require-jsdoc'] = 'off';
-        rule.rules['jsdoc/require-param'] = 'off';
-    }
-});
-
 export default [
     ...config,
     ...reactConfig,
@@ -28,4 +20,11 @@ export default [
             },
         },
     },
+    {
+        // disable temporary the rule 'jsdoc/require-param' and enable 'jsdoc/require-jsdoc'
+        rules: {
+            'jsdoc/require-jsdoc': 'off',
+            'jsdoc/require-param': 'off'
+        }
+    }
 ];
diff --git a/packages/admin/src-admin/src/tabs/Adapters.tsx b/packages/admin/src-admin/src/tabs/Adapters.tsx
@@ -1906,16 +1906,15 @@ class Adapters extends AdapterInstallDialog<AdaptersProps, AdaptersState> {
             if (this.props.systemConfig.common.activeRepo) {
                 if (Array.isArray(this.props.systemConfig.common.activeRepo)) {
                     // if any active repo is not stable, show warning
-                    stableRepo = !this.props.systemConfig.common.activeRepo.find(
-                        repo =>
-                            !repo.toLowerCase().startsWith('stable') && !repositories[repo]?.json?._repoInfo?.stable,
+                    stableRepo = this.props.systemConfig.common.activeRepo.every(
+                        repo => repo.toLowerCase().startsWith('stable') || repositories[repo]?.json?._repoInfo?.stable,
                     );
                 } else if (typeof this.props.systemConfig.common.activeRepo === 'string') {
                     // if active repo is not stable, show warning
                     stableRepo =
                         // @ts-expect-error deprecated, but could still come
-                        !this.props.systemConfig.common.activeRepo.toLowerCase().startsWith('stable') &&
-                        !repositories[this.props.systemConfig.common.activeRepo]?.json?._repoInfo?.stable;
+                        this.props.systemConfig.common.activeRepo.toLowerCase().startsWith('stable') ||
+                        repositories[this.props.systemConfig.common.activeRepo]?.json?._repoInfo?.stable;
                 }
             }
         }

diff --git a/packages/dm-gui-components/eslint.config.mjs b/packages/dm-gui-components/eslint.config.mjs
@@ -1,13 +1,5 @@
 import config, { reactConfig } from '@iobroker/eslint-config';
 
-// disable temporary the rule 'jsdoc/require-param' and enable 'jsdoc/require-jsdoc'
-config.forEach(rule => {
-    if (rule?.plugins?.jsdoc) {
-        rule.rules['jsdoc/require-jsdoc'] = 'off';
-        rule.rules['jsdoc/require-param'] = 'off';
-    }
-});
-
 export default [
     ...config,
     ...reactConfig,
@@ -21,4 +13,11 @@ export default [
             },
         },
     },
+    {
+        // disable temporary the rule 'jsdoc/require-param' and enable 'jsdoc/require-jsdoc'
+        rules: {
+            'jsdoc/require-jsdoc': 'off',
+            'jsdoc/require-param': 'off'
+        }
+    }
 ];
diff --git a/packages/jsonConfig/eslint.config.mjs b/packages/jsonConfig/eslint.config.mjs
@@ -1,13 +1,5 @@
 import config, { reactConfig } from '@iobroker/eslint-config';
 
-// disable temporary the rule 'jsdoc/require-param' and enable 'jsdoc/require-jsdoc'
-config.forEach(rule => {
-    if (rule?.plugins?.jsdoc) {
-        rule.rules['jsdoc/require-jsdoc'] = 'off';
-        rule.rules['jsdoc/require-param'] = 'off';
-    }
-});
-
 export default [
     ...config,
     ...reactConfig,
@@ -21,4 +13,11 @@ export default [
             },
         },
     },
+    {
+        // disable temporary the rule 'jsdoc/require-param' and enable 'jsdoc/require-jsdoc'
+        rules: {
+            'jsdoc/require-jsdoc': 'off',
+            'jsdoc/require-param': 'off'
+        }
+    }
 ];