Old validation package replaced by the new one

eManPrague · May 2, 2021 · a6c711e · a6c711e
1 parent 013866b
commit a6c711e
Show file tree

Hide file tree

Showing 38 changed files with 324 additions and 1,230 deletions.
diff --git a/lerna-bootstrap-fix.cmd b/lerna-bootstrap-fix.cmd
@@ -10,7 +10,6 @@ call yarn lerna bootstrap [email protected]/helpers --force-local
 call yarn lerna bootstrap --scope=@frui.ts/htmlcontrols --force-local
 call yarn lerna bootstrap --scope=@frui.ts/screens --force-local
 call yarn lerna bootstrap --scope=@frui.ts/validation --force-local
-call yarn lerna bootstrap --scope=@frui.ts/validation2 --force-local
 call yarn lerna bootstrap --scope=@frui.ts/views --force-local
 call yarn lerna bootstrap --scope=@frui.ts/example-complexdemo --force-local
 call yarn lerna bootstrap --scope=@frui.ts/examples-simpletodolist --force-local

diff --git a/packages/datascreens/src/filteredListViewModel.ts b/packages/datascreens/src/filteredListViewModel.ts
@@ -3,11 +3,11 @@ import { IPagingFilter, SortingDirection } from "@frui.ts/data";
 import { attachAutomaticDirtyWatcher, IHasDirtyWatcher, resetDirty } from "@frui.ts/dirtycheck";
 import { bound } from "@frui.ts/helpers";
 import { ScreenBase } from "@frui.ts/screens";
-import { IHasValidation, validate } from "@frui.ts/validation";
 import { action, isObservableArray, observable } from "mobx";
 import ListViewModel from "./listViewModel";
+import { validate } from "@frui.ts/validation";
 
-type OmitValidationAndDirtyWatcher<T> = Omit<T, keyof IHasDirtyWatcher<T> | keyof IHasValidation<T>>;
+type OmitValidationAndDirtyWatcher<T> = Omit<T, keyof IHasDirtyWatcher<T>>;
 
 export default abstract class FilteredListViewModel<
   TEntity,
@@ -17,7 +17,7 @@ export default abstract class FilteredListViewModel<
   static defaultPageSize = 30;
 
   /** Currently edited filter */
-  @observable filter: TFilter & IHasDirtyWatcher<TFilter> & Partial<IHasValidation<TFilter>>;
+  @observable filter: TFilter & IHasDirtyWatcher<TFilter>;
   /** Currently edited paging filter */
   @observable pagingFilter: IPagingFilter;
 
@@ -46,7 +46,7 @@ export default abstract class FilteredListViewModel<
   }
 
   protected cloneFilterForApply(filter: TFilter): OmitValidationAndDirtyWatcher<TFilter> {
-    const { __dirtycheck, __validation, ...clonedFilter } = this.filter;
+    const { __dirtycheck, ...clonedFilter } = this.filter;
 
     // we need to clone array properties so that they are not shared with the original filter
     Object.entries(clonedFilter).forEach(([key, value]) => {

diff --git a/packages/validation/README.md b/packages/validation/README.md
diff --git a/..._tests__/aggregateEntityValidator.test.ts → ..._tests__/aggregateEntityValidator.test.ts b/..._tests__/aggregateEntityValidator.test.ts → ..._tests__/aggregateEntityValidator.test.ts