diff --git a/src/frontend/src/app/control-center/control-center.component.ts b/src/frontend/src/app/control-center/control-center.component.ts index 090735493643f3f2dc68debb3bad2168f14b81eb..1e5bc63c0e91829af15de1a79d628c36432839fc 100644 --- a/src/frontend/src/app/control-center/control-center.component.ts +++ b/src/frontend/src/app/control-center/control-center.component.ts @@ -209,7 +209,19 @@ export class ControlCenterComponent { sendFilter() { console.log('Sending xAPI Filter:', this.filterObject, 'to', this.selectedAnalysis); - this._apiService.getStatement(this.filterObject??JSON.parse(this.filterObject),this.selectedAnalysis?.key??'', 10) + let parsedFilterObject = {}; + + if (this.filterObject && this.filterObject.trim()) { + try { + parsedFilterObject = JSON.parse(this.filterObject); + } catch (error) { + this.responseStatementMessage = 'Error: Invalid JSON format for filter'; + this.responseStatementType = 'error'; + return; + } + } + + this._apiService.getStatement(parsedFilterObject,this.selectedAnalysis?.key??'', 10) .pipe( catchError(err => { this.responseStatementMessage = `Error: ${JSON.stringify(err.error, null, 2)}`; diff --git a/src/frontend/src/app/services/api.service.ts b/src/frontend/src/app/services/api.service.ts index b049de2e7ef085896b6e18144e11ba00ab787404..e3b7cd4074bf8aad19bfe5f8f144659cfec8520c 100644 --- a/src/frontend/src/app/services/api.service.ts +++ b/src/frontend/src/app/services/api.service.ts @@ -225,8 +225,8 @@ export class ApiService { }); return this.http.post<string>(`${environment.apiUrl}/api/v1/provider/data`, { + page_size: page_size, ...filter, - page_size: page_size }, { headers }) } diff --git a/tools/local-development/docker-compose.yml b/tools/local-development/docker-compose.yml index b526249c410e6e9fbbad9327234934f838951858..704438c1b18db59788cbfaba81f0802d510edc58 100644 --- a/tools/local-development/docker-compose.yml +++ b/tools/local-development/docker-compose.yml @@ -9,4 +9,5 @@ services: ports: - 27017:27017 volumes: - - ./mongodb_data:/data/db \ No newline at end of file + - ./mongodb_data:/data/db + - ./mongo_dump.archive:/mongo_dump.archive # Mount the archive file