Skip to content

feat(settings): migrate AppAPI ExApps management to settings #48665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrey18106 merged 19 commits into from
Oct 29, 2024
Merged

feat(settings): migrate AppAPI ExApps management to settings #48665

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
95b0630
feat(app_api): add initial state data for AppAPI UI part
andrey18106 Oct 9, 2024
7e31088
feat(settings): migrate AppAPI ExApps management (1)
andrey18106 Oct 9, 2024
a5291c6
WIP: add Daemon badge in app sidebar (2)
andrey18106 Oct 11, 2024
4f109be
WIP: use global mutation, since app_api_apps is namespaced
andrey18106 Oct 11, 2024
70a8d26
WIP: add missing state checks
andrey18106 Oct 11, 2024
2f25546
WIP: minor fixes
andrey18106 Oct 11, 2024
46e643b
fix(ci): resolve eslint errors
andrey18106 Oct 14, 2024
3a840c1
fix(ci): suppress UndefinedClass for AppAPI related classes since it'…
andrey18106 Oct 14, 2024
e4d5866
WIP: address review comments, small fixes
andrey18106 Oct 17, 2024
c8b35fa
WIP: migrate to Pinia, minor fixes
andrey18106 Oct 21, 2024
6e75b41
WIP: remove app_api_apps vuex store
andrey18106 Oct 21, 2024
8732755
fix: address review comments
andrey18106 Oct 23, 2024
a12b4da
fix(ci): psalm, suppress undefined for viewApps
andrey18106 Oct 24, 2024
93b5201
fix(ci): fix eslint errors
andrey18106 Oct 24, 2024
dcc09ff
fix: loading state reactivity
andrey18106 Oct 29, 2024
24b221c
fix(ci): eslint fix, minor correction after rebase
andrey18106 Oct 29, 2024
2178f0b
chore(assets): Recompile assets
nextcloud-command Oct 29, 2024
be23e7d
chore(assets): Recompile assets
nextcloud-command Oct 29, 2024
c2f1c3d
chore(assets): Recompile assets
nextcloud-command Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat(app_api): add initial state data for AppAPI UI part 
Signed-off-by: Andrey Borysenko <[email protected]>

# Conflicts:
#	apps/settings/lib/Controller/AppSettingsController.php

# Conflicts:
#	apps/settings/lib/Controller/AppSettingsController.php
  • Loading branch information
@andrey18106
andrey18106 committed Oct 29, 2024
commit 95b06309f3b55d0ac6412c8f07879d55bdfeb95e
34 changes: 34 additions & 0 deletions apps/settings/lib/Controller/AppSettingsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\L10N\IFactory;
use OCP\Server;
use OCP\Util;
use Psr\Log\LoggerInterface;

Expand Down Expand Up @@ -89,6 +90,8 @@ public function viewApps(): TemplateResponse {
$this->initialState->provideInitialState('appstoreDeveloperDocs', $this->urlGenerator->linkToDocs('developer-manual'));
$this->initialState->provideInitialState('appstoreUpdateCount', count($this->getAppsWithUpdates()));

$this->provideAppApiState();

$policy = new ContentSecurityPolicy();
$policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com');

Expand All @@ -101,6 +104,37 @@ public function viewApps(): TemplateResponse {
return $templateResponse;
}

private function provideAppApiState(): void {
$appApiEnabled = $this->appManager->isInstalled('app_api');
$this->initialState->provideInitialState('appApiEnabled', $appApiEnabled);
$daemonConfigAccessible = false;
$defaultDaemonConfig = null;

if ($appApiEnabled) {
$exAppFetcher = Server::get(\OCA\AppAPI\Fetcher\ExAppFetcher::class);
$this->initialState->provideInitialState('appstoreExAppUpdateCount', count($exAppFetcher->getExAppsWithUpdates()));

$defaultDaemonConfigName = $this->config->getAppValue('app_api', 'default_daemon_config');
if ($defaultDaemonConfigName !== '') {
$daemonConfigService = Server::get(\OCA\AppAPI\Service\DaemonConfigService::class);
$daemonConfig = $daemonConfigService->getDaemonConfigByName($defaultDaemonConfigName);
if ($daemonConfig !== null) {
$defaultDaemonConfig = $daemonConfig->jsonSerialize();
unset($defaultDaemonConfig['deploy_config']['haproxy_password']);
$dockerActions = Server::get(\OCA\AppAPI\DeployActions\DockerActions::class);
$dockerActions->initGuzzleClient($daemonConfig);
$daemonConfigAccessible = $dockerActions->ping($dockerActions->buildDockerUrl($daemonConfig));
if (!$daemonConfigAccessible) {
$this->logger->warning(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please verify its configuration', $daemonConfig->getName()));
}
}
}
}

$this->initialState->provideInitialState('defaultDaemonConfigAccessible', $daemonConfigAccessible);
$this->initialState->provideInitialState('defaultDaemonConfig', $defaultDaemonConfig);
}

/**
* Get all active entries for the app discover section
*/
Expand Down