You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ho...@apache.org on 2026/08/17 10:36:22 UTC

(streampipes) 03/03: frontend changes

This is an automated email from the ASF dual-hosted git repository.

JHoelli pushed a commit to branch 4735-update-rest-endpoints-to-dataset-naming
in repository https://gitbox.apache.org/repos/asf/streampipes.git

commit 4752e10e6f9e9767934fd65e5074f996363ee2fb
Author: Jacqueline Höllig <j....@gmx.net>
AuthorDate: Mon Aug 17 09:45:21 2026 +0000

    frontend changes
---
 .../src/lib/model/dataset/DatasetQueryParameters.ts          |  2 +-
 .../data-download-dialog/services/data-export.service.ts     | 12 ++++++------
 ui/src/app/assets/dialog/base-asset-links.directive.ts       |  6 +++---
 .../components/charts/image/image-widget.component.ts        |  6 +++---
 .../data-settings/chart-data-settings.component.ts           |  8 ++++----
 .../filter-selection-panel.component.ts                      |  6 +++---
 .../adapter-started/adapter-started-dialog.component.ts      |  6 +++---
 .../dataset-details/abstract-dataset-details.directive.ts    |  6 +++---
 .../dataset-details-events.component.ts                      |  2 +-
 .../dataset-details-metrics.component.ts                     |  6 +++---
 .../dataset-feature-card/dataset-feature-card.component.ts   | 10 +++++-----
 .../dataset-overview/dataset-overview.component.ts           |  4 ++--
 .../dialog/csv-import-dialog/csv-import-dialog.component.ts  | 12 ++++++------
 .../data-retention-dialog/data-retention-dialog.component.ts | 10 +++++-----
 .../data-retention-now-dialog.component.ts                   |  6 +++---
 .../dialog/delete-dataset/delete-dataset-dialog.component.ts | 10 +++++-----
 16 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/ui/projects/streampipes/platform-services/src/lib/model/dataset/DatasetQueryParameters.ts b/ui/projects/streampipes/platform-services/src/lib/model/dataset/DatasetQueryParameters.ts
index 6a66899f1c..a5a4f815eb 100644
--- a/ui/projects/streampipes/platform-services/src/lib/model/dataset/DatasetQueryParameters.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/model/dataset/DatasetQueryParameters.ts
@@ -16,7 +16,7 @@
  *
  */
 
-import { MissingValueBehaviour } from './data-lake-query-config.model';
+import { MissingValueBehaviour } from './dataset-query-config.model';
 
 export interface DatasetQueryParameters {
     columns?: string;
diff --git a/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/services/data-export.service.ts b/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/services/data-export.service.ts
index 2faab75280..20232f53af 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/services/data-export.service.ts
+++ b/ui/projects/streampipes/shared-ui/src/lib/dialog/data-download-dialog/services/data-export.service.ts
@@ -19,8 +19,8 @@
 import { EventEmitter, Injectable, inject } from '@angular/core';
 import { ExportConfig } from '../model/export-config.model';
 import {
-    DatalakeQueryParameters,
-    DatalakeRestService,
+    DatasetQueryParameters,
+    DatasetRestService,
     DataViewQueryGeneratorService,
 } from '@streampipes/platform-services';
 import { HttpEventType } from '@angular/common/http';
@@ -32,7 +32,7 @@ import { FileNameService } from './file-name.service';
     providedIn: 'root',
 })
 export class DataExportService {
-    dataLakeRestService = inject(DatalakeRestService);
+    datasetRestService = inject(DatasetRestService);
     dataViewQueryGeneratorService = inject(DataViewQueryGeneratorService);
     fileNameService = inject(FileNameService);
 
@@ -48,7 +48,7 @@ export class DataExportService {
         if (
             exportConfig.dataExportConfig.dataRangeConfiguration === 'visible'
         ) {
-            downloadRequest = this.dataLakeRestService.downloadQueriedData(
+            downloadRequest = this.datasetRestService.downloadQueriedData(
                 exportConfig.dataExportConfig.measurement,
                 exportConfig.formatExportConfig,
                 exportConfig.dataExportConfig.missingValueBehaviour,
@@ -70,7 +70,7 @@ export class DataExportService {
                 endTime =
                     exportConfig.dataExportConfig.dateRange.endDate.getTime();
             }
-            downloadRequest = this.dataLakeRestService.downloadRawData(
+            downloadRequest = this.datasetRestService.downloadRawData(
                 exportConfig.dataExportConfig.measurement,
                 exportConfig.formatExportConfig,
                 exportConfig.dataExportConfig.missingValueBehaviour,
@@ -106,7 +106,7 @@ export class DataExportService {
         exportConfig: ExportConfig,
         dataDownloadDialogModel: DataDownloadDialogModel,
         selectedQueryIndex: number = 0,
-    ): DatalakeQueryParameters {
+    ): DatasetQueryParameters {
         return this.dataViewQueryGeneratorService.generateQuery(
             exportConfig.dataExportConfig.dateRange.startDate.getTime(),
             exportConfig.dataExportConfig.dateRange.endDate.getTime(),
diff --git a/ui/src/app/assets/dialog/base-asset-links.directive.ts b/ui/src/app/assets/dialog/base-asset-links.directive.ts
index ebaab2e9f8..a425f80f35 100644
--- a/ui/src/app/assets/dialog/base-asset-links.directive.ts
+++ b/ui/src/app/assets/dialog/base-asset-links.directive.ts
@@ -21,7 +21,7 @@ import {
     AdapterService,
     ChartService,
     DashboardService,
-    DatalakeRestService,
+    DatasetRestService,
     FileMetadata,
     FilesService,
     GenericStorageService,
@@ -43,7 +43,7 @@ export abstract class BaseAssetLinksDirective {
     protected pipelineService = inject(PipelineService);
     protected chartService = inject(ChartService);
     protected dashboardService = inject(DashboardService);
-    protected dataLakeService = inject(DatalakeRestService);
+    protected datasetRestService = inject(DatasetRestService);
     protected pipelineElementService = inject(PipelineElementService);
     protected adapterService = inject(AdapterService);
     protected filesService = inject(FilesService);
@@ -83,7 +83,7 @@ export abstract class BaseAssetLinksDirective {
                 .getDashboardSummary()
                 .pipe(map(summary => summary.resources)),
             this.pipelineElementService.getDataStreams(),
-            this.dataLakeService
+            this.datasetRestService
                 .getMeasurementSummary()
                 .pipe(map(summary => summary.resources)),
             this.filesService.getFileMetadata(),
diff --git a/ui/src/app/chart-shared/components/charts/image/image-widget.component.ts b/ui/src/app/chart-shared/components/charts/image/image-widget.component.ts
index 7380e9b694..5b92ef3ecc 100644
--- a/ui/src/app/chart-shared/components/charts/image/image-widget.component.ts
+++ b/ui/src/app/chart-shared/components/charts/image/image-widget.component.ts
@@ -21,7 +21,7 @@ import { MatSort } from '@angular/material/sort';
 import { BaseDataExplorerWidgetDirective } from '../base/base-data-explorer-widget.directive';
 import {
     DataExplorerField,
-    DatalakeRestService,
+    DatasetRestService,
     SpQueryResult,
 } from '@streampipes/platform-services';
 import { ImageWidgetModel } from './model/image-widget.model';
@@ -63,12 +63,12 @@ export class ImageWidgetComponent
     imagePreviewHeight;
 
     private securePipe = inject(SecurePipe);
-    private dataLakeRestService = inject(DatalakeRestService);
+    private datasetRestService = inject(DatasetRestService);
 
     ngOnInit(): void {
         super.ngOnInit();
         this.onResize(this.currentWidth, this.currentHeight - 53);
-        this.imageBaseUrl = this.dataLakeRestService.dataLakeUrl + '/images/';
+        this.imageBaseUrl = this.datasetRestService.datasetUrl + '/images/';
     }
 
     refreshView() {}
diff --git a/ui/src/app/chart/components/chart-view/designer-panel/data-settings/chart-data-settings.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/chart-data-settings.component.ts
index 80ae9c2df4..f4c15d400d 100644
--- a/ui/src/app/chart/components/chart-view/designer-panel/data-settings/chart-data-settings.component.ts
+++ b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/chart-data-settings.component.ts
@@ -31,7 +31,7 @@ import {
     DataExplorerWidgetModel,
     DataLakeMeasure,
     DatasetSummaryDto,
-    DatalakeRestService,
+    DatasetRestService,
     SourceConfig,
 } from '@streampipes/platform-services';
 import { Tuple2 } from '../../../../../core-model/base/Tuple2';
@@ -116,7 +116,7 @@ import { TranslatePipe } from '@ngx-translate/core';
     ],
 })
 export class ChartDataSettingsComponent implements OnInit, OnDestroy {
-    private datalakeRestService = inject(DatalakeRestService);
+    private datasetRestService = inject(DatasetRestService);
     private widgetConfigService = inject(ChartConfigurationService);
     private fieldProviderService = inject(ChartFieldProviderService);
     private widgetTypeService = inject(ChartTypeService);
@@ -168,7 +168,7 @@ export class ChartDataSettingsComponent implements OnInit, OnDestroy {
     }
 
     loadPipelinesAndDatasets() {
-        this.datalakeRestService.getMeasurementSummary().subscribe(response => {
+        this.datasetRestService.getMeasurementSummary().subscribe(response => {
             this.availableDatasets = response.resources.sort((a, b) =>
                 a.measureName.localeCompare(b.measureName),
             );
@@ -258,7 +258,7 @@ export class ChartDataSettingsComponent implements OnInit, OnDestroy {
         resetQueryConfig: boolean,
         refreshData: boolean,
     ): void {
-        this.datalakeRestService
+        this.datasetRestService
             .getMeasurementByName(measureName)
             .subscribe(measure =>
                 this.applySelectedMeasurement(
diff --git a/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts
index 7c79ef42e2..76f1ece497 100644
--- a/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts
+++ b/ui/src/app/chart/components/chart-view/designer-panel/data-settings/filter-selection-panel/filter-selection-panel.component.ts
@@ -18,7 +18,7 @@
 
 import { Component, Input, OnInit, inject } from '@angular/core';
 import {
-    DatalakeRestService,
+    DatasetRestService,
     FilterExpressionGroup,
     SelectedFilter,
     SourceConfig,
@@ -62,7 +62,7 @@ import { FilterExpressionPreviewService } from './filter-expression-preview.serv
 export class FilterSelectionPanelComponent implements OnInit {
     private widgetConfigService = inject(ChartConfigurationService);
     private fieldProviderService = inject(ChartFieldProviderService);
-    private dataLakeRestService = inject(DatalakeRestService);
+    private datasetRestService = inject(DatasetRestService);
     private dialogService = inject(DialogService);
     private filterExpressionPreviewService = inject(
         FilterExpressionPreviewService,
@@ -101,7 +101,7 @@ export class FilterSelectionPanelComponent implements OnInit {
                 ),
             )
             .map(f => f.runtimeName);
-        this.dataLakeRestService
+        this.datasetRestService
             .getTagValues(this.sourceConfig.measureName, fields)
             .subscribe(response => {
                 Object.keys(response).forEach(key => {
diff --git a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
index 49084384e2..0c9b78b4c6 100644
--- a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
+++ b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.ts
@@ -31,7 +31,7 @@ import {
     CompactPipeline,
     CompactPipelineElement,
     CompactPipelineService,
-    DatalakeRestService,
+    DatasetRestService,
     ErrorMessage,
     LinkageData,
     Message,
@@ -85,7 +85,7 @@ export class AdapterStartedDialog implements OnInit {
     private pipelineTemplateService = inject(PipelineTemplateService);
     private compactPipelineService = inject(CompactPipelineService);
     private assetSaveService = inject(AssetSaveService);
-    private dataLakeService = inject(DatalakeRestService);
+    private datasetRestService = inject(DatasetRestService);
     private permissionsService = inject(PermissionsService);
 
     adapterInstalled = false;
@@ -443,7 +443,7 @@ export class AdapterStartedDialog implements OnInit {
         });
 
         const res = await lastValueFrom(
-            this.dataLakeService.getMeasurementByName(adapter.name),
+            this.datasetRestService.getMeasurementByName(adapter.name),
         );
 
         linkageData.push({
diff --git a/ui/src/app/dataset/components/dataset-details/abstract-dataset-details.directive.ts b/ui/src/app/dataset/components/dataset-details/abstract-dataset-details.directive.ts
index 3bea3e3b53..290b3dffca 100644
--- a/ui/src/app/dataset/components/dataset-details/abstract-dataset-details.directive.ts
+++ b/ui/src/app/dataset/components/dataset-details/abstract-dataset-details.directive.ts
@@ -20,7 +20,7 @@ import { Directive, inject } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import {
     DataLakeMeasure,
-    DatalakeRestService,
+    DatasetRestService,
 } from '@streampipes/platform-services';
 import { SpBreadcrumbService, SpNavigationItem } from '@streampipes/shared-ui';
 import { catchError, of } from 'rxjs';
@@ -29,7 +29,7 @@ import { SpDatasetDetailsTabs } from './dataset-details-tabs';
 @Directive()
 export abstract class SpAbstractDatasetDetailsDirective {
     protected activatedRoute = inject(ActivatedRoute);
-    protected datalakeRestService = inject(DatalakeRestService);
+    protected datasetRestService = inject(DatasetRestService);
     protected breadcrumbService = inject(SpBreadcrumbService);
 
     currentDatasetId: string;
@@ -47,7 +47,7 @@ export abstract class SpAbstractDatasetDetailsDirective {
     }
 
     loadDataset(): void {
-        this.datalakeRestService
+        this.datasetRestService
             .getMeasurement(this.currentDatasetId)
             .pipe(
                 catchError(() => {
diff --git a/ui/src/app/dataset/components/dataset-details/dataset-details-events/dataset-details-events.component.ts b/ui/src/app/dataset/components/dataset-details/dataset-details-events/dataset-details-events.component.ts
index 62c0ba7212..e43c0fd2d6 100644
--- a/ui/src/app/dataset/components/dataset-details/dataset-details-events/dataset-details-events.component.ts
+++ b/ui/src/app/dataset/components/dataset-details/dataset-details-events/dataset-details-events.component.ts
@@ -102,7 +102,7 @@ export class DatasetDetailsEventsComponent
         }
 
         this.loadingEvents = true;
-        this.datalakeRestService
+        this.datasetRestService
             .getData(this.dataset.measureName, {
                 endDate: new Date().getTime(),
                 startDate: 0,
diff --git a/ui/src/app/dataset/components/dataset-details/dataset-details-metrics/dataset-details-metrics.component.ts b/ui/src/app/dataset/components/dataset-details/dataset-details-metrics/dataset-details-metrics.component.ts
index d5a9e7fc9c..51f84c844b 100644
--- a/ui/src/app/dataset/components/dataset-details/dataset-details-metrics/dataset-details-metrics.component.ts
+++ b/ui/src/app/dataset/components/dataset-details/dataset-details-metrics/dataset-details-metrics.component.ts
@@ -113,13 +113,13 @@ export class DatasetDetailsMetricsComponent
     }
 
     private loadTotalEventCount(): Observable<number> {
-        return this.datalakeRestService
+        return this.datasetRestService
             .getMeasurementEntryCount(this.dataset.elementId)
             .pipe(catchError(() => of(0)));
     }
 
     private loadLatestEventTimestamp(): Observable<number> {
-        return this.datalakeRestService
+        return this.datasetRestService
             .getLatestMeasurementEvents([this.dataset.measureName])
             .pipe(
                 map(result => result[this.dataset.measureName] ?? 0),
@@ -136,7 +136,7 @@ export class DatasetDetailsMetricsComponent
             return of(dayBuckets);
         }
 
-        return this.datalakeRestService
+        return this.datasetRestService
             .getData(this.dataset.measureName, {
                 endDate: now.getTime(),
                 startDate: dayBuckets[0].timestamp,
diff --git a/ui/src/app/dataset/components/dataset-feature-card/dataset-feature-card.component.ts b/ui/src/app/dataset/components/dataset-feature-card/dataset-feature-card.component.ts
index 84adc59302..b591ef21f7 100644
--- a/ui/src/app/dataset/components/dataset-feature-card/dataset-feature-card.component.ts
+++ b/ui/src/app/dataset/components/dataset-feature-card/dataset-feature-card.component.ts
@@ -30,7 +30,7 @@ import {
     AssetConstants,
     AssetLinkType,
     DataLakeMeasure,
-    DatalakeRestService,
+    DatasetRestService,
     EventPropertyUnion,
     GenericStorageService,
     SpQueryResult,
@@ -75,14 +75,14 @@ export class DatasetFeatureCardComponent implements OnInit {
     totalEventCount: number | undefined;
     previewRows: PreviewRow[] = [];
 
-    private datalakeRestService = inject(DatalakeRestService);
+    private datasetRestService = inject(DatasetRestService);
     private genericStorageService = inject(GenericStorageService);
     private dateFormatService = inject(DateFormatService);
     private router = inject(Router);
 
     ngOnInit() {
         forkJoin([
-            this.datalakeRestService.getMeasurement(this.resourceId),
+            this.datasetRestService.getMeasurement(this.resourceId),
             this.genericStorageService.getAllDocuments(
                 AssetConstants.ASSET_LINK_TYPES_DOC_NAME,
             ),
@@ -95,7 +95,7 @@ export class DatasetFeatureCardComponent implements OnInit {
 
     loadSampleData(): void {
         forkJoin({
-            dataPreview: this.datalakeRestService
+            dataPreview: this.datasetRestService
                 .getData(this.dataset.measureName, {
                     endDate: new Date().getTime(),
                     startDate: 0,
@@ -128,7 +128,7 @@ export class DatasetFeatureCardComponent implements OnInit {
     }
 
     private loadTotalEventCount(): Observable<number> {
-        return this.datalakeRestService
+        return this.datasetRestService
             .getMeasurementEntryCount(this.dataset.elementId)
             .pipe(catchError(() => of(0)));
     }
diff --git a/ui/src/app/dataset/components/dataset-overview/dataset-overview.component.ts b/ui/src/app/dataset/components/dataset-overview/dataset-overview.component.ts
index 5bcd213e70..35a65996f4 100644
--- a/ui/src/app/dataset/components/dataset-overview/dataset-overview.component.ts
+++ b/ui/src/app/dataset/components/dataset-overview/dataset-overview.component.ts
@@ -40,7 +40,7 @@ import {
 } from '@angular/material/table';
 import { DatasetOverviewEntry } from './dataset-overview-entry';
 import {
-    DatalakeRestService,
+    DatasetRestService,
     DataLakeMeasure,
     DatasetSummaryDto,
     ExportProviderService,
@@ -138,7 +138,7 @@ export class DatasetOverviewComponent
     @ViewChild(SpTableComponent)
     spTable!: SpTableComponent<DatasetOverviewEntry>;
 
-    private datasetRestService = inject(DatalakeRestService);
+    private datasetRestService = inject(DatasetRestService);
     private dialogService = inject(DialogService);
     private breadcrumbService = inject(SpBreadcrumbService);
     private exportProviderRestService = inject(ExportProviderService);
diff --git a/ui/src/app/dataset/dialog/csv-import-dialog/csv-import-dialog.component.ts b/ui/src/app/dataset/dialog/csv-import-dialog/csv-import-dialog.component.ts
index 16593e169e..3e24055800 100644
--- a/ui/src/app/dataset/dialog/csv-import-dialog/csv-import-dialog.component.ts
+++ b/ui/src/app/dataset/dialog/csv-import-dialog/csv-import-dialog.component.ts
@@ -55,7 +55,7 @@ import {
     CsvImportValidationMessage,
     CsvRuntimeType,
     DataType,
-    DatalakeRestService,
+    DatasetRestService,
     EventPropertyPrimitive,
     SemanticType,
 } from '@streampipes/platform-services';
@@ -103,7 +103,7 @@ export class CsvImportDialogComponent {
 
     private readonly fb = inject(FormBuilder);
     private readonly dialogRef = inject(DialogRef<CsvImportDialogComponent>);
-    private readonly datalakeRestService = inject(DatalakeRestService);
+    private readonly datasetRestService = inject(DatasetRestService);
     private readonly destroyRef = inject(DestroyRef);
     private readonly translateService = inject(TranslateService);
 
@@ -375,7 +375,7 @@ export class CsvImportDialogComponent {
         this.previewLoading.set(true);
         const useMultipartUpload = !!this.selectedFile() && !this.uploadId();
 
-        this.datalakeRestService
+        this.datasetRestService
             .previewImport(
                 this.buildPreviewRequest(this.currentTarget()),
                 useMultipartUpload ? this.selectedFile() : undefined,
@@ -489,7 +489,7 @@ export class CsvImportDialogComponent {
         this.importLoading.set(true);
         this.importProcessedRows.set(0);
         this.importTotalRows.set(this.previewResult()?.totalRows ?? 0);
-        this.datalakeRestService
+        this.datasetRestService
             .importCsvData(this.buildImportRequest())
             .subscribe({
                 next: result => {
@@ -699,7 +699,7 @@ export class CsvImportDialogComponent {
         this.importPollingSubscription = timer(0, 1000)
             .pipe(
                 switchMap(() =>
-                    this.datalakeRestService.getCsvImportJobStatus(jobId),
+                    this.datasetRestService.getCsvImportJobStatus(jobId),
                 ),
             )
             .subscribe({
@@ -780,7 +780,7 @@ export class CsvImportDialogComponent {
             return;
         }
 
-        this.datalakeRestService.validateImportSchema(request).subscribe({
+        this.datasetRestService.validateImportSchema(request).subscribe({
             next: result => {
                 this.schemaValidationResult.set(result);
             },
diff --git a/ui/src/app/dataset/dialog/data-retention-dialog/data-retention-dialog.component.ts b/ui/src/app/dataset/dialog/data-retention-dialog/data-retention-dialog.component.ts
index abae5303a5..54f492b96e 100644
--- a/ui/src/app/dataset/dialog/data-retention-dialog/data-retention-dialog.component.ts
+++ b/ui/src/app/dataset/dialog/data-retention-dialog/data-retention-dialog.component.ts
@@ -20,7 +20,7 @@ import { Component, inject, Input, OnInit } from '@angular/core';
 import { DialogRef, DialogService, PanelType } from '@streampipes/shared-ui';
 import { DataRetentionDialogModel } from './model/data-retention-dialog.model';
 import {
-    DatalakeRestService,
+    DatasetRestService,
     ExportProviderSettings,
     RetentionTimeConfig,
 } from '@streampipes/platform-services';
@@ -60,10 +60,10 @@ export class DataRetentionDialogComponent implements OnInit {
     dialogRef = inject(DialogRef<DataRetentionDialogComponent>);
     translateService = inject(TranslateService);
     dialogService = inject(DialogService);
-    datalakeRestService = inject(DatalakeRestService);
+    datasetRestService = inject(DatasetRestService);
 
     ngOnInit() {
-        this.datalakeRestService
+        this.datasetRestService
             .getMeasurement(this.measurementIndex)
             .subscribe({
                 next: measure => {
@@ -107,7 +107,7 @@ export class DataRetentionDialogComponent implements OnInit {
     }
 
     setCleanUp() {
-        this.datalakeRestService
+        this.datasetRestService
             .cleanup(this.measurementIndex, this.retentionConfig)
             .subscribe({
                 next: _data => {
@@ -120,7 +120,7 @@ export class DataRetentionDialogComponent implements OnInit {
     }
 
     deleteCleanUp() {
-        this.datalakeRestService
+        this.datasetRestService
             .deleteCleanup(this.measurementIndex)
             .subscribe(_data => {
                 this.close(true);
diff --git a/ui/src/app/dataset/dialog/data-retention-now-dialog/data-retention-now-dialog.component.ts b/ui/src/app/dataset/dialog/data-retention-now-dialog/data-retention-now-dialog.component.ts
index 20b1500e0e..19d04b918e 100644
--- a/ui/src/app/dataset/dialog/data-retention-now-dialog/data-retention-now-dialog.component.ts
+++ b/ui/src/app/dataset/dialog/data-retention-now-dialog/data-retention-now-dialog.component.ts
@@ -22,7 +22,7 @@ import {
     SpExceptionDetailsComponent,
     SpSpinnerComponent,
 } from '@streampipes/shared-ui';
-import { DatalakeRestService } from '@streampipes/platform-services';
+import { DatasetRestService } from '@streampipes/platform-services';
 import { TranslatePipe, TranslateService } from '@ngx-translate/core';
 import { finalize } from 'rxjs';
 import {
@@ -49,7 +49,7 @@ export class DataRetentionNowDialogComponent implements OnInit {
     @Input()
     measurementIndex: string;
 
-    datalakeRestService = inject(DatalakeRestService);
+    datasetRestService = inject(DatasetRestService);
     private dialogRef = inject(DialogRef<DataRetentionNowDialogComponent>);
     private translateService = inject(TranslateService);
 
@@ -64,7 +64,7 @@ export class DataRetentionNowDialogComponent implements OnInit {
         this.isInProgress = true;
         this.isError = false;
 
-        this.datalakeRestService
+        this.datasetRestService
             .runCleanupNow(this.measurementIndex)
             .pipe(finalize(() => (this.isInProgress = false)))
             .subscribe(
diff --git a/ui/src/app/dataset/dialog/delete-dataset/delete-dataset-dialog.component.ts b/ui/src/app/dataset/dialog/delete-dataset/delete-dataset-dialog.component.ts
index afd60219ee..5c921a3472 100644
--- a/ui/src/app/dataset/dialog/delete-dataset/delete-dataset-dialog.component.ts
+++ b/ui/src/app/dataset/dialog/delete-dataset/delete-dataset-dialog.component.ts
@@ -18,7 +18,7 @@
 
 import { Component, inject, Input, OnInit } from '@angular/core';
 import { DialogRef, SpSpinnerComponent } from '@streampipes/shared-ui';
-import { DatalakeRestService } from '@streampipes/platform-services';
+import { DatasetRestService } from '@streampipes/platform-services';
 import { TranslatePipe, TranslateService } from '@ngx-translate/core';
 import {
     FlexDirective,
@@ -52,7 +52,7 @@ export class DeleteDatasetDialogComponent implements OnInit {
     currentStatus: any;
 
     private dialogRef = inject(DialogRef<DeleteDatasetDialogComponent>);
-    private datalakeRestService = inject(DatalakeRestService);
+    private datasetRestService = inject(DatasetRestService);
     private translateService = inject(TranslateService);
 
     confirmDeleteMessage = '';
@@ -77,7 +77,7 @@ export class DeleteDatasetDialogComponent implements OnInit {
         this.isInProgress = true;
         this.currentStatus =
             this.translateService.instant('Truncating data...');
-        this.datalakeRestService
+        this.datasetRestService
             .removeData(this.datasetName)
             .subscribe(_data => {
                 this.close(true);
@@ -88,8 +88,8 @@ export class DeleteDatasetDialogComponent implements OnInit {
         this.isInProgress = true;
         this.currentStatus = this.translateService.instant('Deleting data...');
 
-        // this.datalakeRestService.dropSingleMeasurementSeries(measurmentIndex);
-        this.datalakeRestService
+        // this.datasetRestService.dropSingleMeasurementSeries(measurmentIndex);
+        this.datasetRestService
             .dropSingleMeasurementSeries(this.datasetName)
             .subscribe(_data => {
                 this.close(true);