Release: merge development into beta

.github/workflows/code-quality.yml

@@ -158,7 +158,14 @@ jobs:
       # object API directly (tests/e2e/workflows/_fixtures.ts), so testing
       # against `main` measures a different backend than the one this app is
       # written for. Pinned to `development` to match.
-      additional-apps: '[{"repo":"ConductionNL/openregister","app":"openregister","ref":"development"}]'
+      #
+      # integriq is here because the Integrations page reads integriq's
+      # `app_connection` rows (adopt-connection-registry). Without it the page
+      # shows the missing-dependency screen and
+      # `tests/e2e/workflows/integrations-page.spec.ts` fails on every run.
+      # `app` is `integriq`, verified in its appinfo/info.xml on `development`
+      # on 2026-09-14.
+      additional-apps: '[{"repo":"ConductionNL/openregister","app":"openregister","ref":"development"},{"repo":"ConductionNL/integriq","app":"integriq","ref":"development"}]'
       # Newman disabled: tests/magic-mapper-import.postman_collection.json was
       # written against a dev env with URL rewriting + a fixed disk layout — it
       # hits bare paths like `/configurations` and uploads files from

appinfo/info.xml

@@ -50,7 +50,7 @@ Vrij en open source onder de EUPL-licentie.
 
 **Ondersteuning:** Voor ondersteuning, neem contact op via support@conduction.nl. Voor een Service Level Agreement (SLA), neem contact op via sales@conduction.nl.
     ]]></description>
-    <version>0.2.2-unstable.20260910105110</version>
+    <version>0.2.3-unstable.20260912202721</version>
     <licence>EUPL-1.2</licence>
     <author mail="info@conduction.nl" homepage="https://www.conduction.nl/">Conduction</author>
     <namespace>Stackiq</namespace>

appinfo/routes.php

@@ -126,7 +126,12 @@
         // ArchiMate focused endpoints
         ['name' => 'settings#getArchiMateConfig', 'url' => '/api/archimate/config', 'verb' => 'GET'],
         ['name' => 'settings#updateArchiMateConfig', 'url' => '/api/archimate/config', 'verb' => 'POST'],
-        ['name' => 'settings#getArchiMateConfig', 'url' => '/api/archimate/status', 'verb' => 'GET'],
+        // A route name carries no URL, so without a 'postfix' this entry and the
+        // GET '/api/archimate/config' one above register under the same name and
+        // only the last declared survives. This one won on line order, which left
+        // the config read a 404 and made the store's polling endpoint depend on
+        // nothing but the order of these two lines.
+        ['name' => 'settings#getArchiMateConfig', 'url' => '/api/archimate/status', 'verb' => 'GET', 'postfix' => 'Status'],
 
         // Email focused endpoints
         ['name' => 'settings#getEmailConfig', 'url' => '/api/email/config', 'verb' => 'GET'],

l10n/en.js

@@ -704,7 +704,20 @@ OC.L10N.register(
         "xmlns": "xmlns",
         "xsi": "xsi",
         "Pre-filled with the names the Integriq endoflife-date-source change provisions. Change them if your instance uses different names, no code change required.": "Pre-filled with the names the Integriq endoflife-date-source change provisions. Change them if your instance uses different names, no code change required.",
-        "the configured register or schema could not be found. Is the Integriq endoflife-date-source change installed?": "the configured register or schema could not be found. Is the Integriq endoflife-date-source change installed?"
+        "the configured register or schema could not be found. Is the Integriq endoflife-date-source change installed?": "the configured register or schema could not be found. Is the Integriq endoflife-date-source change installed?",
+        "Integrations": "Integrations",
+        "Status message": "Status message",
+        "Last checked": "Last checked",
+        "All connections": "All connections",
+        "Add integration": "Add integration",
+        "Open settings": "Open settings",
+        "Configured": "Configured",
+        "Limited": "Limited",
+        "Not configured": "Not configured",
+        "Simulated": "Simulated",
+        "Not available": "Not available",
+        "Error": "Error",
+        "Settings": "Settings"
     },
     "nplurals=2; plural=(n != 1);"
 )

l10n/en.json

@@ -703,6 +703,19 @@
         "xmlns": "xmlns",
         "xsi": "xsi",
         "Pre-filled with the names the Integriq endoflife-date-source change provisions. Change them if your instance uses different names, no code change required.": "Pre-filled with the names the Integriq endoflife-date-source change provisions. Change them if your instance uses different names, no code change required.",
-        "the configured register or schema could not be found. Is the Integriq endoflife-date-source change installed?": "the configured register or schema could not be found. Is the Integriq endoflife-date-source change installed?"
+        "the configured register or schema could not be found. Is the Integriq endoflife-date-source change installed?": "the configured register or schema could not be found. Is the Integriq endoflife-date-source change installed?",
+        "Integrations": "Integrations",
+        "Status message": "Status message",
+        "Last checked": "Last checked",
+        "All connections": "All connections",
+        "Add integration": "Add integration",
+        "Open settings": "Open settings",
+        "Configured": "Configured",
+        "Limited": "Limited",
+        "Not configured": "Not configured",
+        "Simulated": "Simulated",
+        "Not available": "Not available",
+        "Error": "Error",
+        "Settings": "Settings"
     }
 }

l10n/nl.js

@@ -777,7 +777,20 @@ OC.L10N.register(
         "xmlns": "xmlns",
         "xsi": "xsi",
         "Pre-filled with the names the Integriq endoflife-date-source change provisions. Change them if your instance uses different names, no code change required.": "Vooraf ingevuld met de namen die de Integriq-wijziging endoflife-date-source aanmaakt. Wijzig ze als uw omgeving andere namen gebruikt, geen codewijziging nodig.",
-        "the configured register or schema could not be found. Is the Integriq endoflife-date-source change installed?": "het geconfigureerde register of schema kon niet worden gevonden. Is de Integriq-wijziging endoflife-date-source geïnstalleerd?"
+        "the configured register or schema could not be found. Is the Integriq endoflife-date-source change installed?": "het geconfigureerde register of schema kon niet worden gevonden. Is de Integriq-wijziging endoflife-date-source geïnstalleerd?",
+        "Integrations": "Koppelingen",
+        "Status message": "Statusbericht",
+        "Last checked": "Laatst gecontroleerd",
+        "All connections": "Alle verbindingen",
+        "Add integration": "Integratie toevoegen",
+        "Open settings": "Instellingen openen",
+        "Configured": "Ingericht",
+        "Limited": "Beperkt",
+        "Not configured": "Niet geconfigureerd",
+        "Simulated": "Gesimuleerd",
+        "Not available": "Niet beschikbaar",
+        "Error": "Fout",
+        "Settings": "Instellingen"
     },
     "nplurals=2; plural=(n != 1);"
 )

l10n/nl.json

@@ -776,6 +776,19 @@
         "xmlns": "xmlns",
         "xsi": "xsi",
         "Pre-filled with the names the Integriq endoflife-date-source change provisions. Change them if your instance uses different names, no code change required.": "Vooraf ingevuld met de namen die de Integriq-wijziging endoflife-date-source aanmaakt. Wijzig ze als uw omgeving andere namen gebruikt, geen codewijziging nodig.",
-        "the configured register or schema could not be found. Is the Integriq endoflife-date-source change installed?": "het geconfigureerde register of schema kon niet worden gevonden. Is de Integriq-wijziging endoflife-date-source geïnstalleerd?"
+        "the configured register or schema could not be found. Is the Integriq endoflife-date-source change installed?": "het geconfigureerde register of schema kon niet worden gevonden. Is de Integriq-wijziging endoflife-date-source geïnstalleerd?",
+        "Integrations": "Koppelingen",
+        "Status message": "Statusbericht",
+        "Last checked": "Laatst gecontroleerd",
+        "All connections": "Alle verbindingen",
+        "Add integration": "Integratie toevoegen",
+        "Open settings": "Instellingen openen",
+        "Configured": "Ingericht",
+        "Limited": "Beperkt",
+        "Not configured": "Niet geconfigureerd",
+        "Simulated": "Gesimuleerd",
+        "Not available": "Niet beschikbaar",
+        "Error": "Fout",
+        "Settings": "Instellingen"
     }
 }

lib/AppInfo/Application.php

@@ -39,6 +39,7 @@
 use OCA\Stackiq\Service\ArchiMateExportService;
 use OCA\Stackiq\Service\ArchiMateImportService;
 use OCA\Stackiq\Service\ArchiMateService;
+use OCA\Stackiq\Service\ConnectionReportService;
 use OCA\Stackiq\Service\ContactpersoonService;
 use OCA\Stackiq\Service\ContractApprovalService;
 use OCA\Stackiq\Service\ContractStatusService;
@@ -593,7 +594,8 @@ function ($container) {
 			ProgressTracker::class,
 			function ($container) {
 				return new ProgressTracker(
-					session: $container->get('OCP\ISession'),
+					cacheFactory: $container->get(ICacheFactory::class),
+					userSession: $container->get('OCP\IUserSession'),
 					logger: $container->get('Psr\Log\LoggerInterface')
 				);
 			}
@@ -674,7 +676,11 @@ function ($container) {
 					config: $container->get(FederationConfig::class),
 					merger: $container->get(FederationMerger::class),
 					settingsService: $container->get(SettingsService::class),
-					logger: $container->get(LoggerInterface::class)
+					logger: $container->get(LoggerInterface::class),
+					// The integriq connection report (adopt-connection-registry). Passed by
+					// name: this factory is hand-built, so the constructor default of null
+					// would otherwise switch every federation report off without a sound.
+					connectionReports: $container->get(ConnectionReportService::class)
 				);
 			}
 		);
@@ -706,7 +712,9 @@ function ($container) {
 					settingsService: $container->get(SettingsService::class),
 					matcher: $container->get(EolMatcherService::class),
 					timeFactory: $container->get('OCP\AppFramework\Utility\ITimeFactory'),
-					logger: $container->get(LoggerInterface::class)
+					logger: $container->get(LoggerInterface::class),
+					// Same reason as the FederationService factory above.
+					connectionReports: $container->get(ConnectionReportService::class)
 				);
 			}
 		);