diff --git a/lib/Controller/GebruikController.php b/lib/Controller/GebruikController.php index e191191b..61cb2ead 100644 --- a/lib/Controller/GebruikController.php +++ b/lib/Controller/GebruikController.php @@ -9,6 +9,7 @@ * @category Controller * @package OCA\SoftwareCatalog\Controller * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 * @version GIT: * @link https://github.com/nextcloud/softwarecatalog @@ -37,6 +38,7 @@ * @category Controller * @package OCA\SoftwareCatalog\Controller * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 * @version GIT: * @link https://github.com/nextcloud/softwarecatalog diff --git a/lib/Controller/ViewController.php b/lib/Controller/ViewController.php index c2d9427b..4190125e 100644 --- a/lib/Controller/ViewController.php +++ b/lib/Controller/ViewController.php @@ -9,6 +9,7 @@ * @category Controller * @package OCA\SoftwareCatalog\Controller * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 * @version GIT: * @link https://github.com/nextcloud/softwarecatalog @@ -33,6 +34,7 @@ * @category Controller * @package OCA\SoftwareCatalog\Controller * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 * @version GIT: * @link https://github.com/nextcloud/softwarecatalog diff --git a/lib/Service/ArchiMateExportService.php b/lib/Service/ArchiMateExportService.php index a7ff2494..9ddfcff4 100644 --- a/lib/Service/ArchiMateExportService.php +++ b/lib/Service/ArchiMateExportService.php @@ -5,6 +5,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 * @link https://conduction.nl * @@ -17,6 +18,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html * @link https://github.com/ConductionNL/SoftwareCatalog */ diff --git a/lib/Service/ArchiMateImportService.php b/lib/Service/ArchiMateImportService.php index ba50975a..e7092091 100644 --- a/lib/Service/ArchiMateImportService.php +++ b/lib/Service/ArchiMateImportService.php @@ -9,6 +9,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author SoftwareCatalog Team + * @copyright 2024 Conduction B.V. * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.en.html * @link https://github.com/nextcloud/softwarecatalog * @@ -42,6 +43,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author SoftwareCatalog Team + * @copyright 2024 Conduction B.V. * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.en.html * @link https://github.com/nextcloud/softwarecatalog * diff --git a/lib/Service/ArchiMateService.php b/lib/Service/ArchiMateService.php index a476100b..60e6f7dd 100644 --- a/lib/Service/ArchiMateService.php +++ b/lib/Service/ArchiMateService.php @@ -10,6 +10,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author SoftwareCatalog Team + * @copyright 2024 Conduction B.V. * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.en.html * @link https://github.com/nextcloud/softwarecatalog * @@ -41,6 +42,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author SoftwareCatalog Team + * @copyright 2024 Conduction B.V. * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.en.html * @link https://github.com/nextcloud/softwarecatalog * diff --git a/lib/Service/ProgressTracker.php b/lib/Service/ProgressTracker.php index 4ab7683d..edcfed4e 100644 --- a/lib/Service/ProgressTracker.php +++ b/lib/Service/ProgressTracker.php @@ -8,6 +8,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @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 @@ -27,6 +28,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @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 diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php index 99e4030c..583dad83 100644 --- a/lib/Service/SettingsService.php +++ b/lib/Service/SettingsService.php @@ -6,6 +6,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @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 @@ -38,6 +39,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @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 diff --git a/lib/Service/SoftwareCatalogue/ContactPersonHandler.php b/lib/Service/SoftwareCatalogue/ContactPersonHandler.php index 4c7865bd..28601843 100644 --- a/lib/Service/SoftwareCatalogue/ContactPersonHandler.php +++ b/lib/Service/SoftwareCatalogue/ContactPersonHandler.php @@ -9,6 +9,7 @@ * @category Handler * @package OCA\SoftwareCatalog\Service\SoftwareCatalogue * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html * @link https://github.com/ConductionNL/SoftwareCatalog */ @@ -35,6 +36,7 @@ * @category Handler * @package OCA\SoftwareCatalog\Service\SoftwareCatalogue * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html * @link https://github.com/ConductionNL/SoftwareCatalog * diff --git a/lib/Service/SoftwareCatalogue/GroupHandler.php b/lib/Service/SoftwareCatalogue/GroupHandler.php index b0ded386..ffdb782f 100644 --- a/lib/Service/SoftwareCatalogue/GroupHandler.php +++ b/lib/Service/SoftwareCatalogue/GroupHandler.php @@ -9,6 +9,7 @@ * @category Handler * @package OCA\SoftwareCatalog\Service\SoftwareCatalogue * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html * @version GIT: * @link https://github.com/ConductionNL/SoftwareCatalog @@ -37,6 +38,7 @@ * @category Handler * @package OCA\SoftwareCatalog\Service\SoftwareCatalogue * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html * @version GIT: * @link https://github.com/ConductionNL/SoftwareCatalog diff --git a/lib/Service/SoftwareCatalogue/HierarchyHandler.php b/lib/Service/SoftwareCatalogue/HierarchyHandler.php index 1983a15d..0b21d295 100644 --- a/lib/Service/SoftwareCatalogue/HierarchyHandler.php +++ b/lib/Service/SoftwareCatalogue/HierarchyHandler.php @@ -9,6 +9,7 @@ * @category Handler * @package OCA\SoftwareCatalog\Service\SoftwareCatalogue * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html * @version GIT: * @link https://github.com/ConductionNL/SoftwareCatalog @@ -30,6 +31,7 @@ * @category Handler * @package OCA\SoftwareCatalog\Service\SoftwareCatalogue * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html * @version GIT: * @link https://github.com/ConductionNL/SoftwareCatalog diff --git a/lib/Service/SoftwareCatalogue/OrganizationHandler.php b/lib/Service/SoftwareCatalogue/OrganizationHandler.php index 55ff3262..b3d45b56 100644 --- a/lib/Service/SoftwareCatalogue/OrganizationHandler.php +++ b/lib/Service/SoftwareCatalogue/OrganizationHandler.php @@ -9,6 +9,7 @@ * @category Handler * @package OCA\SoftwareCatalog\Service\SoftwareCatalogue * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html * @version GIT: * @link https://github.com/ConductionNL/SoftwareCatalog @@ -34,6 +35,7 @@ * @category Handler * @package OCA\SoftwareCatalog\Service\SoftwareCatalogue * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html * @version GIT: * @link https://github.com/ConductionNL/SoftwareCatalog diff --git a/lib/Service/SoftwareCatalogueService.php b/lib/Service/SoftwareCatalogueService.php index 24753b8f..17f47b65 100644 --- a/lib/Service/SoftwareCatalogueService.php +++ b/lib/Service/SoftwareCatalogueService.php @@ -9,6 +9,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html * @link https://github.com/ConductionNL/SoftwareCatalog * @@ -37,6 +38,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html * @link https://github.com/ConductionNL/SoftwareCatalog * diff --git a/lib/Service/ViewService.php b/lib/Service/ViewService.php index cbd8d584..65f29871 100644 --- a/lib/Service/ViewService.php +++ b/lib/Service/ViewService.php @@ -9,6 +9,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 * @version GIT: * @link https://github.com/ConductionNL/SoftwareCatalog @@ -38,6 +39,7 @@ * @category Service * @package OCA\SoftwareCatalog\Service * @author Conduction b.v. + * @copyright 2024 Conduction B.V. * @license EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 * @version GIT: * @link https://github.com/ConductionNL/SoftwareCatalog diff --git a/lib/Settings/SoftwareCatalogAdmin.php b/lib/Settings/SoftwareCatalogAdmin.php index 645664a1..d057398a 100644 --- a/lib/Settings/SoftwareCatalogAdmin.php +++ b/lib/Settings/SoftwareCatalogAdmin.php @@ -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; @@ -43,18 +44,27 @@ class SoftwareCatalogAdmin implements ISettings */ 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() /** @@ -64,12 +74,9 @@ public function __construct(IAppConfig $config, IL10N $l10n, IAppManager $appMan */ 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() /** diff --git a/src/components/AddContactpersoonModal.vue b/src/modals/AddContactpersoonModal.vue similarity index 100% rename from src/components/AddContactpersoonModal.vue rename to src/modals/AddContactpersoonModal.vue diff --git a/src/modals/BulkSyncDialog.vue b/src/modals/BulkSyncDialog.vue new file mode 100644 index 00000000..cb25d6c6 --- /dev/null +++ b/src/modals/BulkSyncDialog.vue @@ -0,0 +1,553 @@ + + + + + diff --git a/src/modals/object/MergeObject.vue b/src/modals/object/MergeObject.vue index 0d299f9d..fb4bb084 100644 --- a/src/modals/object/MergeObject.vue +++ b/src/modals/object/MergeObject.vue @@ -106,6 +106,7 @@ import { objectStore, navigationStore, catalogStore } from '../../store/store.js :options="getMergeOptions(property)" label="label" track-by="value" + :input-label="t('softwarecatalog', 'Choose value for {property}', { property })" :placeholder="'Choose value for ' + property" @input="onPropertySelectionChange(property, $event)" /> @@ -119,6 +120,7 @@ import { objectStore, navigationStore } from '../../store/store.js' :options="availableSchemas" label="title" track-by="id" + :input-label="t('softwarecatalog', 'Target schema')" placeholder="Select a schema..." @update:model-value="onSchemaChange" /> @@ -166,6 +168,7 @@ import { objectStore, navigationStore } from '../../store/store.js' :options="targetPropertyOptions" label="label" track-by="value" + :input-label="t('softwarecatalog', 'Map {property} to target property', { property: sourceProperty.name })" :placeholder="'Map to target property...'" :clearable="true" @update:model-value="updateMappingFromUI(sourceProperty.name)" /> diff --git a/src/modals/object/ObjectModal.vue b/src/modals/object/ObjectModal.vue index c92adb8b..0d3af9ae 100644 --- a/src/modals/object/ObjectModal.vue +++ b/src/modals/object/ObjectModal.vue @@ -38,6 +38,7 @@ import { objectStore, navigationStore, catalogStore } from '../../store/store.js v-model="selectedCatalogus" :options="catalogOptions" label-outside + :aria-label-combobox="t('softwarecatalog', 'Select a catalogus')" :disabled="objectStore.isLoading('object')" required :loading="loading" /> @@ -60,6 +61,7 @@ import { objectStore, navigationStore, catalogStore } from '../../store/store.js v-model="selectedRegister" :options="registerOptions" label-outside + :aria-label-combobox="t('softwarecatalog', 'Select a register')" :disabled="objectStore.isLoading('object') || !selectedCatalogus" required :loading="loading" /> @@ -81,6 +83,7 @@ import { objectStore, navigationStore, catalogStore } from '../../store/store.js v-model="selectedSchema" :options="schemaOptions" label-outside + :aria-label-combobox="t('softwarecatalog', 'Select a schema')" :disabled="objectStore.isLoading('object') || !selectedRegister" required :loading="loading" /> diff --git a/src/views/settings/SoftwareCatalogSettings.vue b/src/views/settings/SoftwareCatalogSettings.vue index ff8b41db..b6bdd7d4 100644 --- a/src/views/settings/SoftwareCatalogSettings.vue +++ b/src/views/settings/SoftwareCatalogSettings.vue @@ -93,6 +93,7 @@