@vcmap/ui 6.0.0-rc.8 → 6.0.0-rc.9

package/src/components/lists/VcsListItemComponent.vue

@@ -94,13 +94,15 @@
     v-bind="$attrs"
     class="vcs-list-item-component"
   >
-    <template #prepend>
-      <v-icon v-if="item.icon">
-        {{ item.icon }}
-      </v-icon>
+    <template #prepend="scope">
+      <slot name="prepend" v-bind="scope">
+        <v-icon v-if="item.icon">
+          {{ item.icon }}
+        </v-icon>
+      </slot>
     </template>
-    <template #title>
-      <slot name="title" v-bind="{ item, dragging, tooltip }">
+    <template #title="scope">
+      <slot name="title" v-bind="{ ...scope, tooltip }">
         <v-list-item-title
           ref="title"
           :class="{ 'vcs-list-item__rename': rename }"
@@ -125,17 +127,17 @@
         </v-list-item-title>
       </slot>
     </template>
-    <template #subtitle>
-      <slot name="subtitle" v-bind="{ item }" />
+    <template #subtitle="scope">
+      <slot name="subtitle" v-bind="scope" />
     </template>
     <template #default="scope">
-      <slot name="default" v-bind="{ ...scope, item, dragging, tooltip }" />
+      <slot name="default" v-bind="{ ...scope, tooltip }" />
     </template>
-    <template #append="appendScope">
+    <template #append="scope">
       <slot
         name="append"
         v-bind="{
-          ...appendScope,
+          ...scope,
           item,
           actions,
           actionButtonListOverflowCount,

package/src/components/lists/VcsListItemComponent.vue.d.ts

@@ -3,17 +3,21 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{}
         readonly [x: string]: any;
     };
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>, {
+    prepend?(_: {
+        isActive: boolean;
+        isOpen: boolean;
+        isSelected: boolean;
+        isIndeterminate: boolean;
+        select: (value: boolean) => void;
+    }): any;
     title?(_: {
-        item: any;
-        dragging: any;
         tooltip: string;
+        title?: string | number | undefined;
     }): any;
     subtitle?(_: {
-        item: any;
+        subtitle?: string | number | undefined;
     }): any;
     default?(_: {
-        item: any;
-        dragging: any;
         tooltip: string;
         isActive: boolean;
         isOpen: boolean;

package/src/components/lists/VcsTreeview.vue

@@ -118,7 +118,7 @@
   import { VIcon } from 'vuetify/components';
   import { VTreeview } from 'vuetify/labs/VTreeview';
   import { useProxiedAtomicModel } from '../modelHelper.js';
-  import { useForwardSlots } from '../composables.js';
+  import { getForwardSlots } from '../composables.js';
   import VcsTreeviewSearchbar from './VcsTreeviewSearchbar.vue';
   import VcsActionButtonList from '../buttons/VcsActionButtonList.vue';
   import ImageElementInjector from '../ImageElementInjector.vue';
@@ -184,7 +184,7 @@
           .indexOf(q.toLocaleLowerCase());
       };
 
-      const forwardSlots = useForwardSlots(slots, [
+      const forwardSlots = getForwardSlots(slots, [
         'append',
         'title',
         'prepend',

package/src/components/lists/VcsTreeview.vue.d.ts

@@ -19,7 +19,7 @@ declare const _default: import("vue").DefineComponent<{
     iconSize: import("vue").ComputedRef<number>;
     localSearchValue: import("vue").Ref<any>;
     handleFilter: (value: string, q: string, item: Object) => number;
-    forwardSlots: import("vue").ComputedRef<string[]>;
+    forwardSlots: string[];
     itemClicked(name: any, event: any): void;
 }, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:search"[], "update:search", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     items: {

package/src/components/tables/VcsDataTable.vue

@@ -133,7 +133,7 @@
   import VcsTreeviewSearchbar from '../lists/VcsTreeviewSearchbar.vue';
   import VcsButton from '../buttons/VcsButton.vue';
   import VcsCheckbox from '../form-inputs-controls/VcsCheckbox.vue';
-  import { useForwardSlots } from '../composables.js';
+  import { getForwardSlots } from '../composables.js';
 
   /**
    * @typedef {Object} UpdateItemsEvent
@@ -363,7 +363,7 @@
           props.serverItemsLength > itemsPerPageRef.value,
       );
 
-      const forwardSlots = useForwardSlots(slots, [
+      const forwardSlots = getForwardSlots(slots, [
         'prepend',
         'default',
         'append',

package/src/components/tables/VcsDataTable.vue.d.ts

@@ -54,7 +54,7 @@ declare const _default: import("vue").DefineComponent<{
     handleSearch: () => void;
     translatedHeaders: ComputedRef<Object[]>;
     showFooter: import("vue").ComputedRef<boolean>;
-    forwardSlots: import("vue").ComputedRef<string[]>;
+    forwardSlots: string[];
 }, any, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     headers: {
         type: ArrayConstructor;

package/src/contentTree/obliqueCollectionContentTreeItem.js

@@ -151,7 +151,12 @@ class ObliqueCollectionContentTreeItem extends VcsObjectContentTreeItem {
       if (this.state === StateActionState.INACTIVE) {
         this.state = StateActionState.LOADING;
         await map.setCollection(this._collection, vp);
-        executeCallbacks(this._app, this._onActivate);
+        if (map.collection === this._collection) {
+          executeCallbacks(this._app, this._onActivate);
+        } else {
+          // failed to activate collection
+          this.state = StateActionState.INACTIVE;
+        }
       } else if (this.state === StateActionState.ACTIVE) {
         this.state = StateActionState.INACTIVE;
         await map.setCollection(defaultCollection, vp);

package/src/featureInfo/abstractFeatureInfoView.js

@@ -430,15 +430,16 @@ class AbstractFeatureInfoView extends VcsObject {
    * @returns {import("../manager/window/windowManager.js").WindowComponentOptions}
    */
   getWindowComponentOptions(app, featureInfo, layer) {
+    const props = this.getProperties(featureInfo, layer);
     return {
       state: getWindowState(app, this.window.state, {
-        ...this.getAttributes(featureInfo.feature),
+        ...props.attributes,
         layerName: layer.properties?.title || layer.name,
       }),
       slot: this.window.slot ?? WindowSlot.DYNAMIC_RIGHT,
       component: this.component,
       position: this.window.position,
-      props: this.getProperties(featureInfo, layer),
+      props,
     };
   }
 

package/src/i18n/de.d.ts

@@ -156,10 +156,15 @@ declare namespace messages {
             let errorConnection: string;
             let errorPosition: string;
         }
+        namespace obliqueFallback {
+            export let message: string;
+            let title_5: string;
+            export { title_5 as title };
+        }
     }
     export namespace categoryManager {
-        let title_5: string;
-        export { title_5 as title };
+        let title_6: string;
+        export { title_6 as title };
         let tooltip_2: string;
         export { tooltip_2 as tooltip };
     }
@@ -236,8 +241,8 @@ declare namespace messages {
             export let general: string;
             let name_1: string;
             export { name_1 as name };
-            let title_6: string;
-            export { title_6 as title };
+            let title_7: string;
+            export { title_7 as title };
             export let titlePlaceholder: string;
             export let interpolation: string;
             export let duration: string;
@@ -270,8 +275,8 @@ declare namespace messages {
         export namespace viewpoint {
             let name_4: string;
             export { name_4 as name };
-            let title_7: string;
-            export { title_7 as title };
+            let title_8: string;
+            export { title_8 as title };
             let titlePlaceholder_1: string;
             export { titlePlaceholder_1 as titlePlaceholder };
             export let groundPosition: string;
@@ -296,8 +301,8 @@ declare namespace messages {
             let outOfRange: string;
         }
         export namespace extent {
-            let title_8: string;
-            export { title_8 as title };
+            let title_9: string;
+            export { title_9 as title };
             export let projection: string;
             export let min: string;
             export let max: string;
@@ -371,14 +376,14 @@ declare namespace messages {
         }
     }
     export namespace settings {
-        let title_9: string;
-        export { title_9 as title };
+        let title_10: string;
+        export { title_10 as title };
         let tooltip_3: string;
         export { tooltip_3 as tooltip };
         export let languageSelector: string;
         export namespace displayQuality {
-            let title_10: string;
-            export { title_10 as title };
+            let title_11: string;
+            export { title_11 as title };
             export namespace level {
                 let low: string;
                 let medium: string;
@@ -386,15 +391,15 @@ declare namespace messages {
             }
         }
         export namespace theme {
-            let title_11: string;
-            export { title_11 as title };
+            let title_12: string;
+            export { title_12 as title };
             export let dark: string;
             export let light: string;
         }
     }
     export namespace help_1 {
-        let title_12: string;
-        export { title_12 as title };
+        let title_13: string;
+        export { title_13 as title };
         let tooltip_4: string;
         export { tooltip_4 as tooltip };
     }
@@ -404,8 +409,8 @@ declare namespace messages {
         let deactivateToolTitle: string;
     }
     export namespace legend {
-        let title_13: string;
-        export { title_13 as title };
+        let title_14: string;
+        export { title_14 as title };
         let tooltip_5: string;
         export { tooltip_5 as tooltip };
         let empty_2: string;
@@ -414,8 +419,8 @@ declare namespace messages {
         export let defaultLabelText: string;
     }
     export namespace search_1 {
-        let title_14: string;
-        export { title_14 as title };
+        let title_15: string;
+        export { title_15 as title };
         let tooltip_6: string;
         export { tooltip_6 as tooltip };
         export let select: string;
@@ -431,31 +436,31 @@ declare namespace messages {
         export let miscellaneous: string;
     }
     export namespace footer {
-        let title_15: string;
-        export { title_15 as title };
+        let title_16: string;
+        export { title_16 as title };
         export namespace attributions {
-            let title_16: string;
-            export { title_16 as title };
+            let title_17: string;
+            export { title_17 as title };
             let tooltip_7: string;
             export { tooltip_7 as tooltip };
             let empty_3: string;
             export { empty_3 as empty };
         }
         export namespace imprint {
-            let title_17: string;
-            export { title_17 as title };
+            let title_18: string;
+            export { title_18 as title };
             let tooltip_8: string;
             export { tooltip_8 as tooltip };
         }
         export namespace dataProtection {
-            let title_18: string;
-            export { title_18 as title };
+            let title_19: string;
+            export { title_19 as title };
             let tooltip_9: string;
             export { tooltip_9 as tooltip };
         }
         export namespace positionDisplay {
-            let title_19: string;
-            export { title_19 as title };
+            let title_20: string;
+            export { title_20 as title };
             let projection_1: string;
             export { projection_1 as projection };
         }

package/src/i18n/de.js

@@ -58,6 +58,11 @@ const messages = {
         'Während dem ermitteln Ihrer Position wurde die Verbindung verloren',
       errorPosition: 'Ihre Position kann leider nicht erfasst werden',
     },
+    obliqueFallback: {
+      message:
+        'Für die aktuelle Position liegen bei dem ausgewählten Datensatz keine Daten vor',
+      title: 'Fehlende Daten',
+    },
   },
   categoryManager: {
     title: 'Mein Arbeitsbereich',

package/src/i18n/en.d.ts

@@ -156,10 +156,15 @@ declare namespace messages {
             let errorConnection: string;
             let errorPosition: string;
         }
+        namespace obliqueFallback {
+            export let message: string;
+            let title_5: string;
+            export { title_5 as title };
+        }
     }
     export namespace categoryManager {
-        let title_5: string;
-        export { title_5 as title };
+        let title_6: string;
+        export { title_6 as title };
         let tooltip_2: string;
         export { tooltip_2 as tooltip };
     }
@@ -236,8 +241,8 @@ declare namespace messages {
             export let general: string;
             let name_1: string;
             export { name_1 as name };
-            let title_6: string;
-            export { title_6 as title };
+            let title_7: string;
+            export { title_7 as title };
             export let titlePlaceholder: string;
             export let interpolation: string;
             export let duration: string;
@@ -270,8 +275,8 @@ declare namespace messages {
         export namespace viewpoint {
             let name_4: string;
             export { name_4 as name };
-            let title_7: string;
-            export { title_7 as title };
+            let title_8: string;
+            export { title_8 as title };
             let titlePlaceholder_1: string;
             export { titlePlaceholder_1 as titlePlaceholder };
             export let groundPosition: string;
@@ -296,8 +301,8 @@ declare namespace messages {
             let outOfRange: string;
         }
         export namespace extent {
-            let title_8: string;
-            export { title_8 as title };
+            let title_9: string;
+            export { title_9 as title };
             export let projection: string;
             export let min: string;
             export let max: string;
@@ -371,14 +376,14 @@ declare namespace messages {
         }
     }
     export namespace settings {
-        let title_9: string;
-        export { title_9 as title };
+        let title_10: string;
+        export { title_10 as title };
         let tooltip_3: string;
         export { tooltip_3 as tooltip };
         export let languageSelector: string;
         export namespace displayQuality {
-            let title_10: string;
-            export { title_10 as title };
+            let title_11: string;
+            export { title_11 as title };
             export namespace level {
                 let low: string;
                 let medium: string;
@@ -386,15 +391,15 @@ declare namespace messages {
             }
         }
         export namespace theme {
-            let title_11: string;
-            export { title_11 as title };
+            let title_12: string;
+            export { title_12 as title };
             export let dark: string;
             export let light: string;
         }
     }
     export namespace help_1 {
-        let title_12: string;
-        export { title_12 as title };
+        let title_13: string;
+        export { title_13 as title };
         let tooltip_4: string;
         export { tooltip_4 as tooltip };
     }
@@ -404,8 +409,8 @@ declare namespace messages {
         let deactivateToolTitle: string;
     }
     export namespace legend {
-        let title_13: string;
-        export { title_13 as title };
+        let title_14: string;
+        export { title_14 as title };
         let tooltip_5: string;
         export { tooltip_5 as tooltip };
         let empty_2: string;
@@ -414,8 +419,8 @@ declare namespace messages {
         export let defaultLabelText: string;
     }
     export namespace search_1 {
-        let title_14: string;
-        export { title_14 as title };
+        let title_15: string;
+        export { title_15 as title };
         let tooltip_6: string;
         export { tooltip_6 as tooltip };
         export let select: string;
@@ -431,31 +436,31 @@ declare namespace messages {
         export let miscellaneous: string;
     }
     export namespace footer {
-        let title_15: string;
-        export { title_15 as title };
+        let title_16: string;
+        export { title_16 as title };
         export namespace attributions {
-            let title_16: string;
-            export { title_16 as title };
+            let title_17: string;
+            export { title_17 as title };
             let tooltip_7: string;
             export { tooltip_7 as tooltip };
             let empty_3: string;
             export { empty_3 as empty };
         }
         export namespace imprint {
-            let title_17: string;
-            export { title_17 as title };
+            let title_18: string;
+            export { title_18 as title };
             let tooltip_8: string;
             export { tooltip_8 as tooltip };
         }
         export namespace dataProtection {
-            let title_18: string;
-            export { title_18 as title };
+            let title_19: string;
+            export { title_19 as title };
             let tooltip_9: string;
             export { tooltip_9 as tooltip };
         }
         export namespace positionDisplay {
-            let title_19: string;
-            export { title_19 as title };
+            let title_20: string;
+            export { title_20 as title };
             let projection_1: string;
             export { projection_1 as projection };
         }

package/src/i18n/en.js

@@ -58,6 +58,11 @@ const messages = {
         'The connection was lost while your position was being determined',
       errorPosition: 'Unfortunately, your position cannot be recorded',
     },
+    obliqueFallback: {
+      message:
+        'There is no data for the current position and selected data set.',
+      title: 'Missing Data',
+    },
   },
   categoryManager: {
     title: 'My Workspace',

package/src/manager/collectionManager/collectionComponentClass.js

@@ -81,7 +81,11 @@ export function createSupportedMapMappingFunction(
   return (item, _c, listItem) => {
     const mapNames =
       typeof supportedMaps === 'function' ? supportedMaps(item) : supportedMaps;
-    listItem.disabled = !mapNames.includes(mapCollection.activeMap.className);
+    if (mapCollection.activeMap) {
+      listItem.disabled = !mapNames.includes(mapCollection.activeMap.className);
+    } else {
+      listItem.disabled = true;
+    }
     listItem.destroyFunctions.push(
       mapCollection.mapActivated.addEventListener((map) => {
         listItem.disabled = !mapNames.includes(map.className);

package/src/manager/toolbox/ToolboxManagerComponent.vue

@@ -33,7 +33,7 @@
           :active="group.action.active"
           :background="group.action.background"
           :disabled="group.action.disabled"
-          @click="group.action.callback($event)"
+          @click.stop="group.action.callback($event)"
           v-bind="{ ...$attrs }"
         />
       </div>

package/src/manager/window/windowManager.d.ts

@@ -17,7 +17,7 @@ export function isSlotPosition(windowPosition: WindowPosition): boolean;
  *   parentId?: string,
  *   component: import("vue").Component<T>,
  *   headerComponent?: import("vue").Component<T>,
- *   state? : Partial<WindowState>,
+ *   state? : WindowStateOptions,
  *   position? : Partial<WindowPositionOptions>,
  *   slot?: WindowSlot,
  *   props?: T,
@@ -28,16 +28,34 @@ export function isSlotPosition(windowPosition: WindowPosition): boolean;
  * @property {string} [parentId] An optional ID of a parent window for 'dynamicChild' slot. Parent windows with slot dynamicRight are not supported.
  * @property {import("vue").Component<T, unknown, unknown>} component Main Component which is shown below the header.
  * @property {import("vue").Component<T, unknown, unknown>} [headerComponent] Replaces the Header Component.
- * @property {Partial<WindowState>} [state]
+ * @property {WindowStateOptions} [state]
  * @property {Partial<WindowPositionOptions>} [position] Will be merged with default position for slot
  * @property {WindowSlot} [slot]
  * @property {T} [props]
  * @property {Object} [provides]
  */
+/**
+ * @typedef {T|import('vue').Ref<T>|import('vue').ComputedRef<T>} OptionsOrRef
+ * @template T
+ */
+/**
+ * @typedef {Object} WindowStateOptions
+ * @property {OptionsOrRef<boolean>} [hideHeader] be used to not show the header.
+ * @property {OptionsOrRef<boolean>} [hidePin] be used to not show the pin button.
+ * @property {OptionsOrRef<string|string[]>} [headerTitle] An optional translatable header. If an array is provided all elements are translated and joined afterward.
+ * @property {OptionsOrRef<string>} [headerIcon]
+ * @property {OptionsOrRef<Array<import("../../actions/actionHelper.js").VcsAction>>} [headerActions]
+ * @property {OptionsOrRef<number>} [headerActionsOverflow]
+ * @property {OptionsOrRef<string>} [infoUrl] An optional url referencing help or further information on the window's content.
+ * @property {OptionsOrRef<function():string>} [infoUrlCallback] An optional function returning an url referencing help or further information. Can be used for urls depending on the app's locale, e.g. app.getHelpUrl()
+ * @property {Record<string, string>} [styles] Can be used to add additional styles to the root WindowComponent. Use Vue Style Bindings Object Syntax https://vuejs.org/v2/guide/class-and-style.html
+ * @property {Array<string>|Record<string,string>} [classes] Can be used to add additional classes to the root WindowComponent. Use Vue Class Bindings Syntax https://vuejs.org/v2/guide/class-and-style.html
+ */
 /**
  * @typedef {Object} WindowState
  * @property {string} id
  * @property {string|vcsAppSymbol} owner Owner of the window, set by windowManager on add
+ * @property {string|undefined} parentId - the parent of this window
  * @property {boolean} [hideHeader] be used to not show the header.
  * @property {boolean} [hidePin] be used to not show the pin button.
  * @property {string|string[]} [headerTitle] An optional translatable header. If an array is provided all elements are translated and joined afterward.
@@ -134,18 +152,56 @@ export type WindowComponentOptions<T = any> = {
     parentId?: string;
     component: import("vue").Component<T>;
     headerComponent?: import("vue").Component<T>;
-    state?: Partial<WindowState>;
+    state?: WindowStateOptions;
     position?: Partial<WindowPositionOptions>;
     slot?: WindowSlot;
     props?: T;
     provides?: Record<string, unknown>;
 };
+export type OptionsOrRef<T> = T | import('vue').Ref<T> | import('vue').ComputedRef<T>;
+export type WindowStateOptions = {
+    /**
+     * be used to not show the header.
+     */
+    hideHeader?: OptionsOrRef<boolean> | undefined;
+    /**
+     * be used to not show the pin button.
+     */
+    hidePin?: OptionsOrRef<boolean> | undefined;
+    /**
+     * An optional translatable header. If an array is provided all elements are translated and joined afterward.
+     */
+    headerTitle?: OptionsOrRef<string | string[]> | undefined;
+    headerIcon?: OptionsOrRef<string> | undefined;
+    headerActions?: OptionsOrRef<import("../../actions/actionHelper.js").VcsAction[]> | undefined;
+    headerActionsOverflow?: OptionsOrRef<number> | undefined;
+    /**
+     * An optional url referencing help or further information on the window's content.
+     */
+    infoUrl?: OptionsOrRef<string> | undefined;
+    /**
+     * An optional function returning an url referencing help or further information. Can be used for urls depending on the app's locale, e.g. app.getHelpUrl()
+     */
+    infoUrlCallback?: OptionsOrRef<() => string> | undefined;
+    /**
+     * Can be used to add additional styles to the root WindowComponent. Use Vue Style Bindings Object Syntax https://vuejs.org/v2/guide/class-and-style.html
+     */
+    styles?: Record<string, string> | undefined;
+    /**
+     * Can be used to add additional classes to the root WindowComponent. Use Vue Class Bindings Syntax https://vuejs.org/v2/guide/class-and-style.html
+     */
+    classes?: string[] | Record<string, string> | undefined;
+};
 export type WindowState = {
     id: string;
     /**
      * Owner of the window, set by windowManager on add
      */
     owner: string | symbol;
+    /**
+     * - the parent of this window
+     */
+    parentId: string | undefined;
     /**
      * be used to not show the header.
      */