Merge pull request #95 from jeedom/beta

toStable

Author: Salvialf

.github/dependabot.yml

@@ -0,0 +1,30 @@
+# depandabot to update your package.json or requirements.txt - remove useless sections
+# check all configuration options :
+# https://docs.github.com/fr/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+# also works with private repository
+# https://docs.github.com/fr/code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot
+version: 2
+updates:
+  # Maintain python pip dependencies in your 'requirement.txt' file
+  - package-ecosystem: "pip"
+    directory: "/resources"
+    target-branch: "beta"
+    schedule:
+      interval: weekly
+  
+  # Maintain NodeJS dependencies in 'package.json'
+  - package-ecosystem: npm
+    directory: "/resources/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 10
+    versioning-strategy: increase
+    target-branch: "beta"
+
+  # Maintain any github-actions workflow
+  # https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot    
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    target-branch: "beta"

.github/pull_request_template.md

@@ -0,0 +1,50 @@
+<!-- Provide a general summary of your changes in the title above. -->
+
+<!--
+Please target the `beta` branch when submitting your pull request, unless your change **only** applies to Jeedom 4.x.
+-->
+
+## Description
+<!--
+What do you want to achieve with this PR? Why did you write this code? What problem does this PR solve?
+Describe your changes in detail and, if relevant, explain which choices you have made and why.
+-->
+
+
+### Suggested changelog entry
+<!-- Please provide a short description of the change for the changelog. -->
+
+
+### Related issues/external references
+
+Fixes #
+
+
+## Types of changes
+<!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] Bug fix _(non-breaking change which fixes)_
+- [ ] New feature _(non-breaking change which adds functionality)_
+- [ ] Breaking change _(fix or feature that would cause existing functionality to change)_
+    - [ ] This change is only breaking for integrators, not for external standards or end-users.
+- [ ] Documentation improvement
+
+
+## PR checklist
+<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
+- [ ] I have checked there is no other PR open for the same change.
+- [ ] I have read the [Contribution Guidelines](https://doc.jeedom.com/fr_FR/contribute/).
+- [ ] I grant the project the right to include and distribute the code under the GNU.
+- [ ] I have added tests to cover my changes.
+- [ ] I have verified that the code complies with the projects coding standards.
+- [ ] [Required for new sniffs] I have added MD documentation for the sniff.
+
+<!--
+============================================================================================
+Please make sure your pull request passes all continuous integration checks!
+
+PRs which are failing their CI checks will likely be ignored by the maintainers.
+
+PRs using atomic, descriptive commits are hugely appreciated as it will make
+reviewing your changes easier for the maintainers.
+============================================================================================
+-->

.github/workflows/prettier.yml

@@ -0,0 +1,14 @@
+on:
+  # Create branch > prettier / this workflows create commit on branch prettier.
+  push:
+    branches:
+      - prettier
+  pull_request:
+    branches:
+      - prettier
+      
+name : 'Prettier Plugin Jeedom'
+
+jobs:
+  prettier:
+    uses: jeedom/workflows/.github/workflows/prettier.yml@main

.github/workflows/work.yml

@@ -0,0 +1,15 @@
+on:
+  # Workflows check plugin Jeedom
+  push:
+    branches:
+      - beta
+  pull_request:
+    branches:
+      - beta
+      - master
+      
+name : 'Full Workflows Plugin Jeedom'
+
+jobs:
+  plugin:
+    uses: jeedom/workflows/.github/workflows/plugin.yml@main

composer.json

@@ -1,13 +1,5 @@
 {
-    "name": "jeedom/plugin-script",
-    "description": "Plugin script for Jeedom",
     "require": {
         "electrolinux/phpquery": "0.9.*"
-    },
-    "authors": [
-        {
-            "name": "Loic",
-            "email": "loic@jeedom.com"
-        }
-    ]
-}
+    }
+}

composer.lock

@@ -18,7 +18,9 @@
 
 /* * ***************************Includes********************************* */
 require_once dirname(__FILE__) . '/../../../../core/php/core.inc.php';
-require_once dirname(__FILE__) . '/../../vendor/autoload.php';
+if(file_exists(dirname(__FILE__) . '/../../vendor/autoload.php')){
+	require_once dirname(__FILE__) . '/../../vendor/autoload.php';
+}
 
 class script extends eqLogic {
 
@@ -120,7 +122,11 @@ public function postSave() {
 		if ($this->getLogicalId() == 'refresh' || $this->getEqlogic()->getIsEnable() != 1) {
 			return;
 		}
-		$this->refreshInfo();
+		try {
+			$this->refreshInfo();
+		} catch (\Throwable $th) {
+			log::add('script','error',$th->getMessage());
+		}
 	}
 
 	private function replaceTags($request) {

core/class/script.class.php

@@ -48,7 +48,7 @@
 			foreach ($eqLogics as $eqLogic) {
 				$opacity = ($eqLogic->getIsEnable()) ? '' : 'disableCard';
 				echo '<div class="eqLogicDisplayCard cursor ' . $opacity . '" data-eqLogic_id="' . $eqLogic->getId() . '">';
-				echo '<img src="' . $plugin->getPathImgIcon() . '">';
+				echo '<img src="' . $eqLogic->getImage() . '"/>';
 				echo '<br>';
 				echo '<span class="name">' . $eqLogic->getHumanName(true, true) . '</span>';
 				echo '<span class="hiddenAsCard displayTableRight hidden">';

desktop/php/script.php

@@ -4,6 +4,8 @@
 >
 >Zur Erinnerung: Wenn keine Informationen zum Update vorhanden sind, bedeutet dies, dass es sich nur um die Aktualisierung von Dokumentation, Übersetzung oder Text handelt
 
+- Unterstützung für benutzerdefinierte Gerätebilder (Jeedom 4.5)
+
 # 01.07.2024
 
 - Bug-Fix

docs/de_DE/changelog.md

@@ -4,6 +4,8 @@
 >
 >As a reminder if there is no information on the update, it means that it only concerns the updating of documentation, translation or text
 
+- Support for custom equipment images (Jeedom 4.5)
+
 # 01/07/2024
 
 - Bug fix