Release: merge development into beta

.procedure-code-baseline.json

@@ -0,0 +1 @@
+{"count": 0}

CHANGELOG.md

@@ -7,6 +7,22 @@
   sheets becomes or updates a module, its vendor, a usage for the municipality
   and a contact person for its owner; a repeat import matches on APPID, so it
   updates instead of duplicating. See `docs/features/cmdb-import.md`.
+- CMDB import: on an OpenRegister with the migration-pack editor
+  (openregister#4602), the import runs the mapping packs kept in
+  OpenRegister's migration pack store, where an administrator edits them.
+  The `SeedCmdbImportPacks` repair step stores them on install and upgrade;
+  a pack nobody edited follows newer releases, an edited one is kept.
+  Viewing the mapping writes nothing. An older OpenRegister keeps the packs
+  that ship with stackiq.
+- CMDB import, repeat imports: applications that left the CMDB sheets are
+  archived when the sheet "Gearchiveerde Applicaties" lists them and moved to
+  OpenRegister's trash when no sheet does; one that returns is unarchived or
+  restored, never duplicated. The new option `missingRecords` (`archive`, the
+  default, or `keep`) is a choice in the CMDB import section, and the report
+  counts archived, unarchived, deleted and restored applications. The module
+  (0.3.9) and usage (1.5.7) schemas opt into OpenRegister's archive state, and
+  the Applications and Applications in use pages get an "Archived" quick
+  filter. (cmdb-import-archive-reconciliation)
 
 ### Changed
 - EOL feed: the register and schema slugs the feature reads from are corrected.

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.4-unstable.20261001120000</version>
+    <version>0.2.6-unstable.20261012120000</version>
     <licence>EUPL-1.2</licence>
     <author mail="info@conduction.nl" homepage="https://www.conduction.nl/">Conduction</author>
     <namespace>Stackiq</namespace>
@@ -122,6 +122,15 @@ Vrij en open source onder de EUPL-licentie.
 			-->
 			<step>OCA\Stackiq\Repair\MigrateAppConfigKeys</step>
 			<step>OCA\Stackiq\Repair\MigrateUserPreferences</step>
+			<!--
+				WIDGET-ID RESTORE (#1261). Stable 0.1.148 to 0.2.0 and beta shipped the
+				concept organisations widget under the renamed id; restoring the frozen
+				id dropped it from every dashboard that chose it in that window. The
+				Dashboard app keeps that choice in `oc_preferences` under its own app id,
+				so this rewrites the renamed id to the frozen one for every seen user.
+				Upgrade-only: a fresh install has no dashboards to repair.
+			-->
+			<step>OCA\Stackiq\Repair\RepointDashboardWidgetId</step>
 			<!--
 				`oc_jobs` stores the background job's CLASS NAME as a string. The
 				namespace rename orphans all four rows: the class no longer exists,
@@ -241,6 +250,14 @@ Vrij en open source onder de EUPL-licentie.
 				instead of failing.
 			-->
 			<step>OCA\Stackiq\Repair\RenameDutchCatalogValues</step>
+			<!--
+				Stores the CMDB import's sheet packs in OpenRegister's migration-pack
+				store, where an administrator edits them; the import reads them from
+				there. Creates a missing pack and replaces one nobody edited with this
+				release's shipped pack; an edited pack is kept and reported. Never
+				throws, and does nothing without OpenRegister's store.
+			-->
+			<step>OCA\Stackiq\Repair\SeedCmdbImportPacks</step>
 		</post-migration>
 		<!--
 			FRESH INSTALL. Nextcloud does NOT run post-migration on a first install:
@@ -315,6 +332,8 @@ Vrij en open source onder de EUPL-licentie.
 			     exact stored value so an admin's own register is never touched. -->
 			<step>OCA\Stackiq\Repair\RepointEolSyncConfig</step>
 			<step>OCA\Stackiq\Repair\InitializeSettings</step>
+			<!-- A fresh install seeds the CMDB import packs too; see <post-migration> above. -->
+			<step>OCA\Stackiq\Repair\SeedCmdbImportPacks</step>
 		</install>
 	</repair-steps>
 

appinfo/routes.php

@@ -109,6 +109,9 @@
         // @spec openspec/changes/cmdb-export-import/tasks.md#task-8
         ['name' => 'cmdbImport#import', 'url' => '/api/cmdb-import', 'verb' => 'POST'],
         ['name' => 'cmdbImport#cancel', 'url' => '/api/cmdb-import/{operationId}/cancel', 'verb' => 'POST'],
+        // The mapping the CMDB import uses, read-only — same posture as the import (Nextcloud admins only, CSRF).
+        // @spec openspec/changes/cmdb-import-mapping-view/specs/cmdb-export-import/spec.md#requirement-the-admin-settings-shall-show-the-mapping-the-import-uses-req-cmdb-020
+        ['name' => 'settings#getCmdbImportMapping', 'url' => '/api/settings/cmdb-import/mapping', 'verb' => 'GET'],
 
         // User Groups management routes
         ['name' => 'settings#getGenericUserGroups', 'url' => '/api/settings/user-groups/generic', 'verb' => 'GET'],
@@ -168,6 +171,8 @@
 
         // User Profile endpoint
         ['name' => 'contactpersonen#getMe', 'url' => '/api/me', 'verb' => 'GET'],
+        // Display names of contact persons from the caller's own address books (owner columns).
+        ['name' => 'contactNames#index', 'url' => '/api/contact-names', 'verb' => 'GET'],
 
         // Contactpersonen Management endpoints
         ['name' => 'contactpersonen#getContactpersonen', 'url' => '/api/contactpersonen/organisation/{organisationId}', 'verb' => 'GET'],

composer.json

@@ -83,7 +83,7 @@
         "conduction/hydra-gates": "^1.8.2",
         "cyclonedx/cyclonedx-php-composer": "^6.2",
         "edgedesign/phpqa": "^1.27",
-        "guzzlehttp/guzzle": "^7.8",
+        "guzzlehttp/guzzle": "^8.2",
         "nextcloud/ocp": "^35.0",
         "phpcsstandards/phpcsextra": "^1.4",
         "phpmd/phpmd": "^2.15",