minor changes

kamu-data · Dec 19, 2024 · 26751c9 · 26751c9
1 parent 7f8f4d5
commit 26751c9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/...-view/additional-components/dataset-settings-component/dataset-settings.component.spec.ts b/...-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/...nents/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.html b/...nents/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.html
@@ -77,13 +77,11 @@ <h2>Danger Zone</h2>
                         </mat-radio-group>
                     </div>
                     <div class="d-flex align-items-center pt-1 ms-2">
-                        <app-tooltip-icon class="mt-1" [tooltip]="RECURSIVE_TOOLTIP" />
-                        <span class="d-inline-block">Recursive:</span>
-                        <input
-                            class="form-check-input recursive-control d-inline-block ms-3"
-                            type="checkbox"
-                            formControlName="recursive"
-                        />
+                        <mat-checkbox formControlName="recursive" color="primary">
+                            <div class="d-flex align-items-center">
+                                Recursive<app-tooltip-icon class="ps-2 pt-1" [tooltip]="RECURSIVE_TOOLTIP" />
+                            </div>
+                        </mat-checkbox>
                     </div>
                 </div>
             </form>

diff --git a/...nents/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.scss b/...nents/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/...ts/dataset-settings-component/tabs/general/dataset-settings-general-tab.component.spec.ts b/...ts/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
@@ -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 {