From 26751c9d590fe3393f2bdc314c6ee6f645f7b1e4 Mon Sep 17 00:00:00 2001 From: Dmitriy Borzenko Date: Thu, 19 Dec 2024 19:10:00 +0200 Subject: [PATCH] minor changes --- .../dataset-settings.component.spec.ts | 4 ++++ .../dataset-settings-general-tab.component.html | 12 +++++------- .../dataset-settings-general-tab.component.scss | 4 ++++ .../dataset-settings-general-tab.component.spec.ts | 5 ++++- .../overview-component/overview.component.ts | 2 +- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/app/dataset-view/additional-components/dataset-settings-component/dataset-settings.component.spec.ts b/src/app/dataset-view/additional-components/dataset-settings-component/dataset-settings.component.spec.ts index 3bfdd966..cc3a4992 100644 --- a/src/app/dataset-view/additional-components/dataset-settings-component/dataset-settings.component.spec.ts +++ b/src/app/dataset-view/additional-components/dataset-settings-component/dataset-settings.component.spec.ts @@ -25,6 +25,8 @@ import { mockMetadataRootUpdate, mockOverviewDataUpdate } from "../data-tabs.moc import { TooltipIconComponent } from "src/app/dataset-block/metadata-block/components/tooltip-icon/tooltip-icon.component"; import { NgbTooltipModule } from "@ng-bootstrap/ng-bootstrap"; import { SharedModule } from "src/app/shared/shared/shared.module"; +import { MatCheckboxModule } from "@angular/material/checkbox"; +import { BatchingTriggerModule } from "./tabs/scheduling/batching-trigger-form/batching-trigger.module"; describe("DatasetSettingsComponent", () => { let component: DatasetSettingsComponent; @@ -77,6 +79,8 @@ describe("DatasetSettingsComponent", () => { MatIconModule, NgbTooltipModule, SharedModule, + MatCheckboxModule, + BatchingTriggerModule, ], }) .overrideComponent(DatasetSettingsComponent, { diff --git a/src/app/dataset-view/additional-components/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.html b/src/app/dataset-view/additional-components/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.html index a0ab093f..15acabda 100644 --- a/src/app/dataset-view/additional-components/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.html +++ b/src/app/dataset-view/additional-components/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.html @@ -77,13 +77,11 @@

Danger Zone

- - Recursive: - + +
+ Recursive +
+
diff --git a/src/app/dataset-view/additional-components/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.scss b/src/app/dataset-view/additional-components/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.scss index c6d1c967..d9721ba1 100644 --- a/src/app/dataset-view/additional-components/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.scss +++ b/src/app/dataset-view/additional-components/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.scss @@ -7,6 +7,10 @@ --mat-radio-ripple-color: transparent; } + .mdc-checkbox__ripple { + display: none; + } + .mat-mdc-radio-label { white-space: normal; } diff --git a/src/app/dataset-view/additional-components/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.spec.ts b/src/app/dataset-view/additional-components/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.spec.ts index 3ef3add4..2e242405 100644 --- a/src/app/dataset-view/additional-components/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.spec.ts +++ b/src/app/dataset-view/additional-components/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.spec.ts @@ -6,7 +6,7 @@ import { DatasetSettingsGeneralTabComponent } from "./dataset-settings-general-t import { DatasetSettingsService } from "../../services/dataset-settings.service"; import { ModalService } from "../../../../../components/modal/modal.service"; import { ApolloModule } from "apollo-angular"; -import { FormBuilder, ReactiveFormsModule } from "@angular/forms"; +import { FormBuilder, FormsModule, ReactiveFormsModule } from "@angular/forms"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { MatDividerModule } from "@angular/material/divider"; import { MatIconModule } from "@angular/material/icon"; @@ -33,6 +33,7 @@ import { DatasetResetMode } from "./dataset-settings-general-tab.types"; import AppValues from "src/app/common/app.values"; import { DatasetFlowsService } from "../../../flows-component/services/dataset-flows.service"; import { DatasetService } from "../../../../dataset.service"; +import { MatCheckboxModule } from "@angular/material/checkbox"; describe("DatasetSettingsGeneralTabComponent", () => { let component: DatasetSettingsGeneralTabComponent; @@ -59,6 +60,8 @@ describe("DatasetSettingsGeneralTabComponent", () => { MatRadioModule, MatIconModule, NgbTooltipModule, + MatCheckboxModule, + FormsModule, ], providers: [FormBuilder], }).compileComponents(); diff --git a/src/app/dataset-view/additional-components/overview-component/overview.component.ts b/src/app/dataset-view/additional-components/overview-component/overview.component.ts index 18ef4ca5..3da70ceb 100644 --- a/src/app/dataset-view/additional-components/overview-component/overview.component.ts +++ b/src/app/dataset-view/additional-components/overview-component/overview.component.ts @@ -224,7 +224,7 @@ export class OverviewComponent extends BaseComponent implements OnInit { } public get visibleUpdateButton(): boolean { - return this.isUserLogged && this.enableScheduling; + return this.isUserLogged && this.enableScheduling && this.canSchedule; } public get hasSetPollingSource(): boolean {