Streamlines function names in form-store. FormProps are now save in form-store. Disabled prop introduced into FormProps.

DovydasNavickas · DovydasNavickas · commit 423d3ffadd67 · 2017-05-02T13:17:17.000+03:00
diff --git a/packages/simplr-forms-core/src/abstractions/base-container.ts b/packages/simplr-forms-core/src/abstractions/base-container.ts
@@ -2,7 +2,7 @@ import * as React from "react";
 import * as PropTypes from "prop-types";
 
 import { FormStore } from "../stores/form-store";
-import { StateUpdated } from "../actions/form-store";
+import { StateChanged } from "../actions/form-store";
 import { FSHContainer } from "../stores/form-stores-handler";
 
 export interface BaseContainerProps {
@@ -48,7 +48,7 @@ export abstract class BaseContainer<TProps extends BaseContainerProps, TState> e
             throw new Error(`simplr-forms-core: Container is already in a Form '${this.context.FormId}' context, ${but}.`);
         }
 
-        this.FormStore.addListener(StateUpdated, this.OnStoreUpdated.bind(this));
+        this.FormStore.addListener(StateChanged, this.OnStoreUpdated.bind(this));
     }
 
     protected abstract OnStoreUpdated(): void;
diff --git a/packages/simplr-forms-core/src/abstractions/base-form.ts b/packages/simplr-forms-core/src/abstractions/base-form.ts
@@ -19,12 +19,14 @@ export abstract class BaseForm<TProps extends FormContracts.FormProps, TState> e
     }
 
     static defaultProps: FormContracts.FormProps = {
-        destroyOnUnmount: true
+        destroyOnUnmount: true,
+        disabled: false
     };
 
     constructor(props: FormContracts.FormProps) {
         super();
         this.registerForm(props);
+        this.FormStore.UpdateFormProps(props);
     }
 
     protected get FormStoresHandler(): FormStoresHandler {
@@ -53,7 +55,7 @@ export abstract class BaseForm<TProps extends FormContracts.FormProps, TState> e
     /*
      * Local helpers
      */
-    private registerForm(props: FormContracts.FormProps) {
+    private registerForm(props: FormContracts.FormProps): void {
         if (props.formId == null) {
             if (!props.destroyOnUnmount) {
                 throw new Error("simplr-forms-core: destroyOnUnmount cannot be falsy when formId is not set.");
diff --git a/packages/simplr-forms-core/src/abstractions/core-field.ts b/packages/simplr-forms-core/src/abstractions/core-field.ts
@@ -82,8 +82,8 @@ export abstract class CoreField<TProps extends CoreFieldProps, TState extends Co
             throw new Error("simplr-forms-core: Field must be used inside a Form component.");
         }
         this.StoreEventSubscription =
-            this.FormStore.addListener<FormStoreActions.StateUpdated>(
-                FormStoreActions.StateUpdated,
+            this.FormStore.addListener<FormStoreActions.StateChanged>(
+                FormStoreActions.StateChanged,
                 this.OnStoreUpdated.bind(this));
         this.registerFieldInFormStore();
     }
@@ -94,7 +94,7 @@ export abstract class CoreField<TProps extends CoreFieldProps, TState extends Co
             throw new Error(`simplr-forms-core: Field name must be constant`);
         }
 
-        this.FormStore.UpdateProps(this.FieldId, nextProps);
+        this.FormStore.UpdateFieldProps(this.FieldId, nextProps);
     }
 
     componentWillUnmount() {
@@ -133,9 +133,12 @@ export abstract class CoreField<TProps extends CoreFieldProps, TState extends Co
         return this.RawDefaultValue;
     }
 
-    protected ProcessValueBeforeStore(value: FieldValue) {
+    protected ProcessValueBeforeStore(value: FieldValue): FieldValue {
         // Parse and normalize value
-        return this.NormalizeValue(this.ParseValue(value));
+        if (value != null) {
+            return this.NormalizeValue(this.ParseValue(value));
+        }
+        return value;
     }
 
     protected ProcessValueFromStore(value: FieldValue) {
@@ -212,7 +215,7 @@ export abstract class CoreField<TProps extends CoreFieldProps, TState extends Co
             newValue = this.ProcessValueBeforeStore(newValue);
         }
 
-        this.FormStore.ValueChanged(this.FieldId, newValue);
+        this.FormStore.UpdateFieldValue(this.FieldId, newValue);
     }
 
     /**
diff --git a/packages/simplr-forms-core/src/actions/form-store.ts b/packages/simplr-forms-core/src/actions/form-store.ts
@@ -1,6 +1,6 @@
 import { FieldValue } from "../contracts/field";
 
-export class StateUpdated { }
+export class StateChanged { }
 
 export class FieldRegistered {
     constructor(private fieldId: string, private initialValue: FieldValue) { }
@@ -26,10 +26,12 @@ export class ValueChanged {
     }
 }
 
-export class PropsChanged {
+export class FieldPropsChanged {
     constructor(private fieldId: string) { }
 
     public get FieldId() {
         return this.fieldId;
     }
 }
+
+export class FormPropsChanged { }
diff --git a/packages/simplr-forms-core/src/contracts/form-store.ts b/packages/simplr-forms-core/src/contracts/form-store.ts
@@ -3,12 +3,13 @@ import { TypedRecord } from "typed-immutable-record";
 
 import { FieldStateRecord } from "../contracts/field";
 import { FieldsGroupStoreState } from "../contracts/fields-group";
-import { FormStateRecord } from "../contracts/form";
+import { FormStateRecord, FormPropsRecord } from "../contracts/form";
 
 export interface FormStoreState {
     Fields: Immutable.Map<string, FieldStateRecord>;
     FieldsGroups: Immutable.Map<string, FieldsGroupStoreState>;
     Form: FormStateRecord;
+    FormProps: FormPropsRecord;
 }
 
 export interface FormStoreStateRecord extends TypedRecord<FormStoreStateRecord>, FormStoreState { }
diff --git a/packages/simplr-forms-core/src/contracts/form.ts b/packages/simplr-forms-core/src/contracts/form.ts
@@ -8,8 +8,11 @@ export interface FormProps {
     formStore?: FormStore;
     destroyOnUnmount?: boolean;
     forceSubmit?: boolean;
+    disabled?: boolean;
 }
 
+export interface FormPropsRecord extends TypedRecord<FormPropsRecord>, FormProps { }
+
 export interface FormChildContext {
     FormId: string;
 }
diff --git a/packages/simplr-forms-core/src/modifiers/currency.ts b/packages/simplr-forms-core/src/modifiers/currency.ts
@@ -17,7 +17,6 @@ export class CurrencyModifier extends BaseModifier<CurrencyProps, {}> {
     }
     Parse(value: FieldValue): FieldValue {
         if (value === this.emptyFormattedValue) {
-            console.log(`Parser got an emptyFormattedValue.`);
             return 0;
         }
         if (ValueOfType<string>(value, CurrencyModifier.name, "string")) {
diff --git a/packages/simplr-forms-core/src/stores/form-store.ts b/packages/simplr-forms-core/src/stores/form-store.ts
@@ -13,7 +13,9 @@ import {
 } from "../contracts/field";
 import {
     FormState,
-    FormStateRecord
+    FormStateRecord,
+    FormProps,
+    FormPropsRecord
 } from "../contracts/form";
 import {
     FormStoreState,
@@ -40,7 +42,7 @@ export class FormStore extends ActionEmitter {
     }
     protected set State(newState: FormStoreStateRecord) {
         this.state = newState;
-        this.emit(new Actions.StateUpdated());
+        this.emit(new Actions.StateChanged());
     }
 
     public GetState(): FormStoreStateRecord {
@@ -141,15 +143,22 @@ export class FormStore extends ActionEmitter {
         return this.State.Fields.get(fieldId);
     }
 
-    public SetSubmitCallback(submitCallback: () => void): void {
+    public SetFormSubmitCallback(submitCallback: () => void): void {
         this.State = this.State.withMutations(state => {
             state.Form = state.Form.merge({
                 SubmitCallback: submitCallback
             } as FormState);
         });
     }
 
-    public UpdateProps(fieldId: string, props: FieldStateProps): void {
+    public UpdateFormProps(props: FormProps): void {
+        this.State = this.State.withMutations(state => {
+            state.FormProps = recordify<FormProps, FormPropsRecord>(props);
+            this.emit(new Actions.FormPropsChanged());
+        });
+    }
+
+    public UpdateFieldProps(fieldId: string, props: FieldStateProps): void {
         const propsRecord = recordify<FieldStateProps, FieldStatePropsRecord>(props);
         const fieldState = this.State.Fields.get(fieldId);
 
@@ -164,10 +173,10 @@ export class FormStore extends ActionEmitter {
             } as FieldState));
         });
 
-        this.emit(new Actions.PropsChanged(fieldId));
+        this.emit(new Actions.FieldPropsChanged(fieldId));
     }
 
-    public ValueChanged(fieldId: string, newValue: FieldValue): void {
+    public UpdateFieldValue(fieldId: string, newValue: FieldValue): void {
         this.State = this.State.withMutations(state => {
             const fieldState = state.Fields.get(fieldId);
             state.Fields = state.Fields.set(fieldId, fieldState.merge({
@@ -178,7 +187,7 @@ export class FormStore extends ActionEmitter {
         this.emit(new Actions.ValueChanged(fieldId, newValue));
     }
 
-    public async Validate(fieldId: string, validationPromise: Promise<never>): Promise<void> {
+    public async ValidateiField(fieldId: string, validationPromise: Promise<never>): Promise<void> {
         const field = this.State.Fields.get(fieldId);
         const fieldValue = field.Value;
 
@@ -237,14 +246,14 @@ export class FormStore extends ActionEmitter {
         }
     }
 
-    public InitiateSubmit(): void {
+    public InitiateFormSubmit(): void {
         if (this.State.Form.SubmitCallback == null) {
             throw new Error("simplr-forms-core: Submit method is called before SubmitCallback is set.");
         }
         this.State.Form.SubmitCallback();
     }
 
-    public async Submit(result: Promise<void> | FormError | any): Promise<void> {
+    public async SubmitForm(result: Promise<void> | FormError | any): Promise<void> {
         let promise: Promise<void>;
         if (this.IsPromise<void>(result)) {
             promise = result;
@@ -356,7 +365,8 @@ export class FormStore extends ActionEmitter {
         return recordify<FormStoreState, FormStoreStateRecord>({
             Fields: Immutable.Map<string, FieldStateRecord>(),
             FieldsGroups: Immutable.Map<string, FieldsGroupStateRecord>(),
-            Form: recordify<FormState, FormStateRecord>(this.GetInitialFormState())
+            Form: recordify<FormState, FormStateRecord>(this.GetInitialFormState()),
+            FormProps: recordify<FormProps, FormPropsRecord>({})
         });
     }
 
diff --git a/packages/simplr-forms-core/src/utils/value-helpers.ts b/packages/simplr-forms-core/src/utils/value-helpers.ts
@@ -41,6 +41,10 @@ export function ProcessValue<TProcessor, TProcessedResult>(
 
 export function IsComponentOfType(component: JSX.Element, requiredType: string) {
     let componentType = component.type as any;
+    if (componentType == null && typeof component === "string") {
+        console.warn("simplr-forms-core: text should not be rendered inside fields:", component);
+        return false;
+    }
     return (componentType[requiredType] != null);
 }
 
diff --git a/packages/simplr-forms-dom/src/components/form.tsx b/packages/simplr-forms-dom/src/components/form.tsx
@@ -8,7 +8,7 @@ export class Form extends BaseForm<FormProps, {}> {
 
     protected SetElementRef = (element: HTMLFormElement) => {
         this.Element = element;
-        this.FormStore.SetSubmitCallback(() => {
+        this.FormStore.SetFormSubmitCallback(() => {
             element.dispatchEvent(new Event("submit"));
         });
     }
@@ -36,7 +36,7 @@ export class Form extends BaseForm<FormProps, {}> {
         event.persist();
 
         const result = this.props.onSubmit(event, this.FormStore);
-        this.FormStore.Submit(result);
+        this.FormStore.SubmitForm(result);
     }
 
     render() {
diff --git a/packages/simplr-forms-dom/src/components/submit.tsx b/packages/simplr-forms-dom/src/components/submit.tsx
@@ -52,20 +52,48 @@ export interface SubmitStateRecord extends TypedRecord<SubmitStateRecord>, Submi
 export class Submit extends BaseContainer<SubmitProps, SubmitStateRecord> {
     protected OnStoreUpdated(): void {
         const formStore = this.FormStore.GetState();
-        const newState = recordify({
+        const newState = {
             Error: formStore.Form.Error,
             Validating: formStore.Form.Validating,
             Submitting: formStore.Form.Submitting,
             Pristine: formStore.Form.Pristine
-        });
+        };
 
-        if (!newState.equals(this.state)) {
-            this.setState(() => newState);
+        const newStateRecord = recordify(newState);
+        if (!newStateRecord.equals(this.state)) {
+            this.setState((prevState) => {
+                // TODO: newStateRecord becomes an empty object after setState
+                return newState;
+            });
         }
     }
 
-    protected get Disabled() {
-        // TODO: Disabled....
+    protected get Disabled(): boolean {
+        if (this.props.disabled != null) {
+            return this.props.disabled;
+        }
+        if (this.state != null) {
+            if (this.props.disableOnError === true &&
+                this.state.Error != null) {
+                console.log("Disabling submit on error.");
+                return true;
+            }
+
+            // TODO: waiting/busy
+
+            if (this.props.disableOnSubmitting === true &&
+                this.state.Submitting === true) {
+                console.log("Disabling submit on submitting.");
+                return true;
+            }
+
+            if (this.props.disableOnPristine === true &&
+                this.state.Pristine === true) {
+                console.log("Disabling submit on pristine.");
+                return true;
+            }
+        }
+
         return false;
     }
 
diff --git a/packages/simplr-mvdir/src/index.ts b/packages/simplr-mvdir/src/index.ts
@@ -36,13 +36,13 @@ export async function move(
                 const fromDirectory = path.join(from, file);
                 await move(fromDirectory, to, recursively, removeFromDirectory, from);
                 if (removeFromDirectory === true && await fs.exists(fromDirectory)) {
-                    await fs.rmdir(fromDirectory);
+                    await waitForEmptyAndRemoveDirAsync(fromDirectory);
                 }
             }
         }
     }
     if (removeFromDirectory === true && await fs.exists(from)) {
-        await fs.rmdir(from);
+        await waitForEmptyAndRemoveDirAsync(from);
     }
 }
 
@@ -57,3 +57,36 @@ async function mkdirpAsync(dir: string) {
         });
     });
 }
+
+async function waitForEmptyAndRemoveDirAsync(dir: string) {
+    let files;
+    while ((files = await fs.readdir(dir)) && files!.length > 0) {
+        await sleep(10);
+    }
+    await fs.rmdir(dir);
+}
+
+function sleep(milliseconds: number) {
+    return new Promise<void>(resolve => {
+        setTimeout(resolve, milliseconds);
+    });
+}
+
+async function rmdir(dir: string) {
+    let list = await fs.readdir(dir);
+    for (var i = 0; i < list.length; i++) {
+        var filename = path.join(dir, list[i]);
+        var stat = await fs.stat(filename);
+
+        if (filename === "." || filename === "..") {
+            // pass these files
+        } else if (stat.isDirectory()) {
+            // rmdir recursively
+            await rmdir(filename);
+        } else {
+            // rm fiilename
+            await fs.unlink(filename);
+        }
+    }
+    await fs.rmdir(dir);
+}

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import * as React from "react";`
`2`	`2`	`import * as PropTypes from "prop-types";`
`3`	`3`
`4`	`4`	`import { FormStore } from "../stores/form-store";`
`5`		`-import { StateUpdated } from "../actions/form-store";`
	`5`	`+import { StateChanged } from "../actions/form-store";`
`6`	`6`	`import { FSHContainer } from "../stores/form-stores-handler";`
`7`	`7`
`8`	`8`	`export interface BaseContainerProps {`
`@@ -48,7 +48,7 @@ export abstract class BaseContainer<TProps extends BaseContainerProps, TState> e`
`48`	`48`	throw new Error(`simplr-forms-core: Container is already in a Form '${this.context.FormId}' context, ${but}.`);
`49`	`49`	`}`
`50`	`50`
`51`		`- this.FormStore.addListener(StateUpdated, this.OnStoreUpdated.bind(this));`
	`51`	`+ this.FormStore.addListener(StateChanged, this.OnStoreUpdated.bind(this));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`protected abstract OnStoreUpdated(): void;`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,8 @@ export abstract class CoreField<TProps extends CoreFieldProps, TState extends Co`
`82`	`82`	`throw new Error("simplr-forms-core: Field must be used inside a Form component.");`
`83`	`83`	`}`
`84`	`84`	`this.StoreEventSubscription =`
`85`		`- this.FormStore.addListener<FormStoreActions.StateUpdated>(`
`86`		`- FormStoreActions.StateUpdated,`
	`85`	`+ this.FormStore.addListener<FormStoreActions.StateChanged>(`
	`86`	`+ FormStoreActions.StateChanged,`
`87`	`87`	`this.OnStoreUpdated.bind(this));`
`88`	`88`	`this.registerFieldInFormStore();`
`89`	`89`	`}`
`@@ -94,7 +94,7 @@ export abstract class CoreField<TProps extends CoreFieldProps, TState extends Co`
`94`	`94`	throw new Error(`simplr-forms-core: Field name must be constant`);
`95`	`95`	`}`
`96`	`96`
`97`		`- this.FormStore.UpdateProps(this.FieldId, nextProps);`
	`97`	`+ this.FormStore.UpdateFieldProps(this.FieldId, nextProps);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`componentWillUnmount() {`
`@@ -133,9 +133,12 @@ export abstract class CoreField<TProps extends CoreFieldProps, TState extends Co`
`133`	`133`	`return this.RawDefaultValue;`
`134`	`134`	`}`
`135`	`135`
`136`		`- protected ProcessValueBeforeStore(value: FieldValue) {`
	`136`	`+ protected ProcessValueBeforeStore(value: FieldValue): FieldValue {`
`137`	`137`	`// Parse and normalize value`
`138`		`- return this.NormalizeValue(this.ParseValue(value));`
	`138`	`+ if (value != null) {`
	`139`	`+ return this.NormalizeValue(this.ParseValue(value));`
	`140`	`+ }`
	`141`	`+ return value;`
`139`	`142`	`}`
`140`	`143`
`141`	`144`	`protected ProcessValueFromStore(value: FieldValue) {`
`@@ -212,7 +215,7 @@ export abstract class CoreField<TProps extends CoreFieldProps, TState extends Co`
`212`	`215`	`newValue = this.ProcessValueBeforeStore(newValue);`
`213`	`216`	`}`
`214`	`217`
`215`		`- this.FormStore.ValueChanged(this.FieldId, newValue);`
	`218`	`+ this.FormStore.UpdateFieldValue(this.FieldId, newValue);`
`216`	`219`	`}`
`217`	`220`
`218`	`221`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { FieldValue } from "../contracts/field";`
`2`	`2`
`3`		`-export class StateUpdated { }`
	`3`	`+export class StateChanged { }`
`4`	`4`
`5`	`5`	`export class FieldRegistered {`
`6`	`6`	`constructor(private fieldId: string, private initialValue: FieldValue) { }`
`@@ -26,10 +26,12 @@ export class ValueChanged {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-export class PropsChanged {`
	`29`	`+export class FieldPropsChanged {`
`30`	`30`	`constructor(private fieldId: string) { }`
`31`	`31`
`32`	`32`	`public get FieldId() {`
`33`	`33`	`return this.fieldId;`
`34`	`34`	`}`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+export class FormPropsChanged { }`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,11 @@ export interface FormProps {`
`8`	`8`	`formStore?: FormStore;`
`9`	`9`	`destroyOnUnmount?: boolean;`
`10`	`10`	`forceSubmit?: boolean;`
	`11`	`+ disabled?: boolean;`
`11`	`12`	`}`
`12`	`13`
	`14`	`+export interface FormPropsRecord extends TypedRecord<FormPropsRecord>, FormProps { }`
	`15`	`+`
`13`	`16`	`export interface FormChildContext {`
`14`	`17`	`FormId: string;`
`15`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ export class CurrencyModifier extends BaseModifier<CurrencyProps, {}> {`
`17`	`17`	`}`
`18`	`18`	`Parse(value: FieldValue): FieldValue {`
`19`	`19`	`if (value === this.emptyFormattedValue) {`
`20`		- console.log(`Parser got an emptyFormattedValue.`);
`21`	`20`	`return 0;`
`22`	`21`	`}`
`23`	`22`	`if (ValueOfType<string>(value, CurrencyModifier.name, "string")) {`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,10 @@ export function ProcessValue<TProcessor, TProcessedResult>(`
`41`	`41`
`42`	`42`	`export function IsComponentOfType(component: JSX.Element, requiredType: string) {`
`43`	`43`	`let componentType = component.type as any;`
	`44`	`+ if (componentType == null && typeof component === "string") {`
	`45`	`+ console.warn("simplr-forms-core: text should not be rendered inside fields:", component);`
	`46`	`+ return false;`
	`47`	`+ }`
`44`	`48`	`return (componentType[requiredType] != null);`
`45`	`49`	`}`
`46`	`50`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ export class Form extends BaseForm<FormProps, {}> {`
`8`	`8`
`9`	`9`	`protected SetElementRef = (element: HTMLFormElement) => {`
`10`	`10`	`this.Element = element;`
`11`		`- this.FormStore.SetSubmitCallback(() => {`
	`11`	`+ this.FormStore.SetFormSubmitCallback(() => {`
`12`	`12`	`element.dispatchEvent(new Event("submit"));`
`13`	`13`	`});`
`14`	`14`	`}`
`@@ -36,7 +36,7 @@ export class Form extends BaseForm<FormProps, {}> {`
`36`	`36`	`event.persist();`
`37`	`37`
`38`	`38`	`const result = this.props.onSubmit(event, this.FormStore);`
`39`		`- this.FormStore.Submit(result);`
	`39`	`+ this.FormStore.SubmitForm(result);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`render() {`