@disy/cadenza.js 10.4.7 → 10.4.9

package/cadenza.d.ts

@@ -119,6 +119,8 @@ export class CadenzaClient {
      * @return {Promise<void>} A `Promise` for when the iframe is loaded
      * @throws For invalid arguments
      * @fires
+     * - {@link CadenzaChangeExtentEvent}
+     * - {@link CadenzaChangeSelectionEvent}
      * - {@link CadenzaDrillThroughEvent}
      * - {@link CadenzaActionEvent}
      * @embed
@@ -166,7 +168,6 @@ export class CadenzaClient {
     /**
      * Set filter variables in the currently shown workbook.
      *
-     * @hidden
      * @param {FilterVariables} filter - The variable values
      * @return {Promise<void>} A `Promise` for when the filter variables were set.
      * @postMessage
@@ -178,7 +179,6 @@ export class CadenzaClient {
      * When making a layer visible, its ancestors will be made visible, too.
      * When hiding a layer, the ancestors are not affected.
      *
-     * @hidden
      * @param {WorkbookLayerPath | string} layer - The layer to show or hide
      *   (identified using a layer path or a print name)
      * @param {boolean} visible - The visibility state of the layer
@@ -189,7 +189,6 @@ export class CadenzaClient {
     /**
      * Set the selection in the currently shown workbook map view.
      *
-     * @hidden
      * @param {WorkbookLayerPath | string} layer - The data view layer to set the selection in
      * @param {unknown[][]} values - The IDs of the objects to select
      * @param {object} [__namedParameters]
@@ -203,7 +202,6 @@ export class CadenzaClient {
     /**
      * Add to the selection in the currently shown workbook map view.
      *
-     * @hidden
      * @param {WorkbookLayerPath | string} layer - The data view layer to change the selection in
      * @param {unknown[][]} values - The IDs of the objects to select
      * @param {object} [__namedParameters]
@@ -217,7 +215,6 @@ export class CadenzaClient {
     /**
      * Remove from the selection in the currently shown workbook map view.
      *
-     * @hidden
      * @param {WorkbookLayerPath | string} layer - The data view layer to change the selection in
      * @param {unknown[][]} values - The IDs of the objects to unselect
      * @param {object} [__namedParameters]
@@ -239,6 +236,8 @@ export class CadenzaClient {
      * @param {CommonEditGeometryOptions} [editGeometryOptions] - Options for the initialization of the geometry editor.
      * @throws For invalid arguments
      * @fires
+     * - {@link CadenzaChangeExtentEvent}
+     * - {@link CadenzaChangeSelectionEvent}
      * - {@link CadenzaEditGeometryUpdateEvent}
      * - {@link CadenzaEditGeometryOkEvent}
      * - {@link CadenzaEditGeometryCancelEvent}
@@ -254,6 +253,8 @@ export class CadenzaClient {
      * @return {Promise<void>} A `Promise` for when the iframe is loaded
      * @throws For invalid arguments
      * @fires
+     * - {@link CadenzaChangeExtentEvent}
+     * - {@link CadenzaChangeSelectionEvent}
      * - {@link CadenzaEditGeometryUpdateEvent}
      * - {@link CadenzaEditGeometryOkEvent}
      * - {@link CadenzaEditGeometryCancelEvent}
@@ -269,6 +270,8 @@ export class CadenzaClient {
      * @return {Promise<void>} A `Promise` for when the iframe is loaded
      * @throws For invalid arguments
      * @fires
+     * - {@link CadenzaChangeExtentEvent}
+     * - {@link CadenzaChangeSelectionEvent}
      * - {@link CadenzaEditGeometryUpdateEvent}
      * - {@link CadenzaEditGeometryOkEvent}
      * - {@link CadenzaEditGeometryCreateEvent}
@@ -287,6 +290,8 @@ export class CadenzaClient {
      * @return {Promise<void>} A `Promise` for when the iframe is loaded
      * @throws For invalid arguments
      * @fires
+     * - {@link CadenzaChangeExtentEvent}
+     * - {@link CadenzaChangeSelectionEvent}
      * - {@link CadenzaEditGeometryUpdateEvent}
      * - {@link CadenzaEditGeometryOkEvent}
      * - {@link CadenzaEditGeometryCreateEvent}
@@ -442,6 +447,7 @@ export class CadenzaClient {
 }
 /**
  * @typedef {'action'
+ * | 'change:extent'
  * | 'change:selection'
  * | 'drillThrough'
  * | 'editGeometry:ok'
@@ -458,6 +464,7 @@ export class CadenzaClient {
 /**
  * @template {CadenzaEventType} T
  * @typedef {T extends 'action' ? CadenzaActionEvent
+ *  : T extends 'change:extent' ? CadenzaChangeExtentEvent
  *  : T extends 'change:selection' ? CadenzaChangeSelectionEvent
  *  : T extends 'drillThrough' ? CadenzaDrillThroughEvent
  *  : T extends 'editGeometry:update' ? CadenzaEditGeometryUpdateEvent
@@ -482,6 +489,10 @@ export class CadenzaClient {
 /**
  * @typedef {CadenzaEvent<'action', {context: string}>} CadenzaActionEvent - When the user executed a POST message action, which is defined on an external link in the Cadenza management center.
  */
+/**
+ * @typedef {CadenzaEvent<'change:extent', {extent: Extent}>} CadenzaChangeExtentEvent - When the user moved the map.
+ *   The extent is transformed according to the `useMapSrs` option.
+ */
 /**
  * @typedef {CadenzaEvent<'change:selection', undefined | {layer: WorkbookLayerPath, values: unknown[][]}>} CadenzaChangeSelectionEvent - When the user changed the selection. `undefined` if no objects were selected.
  *
@@ -500,7 +511,7 @@ export class CadenzaClient {
 /** @typedef {CadenzaEvent<'editGeometry:ok', FeatureCollection | Feature>} CadenzaEditGeometryOkEvent - When the user submitted the geometry. `FeatureCollection` if batch editing is enabled. */
 /** @typedef {CadenzaEvent<'editGeometry:create', FeatureCollection | Feature>} CadenzaEditGeometryCreateEvent - Whenever new geometry features were created. `Feature` if only one feature was created. Only available in batch mode */
 /** @typedef {CadenzaEvent<'editGeometry:edit', Feature>} CadenzaEditGeometryEditEvent - Whenever a geometry feature was edited. Only available in batch mode */
-/** @typedef {CadenzaEvent<'editGeometry:delete', {featureIds: any[][]}>} CadenzaEditGeometryDeleteEvent - Whenever geometry features were deleted. Only available in batch mode */
+/** @typedef {CadenzaEvent<'editGeometry:delete', {objectIds: any[][]}>} CadenzaEditGeometryDeleteEvent - Whenever geometry features were deleted. Only available in batch mode */
 /** @typedef {CadenzaEvent<'editGeometry:cancel'>} CadenzaEditGeometryCancelEvent - When the user cancelled the geometry editing. */
 /** @typedef {CadenzaEvent<'error', {type: string, message?: string}>} CadenzaErrorEvent - An error event that is mapped to a {@link CadenzaError} */
 /**
@@ -928,8 +939,8 @@ export type Layout = 'dashboard' | 'linear';
 /**
  * - An event type to subscribe to using {@link CadenzaClienton }
  */
-export type CadenzaEventType = 'action' | 'change:selection' | 'drillThrough' | 'editGeometry:ok' | 'editGeometry:create' | 'editGeometry:edit' | 'editGeometry:delete' | 'editGeometry:update' | 'editGeometry:cancel' | 'reload' | 'selectObjects:ok' | 'selectObjects:cancel';
-export type CadenzaEventByType<T extends CadenzaEventType> = T extends 'action' ? CadenzaActionEvent : T extends 'change:selection' ? CadenzaChangeSelectionEvent : T extends 'drillThrough' ? CadenzaDrillThroughEvent : T extends 'editGeometry:update' ? CadenzaEditGeometryUpdateEvent : T extends 'editGeometry:ok' ? CadenzaEditGeometryOkEvent : T extends 'editGeometry:create' ? CadenzaEditGeometryCreateEvent : T extends 'editGeometry:edit' ? CadenzaEditGeometryEditEvent : T extends 'editGeometry:delete' ? CadenzaEditGeometryDeleteEvent : T extends 'editGeometry:cancel' ? CadenzaEditGeometryCancelEvent : T extends 'reload' ? CadenzaReloadEvent : T extends 'selectObjects:ok' ? CadenzaSelectObjectsOkEvent : T extends 'selectObjects:cancel' ? CadenzaSelectObjectsCancelEvent : never;
+export type CadenzaEventType = 'action' | 'change:extent' | 'change:selection' | 'drillThrough' | 'editGeometry:ok' | 'editGeometry:create' | 'editGeometry:edit' | 'editGeometry:delete' | 'editGeometry:update' | 'editGeometry:cancel' | 'reload' | 'selectObjects:ok' | 'selectObjects:cancel';
+export type CadenzaEventByType<T extends CadenzaEventType> = T extends 'action' ? CadenzaActionEvent : T extends 'change:extent' ? CadenzaChangeExtentEvent : T extends 'change:selection' ? CadenzaChangeSelectionEvent : T extends 'drillThrough' ? CadenzaDrillThroughEvent : T extends 'editGeometry:update' ? CadenzaEditGeometryUpdateEvent : T extends 'editGeometry:ok' ? CadenzaEditGeometryOkEvent : T extends 'editGeometry:create' ? CadenzaEditGeometryCreateEvent : T extends 'editGeometry:edit' ? CadenzaEditGeometryEditEvent : T extends 'editGeometry:delete' ? CadenzaEditGeometryDeleteEvent : T extends 'editGeometry:cancel' ? CadenzaEditGeometryCancelEvent : T extends 'reload' ? CadenzaReloadEvent : T extends 'selectObjects:ok' ? CadenzaSelectObjectsOkEvent : T extends 'selectObjects:cancel' ? CadenzaSelectObjectsCancelEvent : never;
 /**
  * - A Cadenza `postMessage()` event
  */
@@ -949,6 +960,13 @@ export type CadenzaEvent<TYPE extends string, DETAIL = unknown> = {
 export type CadenzaActionEvent = CadenzaEvent<'action', {
     context: string;
 }>;
+/**
+ * - When the user moved the map.
+ *   The extent is transformed according to the `useMapSrs` option.
+ */
+export type CadenzaChangeExtentEvent = CadenzaEvent<'change:extent', {
+    extent: [number, number, number, number];
+}>;
 /**
  * - When the user changed the selection. `undefined` if no objects were selected.
  *
@@ -991,7 +1009,7 @@ export type CadenzaEditGeometryEditEvent = CadenzaEvent<'editGeometry:edit', Fea
  * - Whenever geometry features were deleted. Only available in batch mode
  */
 export type CadenzaEditGeometryDeleteEvent = CadenzaEvent<'editGeometry:delete', {
-    featureIds: any[][];
+    objectIds: any[][];
 }>;
 /**
  * - When the user cancelled the geometry editing.

package/cadenza.js

@@ -18,7 +18,7 @@
  */
 // This placeholder is replaced when Cadenza JS is released,
 // i.e. during development, the version is not available.
-const CADENZAJS_VERSION = '10.4.7';
+const CADENZAJS_VERSION = '10.4.9';
 /**
  * Creates an instance of the Cadenza JS client.
  *
@@ -422,6 +422,8 @@ export class CadenzaClient {
      * @return {Promise<void>} A `Promise` for when the iframe is loaded
      * @throws For invalid arguments
      * @fires
+     * - {@link CadenzaChangeExtentEvent}
+     * - {@link CadenzaChangeSelectionEvent}
      * - {@link CadenzaDrillThroughEvent}
      * - {@link CadenzaActionEvent}
      * @embed
@@ -492,7 +494,6 @@ export class CadenzaClient {
     /**
      * Set filter variables in the currently shown workbook.
      *
-     * @hidden
      * @param {FilterVariables} filter - The variable values
      * @return {Promise<void>} A `Promise` for when the filter variables were set.
      * @postMessage
@@ -508,7 +509,6 @@ export class CadenzaClient {
      * When making a layer visible, its ancestors will be made visible, too.
      * When hiding a layer, the ancestors are not affected.
      *
-     * @hidden
      * @param {WorkbookLayerPath | string} layer - The layer to show or hide
      *   (identified using a layer path or a print name)
      * @param {boolean} visible - The visibility state of the layer
@@ -525,7 +525,6 @@ export class CadenzaClient {
     /**
      * Set the selection in the currently shown workbook map view.
      *
-     * @hidden
      * @param {WorkbookLayerPath | string} layer - The data view layer to set the selection in
      * @param {unknown[][]} values - The IDs of the objects to select
      * @param {object} [__namedParameters]
@@ -545,7 +544,6 @@ export class CadenzaClient {
     /**
      * Add to the selection in the currently shown workbook map view.
      *
-     * @hidden
      * @param {WorkbookLayerPath | string} layer - The data view layer to change the selection in
      * @param {unknown[][]} values - The IDs of the objects to select
      * @param {object} [__namedParameters]
@@ -565,7 +563,6 @@ export class CadenzaClient {
     /**
      * Remove from the selection in the currently shown workbook map view.
      *
-     * @hidden
      * @param {WorkbookLayerPath | string} layer - The data view layer to change the selection in
      * @param {unknown[][]} values - The IDs of the objects to unselect
      * @param {object} [__namedParameters]
@@ -593,6 +590,8 @@ export class CadenzaClient {
      * @param {CommonEditGeometryOptions} [editGeometryOptions] - Options for the initialization of the geometry editor.
      * @throws For invalid arguments
      * @fires
+     * - {@link CadenzaChangeExtentEvent}
+     * - {@link CadenzaChangeSelectionEvent}
      * - {@link CadenzaEditGeometryUpdateEvent}
      * - {@link CadenzaEditGeometryOkEvent}
      * - {@link CadenzaEditGeometryCancelEvent}
@@ -630,6 +629,8 @@ export class CadenzaClient {
      * @return {Promise<void>} A `Promise` for when the iframe is loaded
      * @throws For invalid arguments
      * @fires
+     * - {@link CadenzaChangeExtentEvent}
+     * - {@link CadenzaChangeSelectionEvent}
      * - {@link CadenzaEditGeometryUpdateEvent}
      * - {@link CadenzaEditGeometryOkEvent}
      * - {@link CadenzaEditGeometryCancelEvent}
@@ -671,6 +672,8 @@ export class CadenzaClient {
      * @return {Promise<void>} A `Promise` for when the iframe is loaded
      * @throws For invalid arguments
      * @fires
+     * - {@link CadenzaChangeExtentEvent}
+     * - {@link CadenzaChangeSelectionEvent}
      * - {@link CadenzaEditGeometryUpdateEvent}
      * - {@link CadenzaEditGeometryOkEvent}
      * - {@link CadenzaEditGeometryCreateEvent}
@@ -713,6 +716,8 @@ export class CadenzaClient {
      * @return {Promise<void>} A `Promise` for when the iframe is loaded
      * @throws For invalid arguments
      * @fires
+     * - {@link CadenzaChangeExtentEvent}
+     * - {@link CadenzaChangeSelectionEvent}
      * - {@link CadenzaEditGeometryUpdateEvent}
      * - {@link CadenzaEditGeometryOkEvent}
      * - {@link CadenzaEditGeometryCreateEvent}
@@ -744,8 +749,8 @@ export class CadenzaClient {
         await this.#setupEditorViaPostRequests({
             additionalLayers,
             validExtentStrategy,
-            features,
         });
+        await this.#createFeaturesAndEditLastCreatedFeature(features);
         await this.#setEditorStateToReady();
     }
     /**
@@ -753,10 +758,9 @@ export class CadenzaClient {
      * @param [__namedParameters.geometry] {Geometry} - The geometry to edit
      * @param [__namedParameters.additionalLayers] {LayerDefinition[]} - Layer definitions to be imported and shown in the background, as a basis for the drawing. IMPORTANT: The Cadenza referenced with `cadenzaClient` must be configured to support the import of GeoJSON, and the (system) privileges of the corresponding user must also be set in such a way that the import of GeoJSON is possible.
      * @param [__namedParameters.validExtentStrategy] {ExtentStrategy} - Defines the initial map extent; If not given, Cadenza's default logic is used.
-     * @param [__namedParameters.features] {FeatureCollection} - The features to edit. The last feature in this collection is directly set up for editing.
      * @returns {Promise<Awaited<unknown>[]>}
      */
-    #setupEditorViaPostRequests({ geometry, additionalLayers, validExtentStrategy, features, }) {
+    #setupEditorViaPostRequests({ geometry, additionalLayers, validExtentStrategy, }) {
         const postRequests = [];
         postRequests.push(this.#setExtentStrategy(validExtentStrategy));
         if (geometry) {
@@ -769,11 +773,41 @@ export class CadenzaClient {
                 postRequests.push(this.#postRequest('importLayer', layer));
             }
         }
-        if (features) {
-            postRequests.push(this.#postRequest('addFeatures', features));
-        }
         return Promise.all(postRequests);
     }
+    /**
+     * @param {FeatureCollection} features - The features to edit.
+     */
+    async #createFeaturesAndEditLastCreatedFeature(features) {
+        const editFeaturePromise = new Promise((resolve) => {
+            this.#once('editGeometry:create', 
+            /** @param {CadenzaEditGeometryCreateEvent} event */ async (event) => {
+                const featureOrCollection = event.detail;
+                let lastAddedFeature;
+                if (featureOrCollection.type === 'Feature') {
+                    lastAddedFeature = featureOrCollection;
+                }
+                else {
+                    const addedFeatures = featureOrCollection.features;
+                    lastAddedFeature = addedFeatures[addedFeatures.length - 1];
+                }
+                await this.#setEditFeature(lastAddedFeature.objectId);
+                resolve(undefined);
+            });
+        });
+        await this.#postRequest('createFeatures', features);
+        return editFeaturePromise;
+    }
+    /**
+     * Send a request to the geometry editor to edit the feature with the given ID.
+     * If another feature is currently being edited or created,
+     * the user is prompted to save (if possible), discard the current changes, or to abort the request.
+     *
+     * @param {any[]} objectId - The id of the feature
+     */
+    #setEditFeature(objectId) {
+        return this.#postRequest('requestEditFeature', objectId);
+    }
     #setEditorStateToReady() {
         return this.#postRequest('setEditorState', 'READY');
     }
@@ -948,6 +982,20 @@ export class CadenzaClient {
             }
         };
     }
+    /**
+     * @template {CadenzaEventType | string} TYPE
+     * @template [DETAIL=unknown]
+     * @param {TYPE} type
+     * @param {(event: CadenzaEvent<TYPE, DETAIL>) => void} subscriber
+     * @return {() => void} An unsubscribe function
+     */
+    #once(type, subscriber) {
+        const unsubscribe = this.#on(type, (event) => {
+            subscriber(/** @type {CadenzaEvent<TYPE, DETAIL>} */ (event));
+            unsubscribe();
+        });
+        return unsubscribe;
+    }
     // Use arrow function so that it's bound to this.
     #onMessage = (
     /** @type MessageEvent<CadenzaEvent<never, never>> */ event) => {
@@ -1447,6 +1495,7 @@ function getGeometryTypeFromFeatureCollection(featureCollection) {
 // Please do not add internal event types like 'ready' here.
 /**
  * @typedef {'action'
+ * | 'change:extent'
  * | 'change:selection'
  * | 'drillThrough'
  * | 'editGeometry:ok'
@@ -1463,6 +1512,7 @@ function getGeometryTypeFromFeatureCollection(featureCollection) {
 /**
  * @template {CadenzaEventType} T
  * @typedef {T extends 'action' ? CadenzaActionEvent
+ *  : T extends 'change:extent' ? CadenzaChangeExtentEvent
  *  : T extends 'change:selection' ? CadenzaChangeSelectionEvent
  *  : T extends 'drillThrough' ? CadenzaDrillThroughEvent
  *  : T extends 'editGeometry:update' ? CadenzaEditGeometryUpdateEvent
@@ -1487,8 +1537,7 @@ function getGeometryTypeFromFeatureCollection(featureCollection) {
 /**
  * @typedef {CadenzaEvent<'action', {context: string}>} CadenzaActionEvent - When the user executed a POST message action, which is defined on an external link in the Cadenza management center.
  */
-/*
- * @hidden
+/**
  * @typedef {CadenzaEvent<'change:extent', {extent: Extent}>} CadenzaChangeExtentEvent - When the user moved the map.
  *   The extent is transformed according to the `useMapSrs` option.
  */
@@ -1510,7 +1559,7 @@ function getGeometryTypeFromFeatureCollection(featureCollection) {
 /** @typedef {CadenzaEvent<'editGeometry:ok', FeatureCollection | Feature>} CadenzaEditGeometryOkEvent - When the user submitted the geometry. `FeatureCollection` if batch editing is enabled. */
 /** @typedef {CadenzaEvent<'editGeometry:create', FeatureCollection | Feature>} CadenzaEditGeometryCreateEvent - Whenever new geometry features were created. `Feature` if only one feature was created. Only available in batch mode */
 /** @typedef {CadenzaEvent<'editGeometry:edit', Feature>} CadenzaEditGeometryEditEvent - Whenever a geometry feature was edited. Only available in batch mode */
-/** @typedef {CadenzaEvent<'editGeometry:delete', {featureIds: any[][]}>} CadenzaEditGeometryDeleteEvent - Whenever geometry features were deleted. Only available in batch mode */
+/** @typedef {CadenzaEvent<'editGeometry:delete', {objectIds: any[][]}>} CadenzaEditGeometryDeleteEvent - Whenever geometry features were deleted. Only available in batch mode */
 /** @typedef {CadenzaEvent<'editGeometry:cancel'>} CadenzaEditGeometryCancelEvent - When the user cancelled the geometry editing. */
 /** @typedef {CadenzaEvent<'error', {type: string, message?: string}>} CadenzaErrorEvent - An error event that is mapped to a {@link CadenzaError} */
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@disy/cadenza.js",
-  "version": "10.4.7",
+  "version": "10.4.9",
   "license": "Apache-2.0",
   "repository": "github:DisyInformationssysteme/cadenza.js",
   "type": "module",