Skip to content

Commit c1b81ff

Browse files
committed
Create filters widget. Fix filters.
1 parent 368ad67 commit c1b81ff

File tree

31 files changed

+800
-37
lines changed

31 files changed

+800
-37
lines changed

packages/app/default/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
"org.eclipse.daanse.board.app.ui.vue.widget.vanta": "^0.0.1-next.1",
136136
"org.eclipse.daanse.board.app.ui.vue.widget.video": "^0.0.1-next.1",
137137
"org.eclipse.daanse.board.app.ui.vue.widget.wrapper": "^0.0.1-next.1",
138+
"org.eclipse.daanse.board.app.ui.vue.widget.xmla.filters": "^0.0.1-next.1",
138139
"pinia": "^3.0.1",
139140
"vue": "^3.5.13",
140141
"vue-grid-layout": "^2.4.0",

packages/app/default/src/main.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ import 'org.eclipse.daanse.board.app.ui.vue.datasource.ogcsta'
146146
import 'org.eclipse.daanse.board.app.ui.vue.widget.map'
147147
import 'org.eclipse.daanse.board.app.ui.vue.plugins.geojson_renderer'
148148
import 'org.eclipse.daanse.board.app.ui.vue.widget.weather'
149+
import 'org.eclipse.daanse.board.app.ui.vue.widget.xmla.filters'
149150
import 'org.eclipse.daanse.board.app.ui.vue.eventmanager'
150151

151152
import 'org.eclipse.daanse.board.app.lib.variables'

packages/lib/connection/base/src/gen/BaseConnection.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ export abstract class BaseConnection {
3333
@Attribute() type?: string;
3434

3535
@Attribute() uid?: string;
36-
36+
3737
fetch(config?: IRequestParams): any {
3838
throw new Error("fetch not implemented");
3939
}
40-
40+
4141
setConfig(config?: any): void {
4242
throw new Error("setConfig not implemented");
4343
}

packages/lib/connection/twowayconnection/src/gen/TwoWayConnection.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ import {Documentation, Attribute, ModelClass, Reference, Enum} from 'org.eclipse
3030
export abstract class TwoWayConnection extends PubSubConnection {
3131

3232
@Attribute() ready?: boolean;
33-
33+
3434
onMessage(data?: any,topic?: string): void {
3535
throw new Error("onMessage not implemented");
3636
}
37-
37+
3838
onConnect(): void {
3939
throw new Error("onConnect not implemented");
4040
}
41-
41+
4242
onClose(): void {
4343
throw new Error("onClose not implemented");
4444
}
45-
45+
4646
onError(error?: any): void {
4747
throw new Error("onError not implemented");
4848
}
49-
49+
5050
hasTopics(): boolean {
5151
throw new Error("hasTopics not implemented");
5252
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class XMLAApi {
8383
Statement: '',
8484
},
8585
Properties: {
86-
PropertieList: {
86+
PropertyList: {
8787
LocaleIdentifier: '1033',
8888
},
8989
},

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ export interface SecurityOptions {
5050
password?: string
5151
}
5252

53+
export interface FilterChangePayload {
54+
area: 'rows' | 'columns' | 'filters'
55+
filters: any
56+
id: string
57+
}
58+
5359
export class XmlaStore extends BaseDatasource {
5460
private connection: any
5561
private requestParams: XMLARequestParams = {
@@ -230,7 +236,7 @@ export class XmlaStore extends BaseDatasource {
230236
this.requestParams.measures,
231237
{},
232238
properties,
233-
[],
239+
this.requestParams.filters,
234240
levels,
235241
)
236242

@@ -260,6 +266,18 @@ export class XmlaStore extends BaseDatasource {
260266
return connectionRepository.getConnection(this.connection)
261267
}
262268

269+
changeFilters(e: FilterChangePayload) {
270+
console.log('event in the datasource', e);
271+
272+
const originalItem = this.requestParams[e.area].find(
273+
(item) => item.id === e.id
274+
);
275+
276+
if (originalItem) {
277+
originalItem.filters = e.filters;
278+
}
279+
}
280+
263281
callEvent(event: string, params: any) {
264282
switch (event) {
265283
case 'expand':
@@ -268,6 +286,9 @@ export class XmlaStore extends BaseDatasource {
268286
case 'collapse':
269287
this.collapse(params)
270288
break
289+
case 'filterChange':
290+
this.changeFilters(params)
291+
break
271292
default:
272293
console.warn('Event is not available for this type of store')
273294
}

packages/lib/events/src/gen/PageActions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {Documentation, Attribute, ModelClass, Reference, Enum} from 'org.eclipse
2828

2929
@ModelClass({type:'http://org.eclipse.daanse.board.app.lib.events.systemactions#//PageActions'})
3030
export class PageActions {
31-
31+
3232
@WidgetAction({eventType: 'page.setPageVariable'})
3333
setPageVariable(variableName?: string,value?: any,pageId?: string): void {
3434
throw new Error("setPageVariable not implemented");

packages/lib/events/src/gen/SystemActions.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,18 @@ Contributors: Smart City Jena
2323
* Default values are set. The '_type' parameter is generated for the
2424
* Serialization to a backend.
2525
*/
26+
import {SystemActionInterface} from 'org.eclipse.daanse.board.app.lib.events'
2627
import {WidgetAction} from 'org.eclipse.daanse.board.app.lib.events'
2728
import {Documentation, Attribute, ModelClass, Reference, Enum} from 'org.eclipse.daanse.board.app.lib.annotations'
2829

2930
@ModelClass({type:'http://org.eclipse.daanse.board.app.lib.events.systemactions#//SystemActions'})
30-
export class SystemActions {
31-
31+
export class SystemActions extends SystemActionInterface {
32+
3233
@WidgetAction({eventType: 'system.changePage'})
3334
changePage(pageId?: string): void {
3435
throw new Error("changePage not implemented");
3536
}
36-
37+
3738
@WidgetAction({eventType: 'system.setGlobalVariable'})
3839
setGlobalVariable(variableName?: string,value?: any): void {
3940
throw new Error("setGlobalVariable not implemented");

packages/lib/repository/navigation/src/gen/NavigationRegistry.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ import {Documentation, Attribute, ModelClass, Reference, Enum} from 'org.eclipse
2929
@ModelClass({type:'http://org.eclipse.daanse.board.app.lib.repository.navigation#//NavigationRegistry'})
3030
export class NavigationRegistry {
3131
@Reference('NavigationItem') items: Array<NavigationItem> = [];
32-
32+
3333
registerNavigationItem(item?: NavigationItem): boolean {
3434
throw new Error("registerNavigationItem not implemented");
3535
}
36-
36+
3737
unregisterNavigationItem(id?: string): boolean {
3838
throw new Error("unregisterNavigationItem not implemented");
3939
}
40-
40+
4141
getNavigationItem(id?: string): NavigationItem {
4242
throw new Error("getNavigationItem not implemented");
4343
}
44-
44+
4545
getAllNavigationItems(): NavigationItem {
4646
throw new Error("getAllNavigationItems not implemented");
4747
}

packages/lib/repository/route/src/gen/RouteRegistry.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ import {Documentation, Attribute, ModelClass, Reference, Enum} from 'org.eclipse
2929
@ModelClass({type:'http://org.eclipse.daanse.board.app.lib.repository.route#//RouteRegistry'})
3030
export class RouteRegistry {
3131
@Reference('RouteDefinition') routes: Array<RouteDefinition> = [];
32-
32+
3333
registerRoute(route?: RouteDefinition): boolean {
3434
throw new Error("registerRoute not implemented");
3535
}
36-
36+
3737
unregisterRoute(name?: string): boolean {
3838
throw new Error("unregisterRoute not implemented");
3939
}
40-
40+
4141
getRoute(name?: string): RouteDefinition {
4242
throw new Error("getRoute not implemented");
4343
}
44-
44+
4545
getAllRoutes(): RouteDefinition {
4646
throw new Error("getAllRoutes not implemented");
4747
}

0 commit comments

Comments
 (0)