Improve stuff

PhilippMDoerner · Dec 12, 2024 · 72e1134 · 72e1134
1 parent 007cb32
commit 72e1134
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 21 deletions.
diff --git a/src/app/_models/formly.ts b/src/app/_models/formly.ts
@@ -53,6 +53,8 @@ export interface FormlyInputConfig<T> extends FormlyInterface<T> {
   placeholder?: string;
   maxLength?: number;
   minLength?: number;
+  max?: number;
+  min?: number;
   parsers?: any;
   inputKind: InputKind;
 }

diff --git a/src/app/_services/formly/formly-service.service.ts b/src/app/_services/formly/formly-service.service.ts
@@ -82,7 +82,7 @@ export class FormlyService {
         warningMessage: config.warningMessage,
         additionalProperties: {
           disabledExpression: config.disabledExpression,
-          tooltipMessage: config.tooltipMessage ?? 'WHAT',
+          tooltipMessage: config.tooltipMessage ?? '',
           showWrapperLabel: config.showWrapperLabel ?? true,
         },
       },
@@ -165,7 +165,9 @@ export class FormlyService {
       parsers: config.parsers,
       props: {
         maxLength: config.maxLength,
+        max: config.max,
         minLength: config.minLength,
+        min: config.min,
         label: config.label ?? capitalize(`${config.key}`),
         type: innerInputType,
         required: config.required ?? true,

diff --git a/src/app/campaign/components/graph-help-modal/graph-help-modal.component.html b/src/app/campaign/components/graph-help-modal/graph-help-modal.component.html
@@ -1,11 +1,12 @@
 <button
+  btn
   aria-label="shows modal explaining graph data"
   class="rounded-pill"
+  [kind]="'NONE'"
+  [icon]="'info-circle'"
+  [text]="'Help'"
   (click)="openModal(infoModal)"
->
-  Help
-  <app-icon [icon]="'info-circle'"></app-icon>
-</button>
+></button>
 
 <ng-template #infoModal let-modal>
   <div class="modal-header">

diff --git a/src/app/campaign/components/graph-help-modal/graph-help-modal.component.ts b/src/app/campaign/components/graph-help-modal/graph-help-modal.component.ts
@@ -5,6 +5,7 @@ import {
   TemplateRef,
 } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { ButtonComponent } from 'src/design/atoms/button/button.component';
 import { IconComponent } from '../../../../design/atoms/icon/icon.component';
 import { SeparatorComponent } from '../../../../design/atoms/separator/separator.component';
 
@@ -79,7 +80,7 @@ const GRAPH_INTERACTIONS = [
 @Component({
   selector: 'app-graph-help-modal',
   standalone: true,
-  imports: [IconComponent, SeparatorComponent],
+  imports: [IconComponent, SeparatorComponent, ButtonComponent],
   templateUrl: './graph-help-modal.component.html',
   styleUrl: './graph-help-modal.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,

diff --git a/src/app/campaign/components/graph-settings-modal/graph-settings-modal.component.ts b/src/app/campaign/components/graph-settings-modal/graph-settings-modal.component.ts
@@ -35,30 +35,20 @@ export class GraphSettingsModalComponent {
     this.formlyService.buildInputConfig<typeof GRAPH_SETTINGS>({
       key: 'linkAttractingForce',
       inputKind: 'NUMBER_FRACTION',
-      label: 'Strength of links pulling nodes together',
+      label: 'Strength of links pulling nodes together (0-3)',
+      max: 3,
+      min: 0,
     }),
     this.formlyService.buildInputConfig<typeof GRAPH_SETTINGS>({
       key: 'nodeRepellingForce',
       inputKind: 'NUMBER_FRACTION',
       label: 'Strength of nodes repelling each other',
     }),
-    this.formlyService.buildInputConfig<typeof GRAPH_SETTINGS>({
-      key: 'xForce',
-      inputKind: 'NUMBER_FRACTION',
-      label: 'Horizontal force',
-    }),
-    this.formlyService.buildInputConfig<typeof GRAPH_SETTINGS>({
-      key: 'yForce',
-      inputKind: 'NUMBER_FRACTION',
-      label: 'Vertical force',
-    }),
   ]);
 
   onSettingsSubmit(model: any) {
     const newSettings: typeof GRAPH_SETTINGS = {
       ...model,
-      xForce: parseFloat(model.xForce),
-      yForce: parseFloat(model.yForce),
       linkAttractingForce: parseFloat(model.linkAttractingForce),
       nodeRepellingForce: parseFloat(model.nodeRepellingForce),
     };

diff --git a/src/design/organisms/graph/graph.service.ts b/src/design/organisms/graph/graph.service.ts
@@ -270,8 +270,8 @@ export class GraphService {
         'charge',
         forceManyBody().strength(-1 * settings.nodeRepellingForce),
       )
-      .force('x', forceX().strength(settings.undirectedForce))
-      .force('y', forceY().strength(settings.undirectedForce))
+      .force('x', forceX(settings.width / 2).strength(settings.undirectedForce))
+      .force('y', forceY(height / 2).strength(settings.undirectedForce))
       .force('center', forceCenter(settings.width / 2, height / 2));
     addDragBehavior(allNodesElement, simulation);