Skip to content
This repository was archived by the owner on May 29, 2026. It is now read-only.

fix: resolve hydra mechanical gates (spdx, initial-state, nc-input-labels, modal-isolation) #315

Merged
rubenvdlinde merged 1 commit into from
May 26, 2026
Merged

fix: resolve hydra mechanical gates (spdx, initial-state, nc-input-labels, modal-isolation) #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions lib/Controller/GebruikController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* @category Controller
* @package OCA\SoftwareCatalog\Controller
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
* @version GIT: <git_id>
* @link https://github.com/nextcloud/softwarecatalog
Expand Down Expand Up @@ -37,6 +38,7 @@
* @category Controller
* @package OCA\SoftwareCatalog\Controller
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
* @version GIT: <git_id>
* @link https://github.com/nextcloud/softwarecatalog
Expand Down
2 changes: 2 additions & 0 deletions lib/Controller/ViewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* @category Controller
* @package OCA\SoftwareCatalog\Controller
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
* @version GIT: <git_id>
* @link https://github.com/nextcloud/softwarecatalog
Expand All @@ -33,6 +34,7 @@
* @category Controller
* @package OCA\SoftwareCatalog\Controller
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
* @version GIT: <git_id>
* @link https://github.com/nextcloud/softwarecatalog
Expand Down
2 changes: 2 additions & 0 deletions lib/Service/ArchiMateExportService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
* @link https://conduction.nl
*
Expand All @@ -17,6 +18,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @link https://github.com/ConductionNL/SoftwareCatalog
*/
Expand Down
2 changes: 2 additions & 0 deletions lib/Service/ArchiMateImportService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author SoftwareCatalog Team <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.en.html
* @link https://github.com/nextcloud/softwarecatalog
*
Expand Down Expand Up @@ -42,6 +43,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author SoftwareCatalog Team <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.en.html
* @link https://github.com/nextcloud/softwarecatalog
*
Expand Down
2 changes: 2 additions & 0 deletions lib/Service/ArchiMateService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author SoftwareCatalog Team <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.en.html
* @link https://github.com/nextcloud/softwarecatalog
*
Expand Down Expand Up @@ -41,6 +42,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author SoftwareCatalog Team <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.en.html
* @link https://github.com/nextcloud/softwarecatalog
*
Expand Down
2 changes: 2 additions & 0 deletions lib/Service/ProgressTracker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @version GIT: 1.0.0
* @link https://github.com/ConductionNL/SoftwareCatalog
Expand All @@ -27,6 +28,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @version GIT: 1.0.0
* @link https://github.com/ConductionNL/SoftwareCatalog
Expand Down
2 changes: 2 additions & 0 deletions lib/Service/SettingsService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @version GIT: 1.0.0
* @link https://github.com/ConductionNL/SoftwareCatalog
Expand Down Expand Up @@ -38,6 +39,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @version GIT: 1.0.0
* @link https://github.com/ConductionNL/SoftwareCatalog
Expand Down
2 changes: 2 additions & 0 deletions lib/Service/SoftwareCatalogue/ContactPersonHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* @category Handler
* @package OCA\SoftwareCatalog\Service\SoftwareCatalogue
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @link https://github.com/ConductionNL/SoftwareCatalog
*/
Expand All @@ -35,6 +36,7 @@
* @category Handler
* @package OCA\SoftwareCatalog\Service\SoftwareCatalogue
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @link https://github.com/ConductionNL/SoftwareCatalog
*
Expand Down
2 changes: 2 additions & 0 deletions lib/Service/SoftwareCatalogue/GroupHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* @category Handler
* @package OCA\SoftwareCatalog\Service\SoftwareCatalogue
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @version GIT: <git_id>
* @link https://github.com/ConductionNL/SoftwareCatalog
Expand Down Expand Up @@ -37,6 +38,7 @@
* @category Handler
* @package OCA\SoftwareCatalog\Service\SoftwareCatalogue
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @version GIT: <git_id>
* @link https://github.com/ConductionNL/SoftwareCatalog
Expand Down
2 changes: 2 additions & 0 deletions lib/Service/SoftwareCatalogue/HierarchyHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* @category Handler
* @package OCA\SoftwareCatalog\Service\SoftwareCatalogue
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @version GIT: <git_id>
* @link https://github.com/ConductionNL/SoftwareCatalog
Expand All @@ -30,6 +31,7 @@
* @category Handler
* @package OCA\SoftwareCatalog\Service\SoftwareCatalogue
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @version GIT: <git_id>
* @link https://github.com/ConductionNL/SoftwareCatalog
Expand Down
2 changes: 2 additions & 0 deletions lib/Service/SoftwareCatalogue/OrganizationHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* @category Handler
* @package OCA\SoftwareCatalog\Service\SoftwareCatalogue
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @version GIT: <git_id>
* @link https://github.com/ConductionNL/SoftwareCatalog
Expand All @@ -34,6 +35,7 @@
* @category Handler
* @package OCA\SoftwareCatalog\Service\SoftwareCatalogue
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @version GIT: <git_id>
* @link https://github.com/ConductionNL/SoftwareCatalog
Expand Down
2 changes: 2 additions & 0 deletions lib/Service/SoftwareCatalogueService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @link https://github.com/ConductionNL/SoftwareCatalog
*
Expand Down Expand Up @@ -37,6 +38,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
* @link https://github.com/ConductionNL/SoftwareCatalog
*
Expand Down
2 changes: 2 additions & 0 deletions lib/Service/ViewService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
* @version GIT: <git_id>
* @link https://github.com/ConductionNL/SoftwareCatalog
Expand Down Expand Up @@ -38,6 +39,7 @@
* @category Service
* @package OCA\SoftwareCatalog\Service
* @author Conduction b.v. <info@conduction.nl>
* @copyright 2024 Conduction B.V. <info@conduction.nl>
* @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
* @version GIT: <git_id>
* @link https://github.com/ConductionNL/SoftwareCatalog
Expand Down
31 changes: 19 additions & 12 deletions lib/Settings/SoftwareCatalogAdmin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

use OCP\App\IAppManager;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Services\IInitialState;
use OCP\IAppConfig;
use OCP\IL10N;
use OCP\Settings\ISettings;
Expand All @@ -34,7 +35,7 @@
*
* @var IAppConfig
*/
private IAppConfig $config;

Check failure on line 38 in lib/Settings/SoftwareCatalogAdmin.php

View workflow job for this annotation

GitHub Actions / quality / PHP Quality (phpstan) 

Property OCA\SoftwareCatalog\Settings\SoftwareCatalogAdmin::$config is never read, only written.

/**
* The app manager service.
Expand All @@ -43,18 +44,27 @@
*/
private IAppManager $appManager;

/**
* The initial state service.
*
* @var IInitialState
*/
private IInitialState $initialState;

/**
* Constructor for SoftwareCatalogAdmin settings.
*
* @param IAppConfig $config The application configuration service
* @param IL10N $l10n The localization service
* @param IAppManager $appManager The app manager service
* @param IAppConfig $config The application configuration service
* @param IL10N $l10n The localization service
* @param IAppManager $appManager The app manager service
* @param IInitialState $initialState The initial state service
*/
public function __construct(IAppConfig $config, IL10N $l10n, IAppManager $appManager)
public function __construct(IAppConfig $config, IL10N $l10n, IAppManager $appManager, IInitialState $initialState)
{
$this->config = $config;
$this->l10n = $l10n;
$this->appManager = $appManager;
$this->config = $config;
$this->l10n = $l10n;
$this->appManager = $appManager;
$this->initialState = $initialState;
}//end __construct()

/**
Expand All @@ -64,12 +74,9 @@
*/
public function getForm(): TemplateResponse
{
$parameters = [
'mySetting' => $this->config->getValueString('softwarecatalog', 'software_catalog_setting', 'true') === 'true',
'version' => $this->appManager->getAppVersion('softwarecatalog'),
];
$this->initialState->provideInitialState('version', $this->appManager->getAppVersion('softwarecatalog'));

return new TemplateResponse('softwarecatalog', 'settings/admin', $parameters);
return new TemplateResponse('softwarecatalog', 'settings/admin', []);
}//end getForm()

/**
Expand Down
0 src/components/AddContactpersoonModal.vue → src/modals/AddContactpersoonModal.vue
View file
Open in desktop
File renamed without changes.
Loading
Loading