proje-react-panel 1.1.0 → 1.1.2-test-1

package/src/decorators/form/Form.ts

@@ -9,9 +9,6 @@ export type OnSubmitFN<T> = (data: T | FormData) => Promise<T | FormData>;
 interface FormOptions<T extends AnyClass> {
   onSubmit: OnSubmitFN<T>;
   getDetailsData?: GetDetailsDataFN<T>;
-  onSelectPreloader?: (
-    inputOptions: InputConfiguration
-  ) => Promise<{ label: string; value: string }[]>;
   redirectBackOnSuccess?: boolean;
   type?: 'json' | 'formData';
 }
@@ -32,12 +29,16 @@ export function Form<T extends AnyClass>(options?: FormOptions<T>): ClassDecorat
 export function getFormConfiguration<T extends AnyClass, K extends AnyClassConstructor<T>>(
   entityClass: K
 ): FormConfiguration<T> {
-  const formConfiguration = Reflect.getMetadata(DETAILS_METADATA_KEY, entityClass as Object);
-  if (!formConfiguration) {
+  const formOptions: FormOptions<T> = Reflect.getMetadata(
+    DETAILS_METADATA_KEY,
+    entityClass as Object
+  );
+  if (!formOptions) {
     throw new Error('Form decerator should be used on class');
   }
   return {
-    ...formConfiguration,
-    type: formConfiguration.type ?? 'json',
+    ...formOptions,
+    type: formOptions.type ?? 'json',
+    redirectBackOnSuccess: formOptions.redirectBackOnSuccess ?? true,
   };
 }

package/src/decorators/form/Input.ts

@@ -7,20 +7,25 @@ const isFieldSensitive = (fieldName: string): boolean => {
   return ['password'].some(term => fieldName.toLowerCase().includes(term));
 };
 
+export type InputTypes = 'input' | 'textarea' | 'file-upload' | 'checkbox' | 'hidden' | 'nested';
+export type ExtendedInputTypes = InputTypes | 'select';
+
 export interface InputOptions {
-  type?: 'input' | 'select' | 'textarea' | 'file-upload' | 'checkbox' | 'hidden' | 'nested';
+  type?: InputTypes;
   inputType?: 'text' | 'email' | 'tel' | 'password' | 'number' | 'date';
   name?: string;
   label?: string;
   placeholder?: string;
-  cancelPasswordValidationOnEdit?: boolean;
-  options?: { value: string; label: string }[];
-  optionsPreload?: boolean;
   nestedFields?: InputConfiguration[];
 }
 
-export interface InputConfiguration extends InputOptions {
+export interface ExtendedInputOptions extends Omit<InputOptions, 'type'> {
+  type: ExtendedInputTypes;
+}
+
+export interface InputConfiguration extends Omit<InputOptions, 'type'> {
   name: string;
+  type: ExtendedInputTypes;
 }
 
 export function Input(options?: InputOptions): PropertyDecorator {
@@ -35,6 +40,18 @@ export function Input(options?: InputOptions): PropertyDecorator {
   };
 }
 
+export function ExtendedInput(options?: ExtendedInputOptions): PropertyDecorator {
+  return (target, propertyKey) => {
+    const existingInputs: string[] = Reflect.getMetadata(INPUT_KEY, target) || [];
+    Reflect.defineMetadata(INPUT_KEY, [...existingInputs, propertyKey.toString()], target);
+
+    if (options) {
+      const keyString = `${INPUT_KEY.toString()}:${propertyKey.toString()}:options`;
+      Reflect.defineMetadata(keyString, options, target);
+    }
+  };
+}
+
 export function getInputFields<T extends AnyClass>(
   entityClass: AnyClassConstructor<T>
 ): InputConfiguration[] {
@@ -53,8 +70,6 @@ export function getInputFields<T extends AnyClass>(
       inputType: inputType,
       type: fields?.type ?? 'input',
       selectOptions: fields?.selectOptions ?? [],
-      cancelPasswordValidationOnEdit:
-        fields?.cancelPasswordValidationOnEdit ?? inputType === 'password',
     };
   });
 }

package/src/decorators/form/inputs/SelectInput.ts

@@ -0,0 +1,19 @@
+import { ExtendedInput, ExtendedInputOptions, InputConfiguration, InputOptions } from '../Input';
+
+export interface SelectInputOptions extends InputOptions {
+  onSelectPreloader?: () => Promise<{ label: string; value: any }[]>;
+  defaultOptions?: { value: any; label: string }[];
+}
+
+export interface SelectInputConfiguration extends InputConfiguration {
+  type: 'select';
+  onSelectPreloader?: () => Promise<{ label: string; value: string }[]>;
+  defaultOptions?: { value: any; label: string }[];
+}
+
+export function SelectInput(options?: SelectInputOptions): PropertyDecorator {
+  return ExtendedInput({
+    ...options,
+    type: 'select',
+  } as ExtendedInputOptions);
+}

package/src/index.ts

@@ -18,6 +18,7 @@ export { Cell } from './decorators/list/Cell';
 export { FormPage } from './components/form/FormPage';
 export { Form, type OnSubmitFN } from './decorators/form/Form';
 export { Input } from './decorators/form/Input';
+export { SelectInput } from './decorators/form/inputs/SelectInput';
 //for nested form fields
 export { getInputFields } from './decorators/form/Input';