Restored fetch uncacheable checkbox (#429)

kamu-data · Sep 16, 2024 · f9b831a · f9b831a
1 parent e11fa51
commit f9b831a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 ### Fixed
 - Replaced mock initiator for flows tab for account
+- Restored `Fetch uncacheable` checkbox when configuration exists
 
 ## [0.26.3] - 2024-09-13
 ### Fixed

diff --git a/...aset-settings-component/tabs/scheduling/dataset-settings-scheduling-tab.component.spec.ts b/...aset-settings-component/tabs/scheduling/dataset-settings-scheduling-tab.component.spec.ts
@@ -25,6 +25,8 @@ import {
 import { PollingGroupEnum } from "../../dataset-settings.model";
 import _ from "lodash";
 import { TimeDelta, TimeUnit } from "src/app/api/kamu.graphql.interface";
+import { of } from "rxjs";
+import { mockIngestGetDatasetFlowConfigsSuccess } from "src/app/api/mock/dataset-flow.mock";
 
 describe("DatasetSettingsSchedulingTabComponent", () => {
     let component: DatasetSettingsSchedulingTabComponent;
@@ -190,4 +192,30 @@ describe("DatasetSettingsSchedulingTabComponent", () => {
         const errorMessageElem = findElementByDataTestId(fixture, "cronExpression-error");
         expect(errorMessageElem?.textContent?.trim()).toEqual("Invalid expression");
     });
+
+    it("should check init form  with schedule", () => {
+        component.datasetPermissions = _.cloneDeep(mockFullPowerDatasetPermissionsFragment);
+        fixture.detectChanges();
+        emitClickOnElementByDataTestId(fixture, "button-cron-expression");
+        setFieldValue(fixture, "polling-group-cron-expression", MOCK_INVALID_CRON_EXPRESSION);
+        fixture.detectChanges();
+        const errorMessageElem = findElementByDataTestId(fixture, "cronExpression-error");
+        expect(errorMessageElem?.textContent?.trim()).toEqual("Invalid expression");
+    });
+
+    it("should check init form with schedule when configuration is exist", () => {
+        component.datasetPermissions = _.cloneDeep(mockFullPowerDatasetPermissionsFragment);
+        const fetchDatasetFlowConfigsSpy = spyOn(datasetSchedulingService, "fetchDatasetFlowConfigs").and.returnValue(
+            of(mockIngestGetDatasetFlowConfigsSuccess),
+        );
+        component.ngOnInit();
+
+        expect(fetchDatasetFlowConfigsSpy).toHaveBeenCalledTimes(1);
+        expect(component.pollingGroup.value).toEqual({
+            __typename: "TimeDelta",
+            every: 3,
+            unit: TimeUnit.Hours,
+            fetchUncacheable: false,
+        });
+    });
 });
diff --git a/...s/dataset-settings-component/tabs/scheduling/dataset-settings-scheduling-tab.component.ts b/...s/dataset-settings-component/tabs/scheduling/dataset-settings-scheduling-tab.component.ts
@@ -142,13 +142,17 @@ export class DatasetSettingsSchedulingTabComponent extends BaseComponent impleme
 
     private setPollingEveryTimeValidator(): void {
         this.pollingUnitTime.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((data: TimeUnit) => {
-            this.pollingEveryTime.setValidators([this.everyTimeMapperValidators[data], Validators.required]);
+            if (data) {
+                this.pollingEveryTime.setValidators([this.everyTimeMapperValidators[data], Validators.required]);
+            }
         });
     }
 
     private setBatchingEveryTimeValidator(): void {
         this.batchingUnitTime.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((data: TimeUnit) => {
-            this.batchingEveryTime.setValidators([this.everyTimeMapperValidators[data], Validators.required]);
+            if (data) {
+                this.batchingEveryTime.setValidators([this.everyTimeMapperValidators[data], Validators.required]);
+            }
         });
     }
 
@@ -173,6 +177,7 @@ export class DatasetSettingsSchedulingTabComponent extends BaseComponent impleme
                         this.pollingForm.patchValue({ updatesState: !paused });
                         this.pollingGroup.patchValue({
                             ...flowConfiguration.schedule,
+                            fetchUncacheable: flowConfiguration.fetchUncacheable,
                         });
                         if (flowConfiguration.schedule.__typename === "Cron5ComponentExpression") {
                             this.pollingGroup.patchValue({