fixed UI error when default_daemon_config config missing (#109)

When a daemon has been selected by default and then for some reason its configuration is missing from the DB, the AppAPI application becomes unusable from the UI.
nextcloud · Nov 7, 2023 · e6bd36b · e6bd36b
1 parent d18b760
commit e6bd36b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/lib/Controller/ExAppsPageController.php b/lib/Controller/ExAppsPageController.php
@@ -105,11 +105,13 @@ public function viewApps(): TemplateResponse {
 
 		if ($defaultDaemonConfigName !== '') {
 			$daemonConfig = $this->daemonConfigService->getDaemonConfigByName($defaultDaemonConfigName);
-			$this->dockerActions->initGuzzleClient($daemonConfig);
-			$daemonConfigAccessible = $this->dockerActions->ping($this->dockerActions->buildDockerUrl($daemonConfig));
-			$appInitialData['daemon_config_accessible'] = $daemonConfigAccessible;
-			if (!$daemonConfigAccessible) {
-				$this->logger->error(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please verify its configuration', $daemonConfig->getName()));
+			if ($daemonConfig !== null) {
+				$this->dockerActions->initGuzzleClient($daemonConfig);
+				$daemonConfigAccessible = $this->dockerActions->ping($this->dockerActions->buildDockerUrl($daemonConfig));
+				$appInitialData['daemon_config_accessible'] = $daemonConfigAccessible;
+				if (!$daemonConfigAccessible) {
+					$this->logger->error(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please verify its configuration', $daemonConfig->getName()));
+				}
 			}
 		}
 

diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
@@ -72,11 +72,13 @@ public function getForm(): TemplateResponse {
 		$defaultDaemonConfigName = $this->config->getAppValue(Application::APP_ID, 'default_daemon_config', '');
 		if ($defaultDaemonConfigName !== '') {
 			$daemonConfig = $this->daemonConfigService->getDaemonConfigByName($defaultDaemonConfigName);
-			$this->dockerActions->initGuzzleClient($daemonConfig);
-			$daemonConfigAccessible = $this->dockerActions->ping($this->dockerActions->buildDockerUrl($daemonConfig));
-			$adminInitialData['daemon_config_accessible'] = $daemonConfigAccessible;
-			if (!$daemonConfigAccessible) {
-				$this->logger->error(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please verify its configuration', $daemonConfig->getName()));
+			if ($daemonConfig !== null) {
+				$this->dockerActions->initGuzzleClient($daemonConfig);
+				$daemonConfigAccessible = $this->dockerActions->ping($this->dockerActions->buildDockerUrl($daemonConfig));
+				$adminInitialData['daemon_config_accessible'] = $daemonConfigAccessible;
+				if (!$daemonConfigAccessible) {
+					$this->logger->error(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please verify its configuration', $daemonConfig->getName()));
+				}
 			}
 		}