Merge pull request #3181 from Alex-developer/Point-Release-4

Remove experimental display option
AllskyTeam · Dec 12, 2023 · 14128d9 · 14128d9
2 parents a2e23e3 + c6b9775
commit 14128d9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 48 deletions.
diff --git a/html/includes/module.php b/html/includes/module.php
@@ -172,16 +172,6 @@ function DisplayModule() {
                             </label>
                             <p class="help-block">Auto enable modules when selected</p>
                         </div>
-                    </div> 
-                    <div class="form-group">
-                        <label for="checkbox" class="control-label col-xs-4"></label> 
-                        <div class="col-xs-8">
-                            <label class="checkbox-inline">
-                            <input type="checkbox" name="showexperimental" id="showexperimental">
-                                Show Experimental
-                            </label>
-                            <p class="help-block">Show experimental modules. NOTE: These may be unstable and cause issues</p>
-                        </div>
                     </div>                                      
                     <div class="form-group">
                         <label for="checkbox" class="control-label col-xs-4"></label> 

diff --git a/html/includes/moduleutil.php b/html/includes/moduleutil.php
@@ -74,7 +74,7 @@ private function runRequest() {
         }
     }
 
-    private function readModuleData($moduleDirectory, $type, $event, $showexperimental) {
+    private function readModuleData($moduleDirectory, $type, $event) {
         $arrFiles = array();
         $handle = opendir($moduleDirectory);
 
@@ -115,19 +115,13 @@ private function readModuleData($moduleDirectory, $type, $event, $showexperiment
                             } else {
                                 $experimental = false;
                             }
-                            if (!$showexperimental && $experimental) {
-                                $addModule  = false;
-                            } else {
-                                $addModule = true;
-                            }
-                            if ($addModule) {
-                                $arrFiles[$entry] = [
-                                    'module' => $entry,
-                                    'metadata' => $decoded,
-                                    'type' => $type
-                                ];
-                                $arrFiles[$entry]['metadata']->experimental = $experimental;
-                            }
+
+                            $arrFiles[$entry] = [
+                                'module' => $entry,
+                                'metadata' => $decoded,
+                                'type' => $type
+                            ];
+                            $arrFiles[$entry]['metadata']->experimental = $experimental;
                         }
                     }
                 }
@@ -230,11 +224,6 @@ private function readModules() {
         $rawConfigData = file_get_contents($configFileName);
         $moduleConfig = json_decode($rawConfigData);
 
-        $showexperimental = false;
-        if (isset($moduleConfig->showexperimental) && $moduleConfig->showexperimental) {
-            $showexperimental = true;
-        }
-
         $event = $_GET['event'];
         $configFileName = ALLSKY_MODULES . '/' . 'postprocessing_' . strtolower($event) . '.json';
         $rawConfigData = file_get_contents($configFileName);
@@ -246,8 +235,8 @@ private function readModules() {
             $configData = array();
         }
 
-        $coreModules = $this->readModuleData($this->allskyModules, "system", $event, $showexperimental);
-        $userModules = $this->readModuleData($this->userModules, "user", $event, $showexperimental);
+        $coreModules = $this->readModuleData($this->allskyModules, "system", $event);
+        $userModules = $this->readModuleData($this->userModules, "user", $event);
         $allModules = array_merge($coreModules, $userModules);
 
         $availableResult = [];
@@ -301,21 +290,7 @@ private function readModules() {
                 $moduleData['lastexecutionresult'] = '';                
             }
 
-            if (isset($data->metadata->experimental)) {
-                $experimental = strtolower($data->metadata->experimental) == "true"? true: false;
-            } else {
-                $experimental = false;
-            }
-
-            if (!$showexperimental && $experimental) {
-                $addModule  = false;
-            } else {
-                $addModule = true;
-            }
-
-            if ($addModule) {
-                $selectedResult[$selectedName] = $moduleData;
-            }
+            $selectedResult[$selectedName] = $moduleData;
         };
 
         $restore = false;

diff --git a/html/js/modules/modules.js b/html/js/modules/modules.js
@@ -972,7 +972,6 @@ class MODULESEDITOR {
                 }
                 $('#enablewatchdog').prop('checked', result.watchdog);
                 $('#watchdog-timeout').val(result.timeout);                
-                $('#showexperimental').prop('checked', result.showexperimental);
                 $('#autoenable').prop('checked', result.autoenable);
                 $('#debugmode').prop('checked', result.debugmode);
                 $('#periodic-timer').val(result.periodictimer);                  
@@ -991,7 +990,6 @@ class MODULESEDITOR {
 
             this.#moduleSettings.watchdog = $('#enablewatchdog').prop('checked');
             this.#moduleSettings.timeout = $('#watchdog-timeout').val() | 0;
-            this.#moduleSettings.showexperimental = $('#showexperimental').prop('checked');
             this.#moduleSettings.autoenable = $('#autoenable').prop('checked');
             this.#moduleSettings.debugmode = $('#debugmode').prop('checked');