Create filters widget. Fix filters.

Author: ssemenkoff

packages/app/default/package.json

@@ -135,6 +135,7 @@
     "org.eclipse.daanse.board.app.ui.vue.widget.vanta": "^0.0.1-next.1",
     "org.eclipse.daanse.board.app.ui.vue.widget.video": "^0.0.1-next.1",
     "org.eclipse.daanse.board.app.ui.vue.widget.wrapper": "^0.0.1-next.1",
+    "org.eclipse.daanse.board.app.ui.vue.widget.xmla.filters": "^0.0.1-next.1",
     "pinia": "^3.0.1",
     "vue": "^3.5.13",
     "vue-grid-layout": "^2.4.0",

packages/app/default/src/main.ts

@@ -146,6 +146,7 @@ import 'org.eclipse.daanse.board.app.ui.vue.datasource.ogcsta'
 import 'org.eclipse.daanse.board.app.ui.vue.widget.map'
 import 'org.eclipse.daanse.board.app.ui.vue.plugins.geojson_renderer'
 import 'org.eclipse.daanse.board.app.ui.vue.widget.weather'
+import 'org.eclipse.daanse.board.app.ui.vue.widget.xmla.filters'
 import 'org.eclipse.daanse.board.app.ui.vue.eventmanager'
 
 import 'org.eclipse.daanse.board.app.lib.variables'

packages/lib/connection/xmla/src/classes/xml.ts

@@ -83,7 +83,7 @@ class XMLAApi {
         Statement: '',
       },
       Properties: {
-        PropertieList: {
+        PropertyList: {
           LocaleIdentifier: '1033',
         },
       },

packages/lib/datasource/xmla/src/classes/index.ts

@@ -50,6 +50,12 @@ export interface SecurityOptions {
   password?: string
 }
 
+export interface FilterChangePayload {
+  area: 'rows' | 'columns' | 'filters'
+  filters: any
+  id: string
+}
+
 export class XmlaStore extends BaseDatasource {
   private connection: any
   private requestParams: XMLARequestParams = {
@@ -230,7 +236,7 @@ export class XmlaStore extends BaseDatasource {
       this.requestParams.measures,
       {},
       properties,
-      [],
+      this.requestParams.filters,
       levels,
     )
 
@@ -260,6 +266,18 @@ export class XmlaStore extends BaseDatasource {
     return connectionRepository.getConnection(this.connection)
   }
 
+  changeFilters(e: FilterChangePayload) {
+    console.log('event in the datasource', e);
+
+    const originalItem = this.requestParams[e.area].find(
+      (item) => item.id === e.id
+    );
+
+    if (originalItem) {
+      originalItem.filters = e.filters;
+    }
+  }
+
   callEvent(event: string, params: any) {
     switch (event) {
       case 'expand':
@@ -268,6 +286,9 @@ export class XmlaStore extends BaseDatasource {
       case 'collapse':
         this.collapse(params)
         break
+      case 'filterChange':
+        this.changeFilters(params)
+        break
       default:
         console.warn('Event is not available for this type of store')
     }

packages/ui/vue/common/xmla/src/Filters/FilterTreeView.vue

@@ -15,7 +15,7 @@ Contributors:
 import { useFilterTreeDataSource } from "../Composables/filterTreeDataSource";
 import { useSearchResultTreeData } from "../Composables/searchResultTreeData";
 import { debounce } from "lodash";
-import { computed, ref, watch } from "vue";
+import { computed, onMounted, ref, watch } from "vue";
 
 type RootHierarchy = any;
 
@@ -95,7 +95,7 @@ const multipleChoise = ref(
 const singleSelection = ref({ id: null });
 
 // expose resetSelection as function
-function resetSelection() {
+const resetSelection = () => {
   singleSelection.value = { id: null };
 }
 defineExpose({ resetSelection });
@@ -147,6 +147,12 @@ const emptySelection = computed(() => {
 function selectFilter(e: any) {
   singleSelection.value = e;
 }
+
+onMounted(() => {
+  if (props.rootHierarchy.filters.enabled && !props.rootHierarchy.filters.multipleChoise && props.rootHierarchy.filters.selectedItem?.id) {
+    singleSelection.value = props.rootHierarchy.filters.selectedItem;
+  }
+})
 </script>
 <template>
   <div class="flex" style="flex-direction: column; width: 100%">

packages/ui/vue/common/xmla/src/Modals/FiltersModal.vue

@@ -102,6 +102,16 @@ const setSelection = ({
 };
 
 function ok() {
+  const composedFilters = filterConfigured.value;
+
+  if (filterConfigured.value.enabled && !filterConfigured.value.multipleChoise && !filterConfigured.value.selectedItem.id) {
+    close({
+      filters: {
+        enabled: false
+      }
+    })
+  }
+
   close({ filters: filterConfigured.value });
 }
 
@@ -110,7 +120,8 @@ function cancel() {
 }
 
 function resetSelection() {
-  filterTreeView.value?.resetSelection();
+  const exposed = filterTreeView.value?.$.exposed as any;
+  exposed['resetSelection']();
 }
 </script>
 

packages/ui/vue/common/xmla/src/index.ts

@@ -14,5 +14,6 @@
 import MetadataTree from './MetadataTree/MetadataTree.vue'
 import QueryDesigner from './QueryDesigner/QueryDesigner.vue'
 import PivotTable from './PivotTable/PivotTable.vue'
+import FiltersModal from './Modals/FiltersModal.vue'
 
-export { MetadataTree, QueryDesigner, PivotTable }
+export { MetadataTree, QueryDesigner, PivotTable, FiltersModal }

packages/ui/vue/composables/src/useDatasourceRepository.ts

@@ -29,12 +29,14 @@ export interface IVueDatasourceRepository {
   ) => Promise<void>
   update: (oldVal: string, newVal: string) => void
   getDataWithOptions: (options?: any) => Promise<void>
+  getDatasourceInstance: () => any
 }
 
 export function useDatasourceRepository(
   dataSourceId: Ref<string>,
   type: string,
   data: Ref<any>,
+  subscriptions: Array<() => any> = [],
 ): IVueDatasourceRepository {
   const instance = getCurrentInstance()
   const container = instance?.appContext.config.globalProperties
@@ -139,24 +141,44 @@ export function useDatasourceRepository(
     try {
       const oldDataSource = datasourceRepository.getDatasource(oldVal)
       oldDataSource.unsubscribe(getData)
+      subscriptions.forEach(fn => {
+        oldDataSource.unsubscribe(fn);
+      });
     } catch (e) {
       console.warn(e)
     }
     try {
       const dataSource = datasourceRepository.getDatasource(newVal)
       // TODO: fix duplicate subscription
       dataSource.subscribe(()=>getData())
+      subscriptions.forEach(fn => {
+        dataSource.subscribe(fn);
+      })
     } catch (e) {
       console.warn(e)
     }
   }
 
+  const getDatasourceInstance = () => {
+    try {
+      const dataSource = datasourceRepository.getDatasource(dataSourceId.value)
+      return dataSource
+    }
+    catch (e) {
+      console.warn(e)
+      return null
+    }
+  }
+
   onMounted(() => {
     getData()
 
     try {
       const dataSource = datasourceRepository.getDatasource(dataSourceId.value)
       dataSource.subscribe(getData)
+      subscriptions.forEach(fn => {
+        dataSource.subscribe(fn);
+      })
     } catch (e) {
       console.warn(e)
     }
@@ -166,6 +188,9 @@ export function useDatasourceRepository(
     try {
       const dataSource = datasourceRepository.getDatasource(dataSourceId.value)
       dataSource.unsubscribe(getData)
+      subscriptions.forEach(fn => {
+        dataSource.unsubscribe(fn);
+      })
     } catch (e) {
       console.warn(e)
     }
@@ -176,5 +201,6 @@ export function useDatasourceRepository(
     callEvent,
     update,
     getDataWithOptions,
+    getDatasourceInstance,
   }
 }

packages/ui/vue/widget/icon/src/gen/IconClickPayload.ts

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2025 Contributors to the Eclipse Foundation.
+Copyright (c) 2023 Contributors to the  Eclipse Foundation.
 This program and the accompanying materials are made
 available under the terms of the Eclipse Public License 2.0
 which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -9,10 +9,24 @@ Contributors: Smart City Jena
 
 */
 
-import { Payload } from 'org.eclipse.daanse.board.app.lib.events'
-import { Documentation, Attribute, ModelClass } from 'org.eclipse.daanse.board.app.lib.annotations'
+/*
+* This is generated code! Please note, that on code generation, these line are erased and generated again.
+* If you modify this file, it is possible that you changes will be lost!!!
+*
+* This method uses JSON playload, to load an EPackage.
+*
+* @generated
+*/
+
+/*
+* Generate classes and enums for TypeScript
+* Default values are set. The '_type' parameter is generated for the
+* Serialization to a backend.
+*/
+import {Payload} from 'org.eclipse.daanse.board.app.lib.events'
+import {Documentation, Attribute, ModelClass, Reference, Enum} from 'org.eclipse.daanse.board.app.lib.annotations'
 
-@ModelClass({ type: 'http://org.eclipse.daanse.board.app.ui.vue.widget.icon#//IconClickPayload' })
+@ModelClass({type:'http://org.eclipse.daanse.board.app.ui.vue.widget.icon#//IconClickPayload'})
 export class IconClickPayload extends Payload {
 
   @Documentation("Name of the clicked icon.")

packages/ui/vue/widget/map/src/gen/MapSettings.ts

@@ -61,8 +61,5 @@ export class MapSettings {
   @Attribute() enableClustering?: boolean;
 
   @Documentation("Color used to highlight selected Things on the map (default: #ff0000)")
-  @Attribute() selectionHighlightColor?: string = "#ff0000";
-
-  @Documentation("ID of the currently selected Thing (persisted across mode switches)")
-  @Attribute() selectedThingId?: string | null;
+  @Attribute() selectionHighlightColor: string = "#ff0000";
 }