Merge pull request #109 from dev-family/ADM-62

ADM 62 + ADM-103

admiral/crud/index.tsx

@@ -253,7 +253,7 @@ function makeUpdatePage<RecordType>(config: CRUDConfig<RecordType>) {
         ) : (
             <Page title={title(id)}>
                 <Form
-                    redirect={path}
+                    redirect={true}
                     submitData={submitData}
                     fetchInitialData={fetchInitialData}
                     locale={locale.form}

admiral/crud/locale/LocaleContext.tsx

@@ -9,7 +9,7 @@ import { enUs as enUsTableLocale } from '../../ui/Table/locales'
 import { enUs as enUsPopconfirmLocale } from '../../dataTable/locale/enUS'
 import { enUs as enEsLayoutLocale } from '../../ui/Layout/locale/enUs'
 
-const defaultLocale: CRUDLocale = {
+export const defaultLocale: CRUDLocale = {
     actions: enUsActionsLocale,
     pagination: enUsPaginationLocale,
     filters: enUsFiltersLocale,

admiral/dataTable/actions/EditAction.tsx

@@ -24,7 +24,6 @@ export const EditAction: React.FC<EditActionProps> = ({
     if (behavior === 'backgroundRoute' && !mainRoutePath) {
         console.error('Please provide "mainRoutePath" for "backgroundRoute" behavior')
     }
-
     return (
         <Link
             to={{

admiral/dataTable/locale/enUS.ts

@@ -1,6 +1,11 @@
 import { enUs as enUsPopconfirmLocale } from '../../ui/Popconfirm/locale/enUS'
+import { PopconfirmLocaleType } from '../../ui/Popconfirm/interfaces'
 
-export const enUs = {
+export type DataTableType = {
+    title: string
+} & PopconfirmLocaleType
+
+export const enUs: DataTableType = {
     title: 'Are you sure you want to delete?',
     ...enUsPopconfirmLocale,
 }

admiral/form/Form.tsx

@@ -23,7 +23,7 @@ import { RouterLocationState } from '../router/interfaces'
 export type FormProps = {
     locale?: Locale
     className?: string
-    redirect?: string
+    redirect?: string | boolean
     fetchInitialData?: () => Promise<GetFormDataResult>
     submitData?: (values: any) => Promise<any>
     children: React.ReactNode
@@ -93,8 +93,9 @@ const InternalForm = forwardRef<FormRef, FormProps>(
                     message: locale.successMessage,
                     type: 'success',
                 })
-
-                if (redirect) {
+                if (redirect === true) {
+                    history.goBack()
+                } else if (redirect) {
                     history.push({
                         pathname: redirect,
                         // update table when drawer saved and closed

admiral/index.ts

@@ -73,3 +73,6 @@ export { createRoutesFrom } from './router'
 
 export { useTheme, useThemeVars } from './theme'
 export type { ThemeName, ThemePreset } from './theme/interfaces'
+
+export { admiralLocales } from './locales'
+export type { AdmiralLocales } from './locales'

admiral/locales.ts

@@ -0,0 +1,57 @@
+import { CRUDLocale } from './crud/interfaces'
+import { defaultLocale as CRUDEn } from './crud/locale/LocaleContext'
+import { enUs as tableEn, DataTableType } from './dataTable/locale'
+import { FiltersLocale } from './filters/interfaces'
+import { enUS as filtersLocaleEn } from './filters/locale/enUS'
+import { Locale as FormLocale } from './form/interfaces'
+import { enUS as formLocaleEn } from './form/locale/enUS'
+import datePickerLocaleEn from './ui/DatePicker/locale/en_US'
+import { PickerLocale } from './ui/DatePicker/generatePicker/interfaces'
+import { enUs as LayoutLocaleEn } from './ui/Layout/locale/enUs'
+import { LayoutLocale } from './ui/Layout/interfaces'
+import { enUs as paginationLocaleEn } from './ui/Pagination/locales/enUS'
+import { PaginationLocale } from './ui/Pagination/interfaces'
+import { enUs as PopconfirmLocaleEn } from './ui/Popconfirm/locale'
+import { PopconfirmLocaleType } from './ui/Popconfirm/interfaces'
+import { enUs as selectLocaleEn } from './ui/Select/locales/enUS'
+import { SelectLocale } from './ui/Select/interfaces'
+import { enUS as uploadLocaleEn } from './ui/Upload/locales/enUS'
+import { UploadLocale } from './ui/Upload/interfaces'
+
+type AdmiralLocale = {
+    CRUD: CRUDLocale
+    table: DataTableType
+    filters: FiltersLocale
+    form: FormLocale
+    ui: {
+        datePicker: PickerLocale
+        layout: LayoutLocale
+        pagination: PaginationLocale
+        popconfirm: PopconfirmLocaleType
+        select: SelectLocale
+        upload: UploadLocale
+    }
+}
+
+export type AdmiralLocales = {
+    en: AdmiralLocale
+    ru: {}
+}
+
+export const admiralLocales: AdmiralLocales = {
+    en: {
+        CRUD: CRUDEn,
+        table: tableEn,
+        filters: filtersLocaleEn,
+        form: formLocaleEn,
+        ui: {
+            datePicker: datePickerLocaleEn,
+            layout: LayoutLocaleEn,
+            pagination: paginationLocaleEn,
+            popconfirm: PopconfirmLocaleEn,
+            select: selectLocaleEn,
+            upload: uploadLocaleEn,
+        },
+    },
+    ru: {},
+}

admiral/ui/Popconfirm/interfaces.ts

@@ -1,5 +1,7 @@
 import { TooltipProps } from '../Tooltip/interfaces'
 
+export type PopconfirmLocaleType = { cancelTitle: string; confirmTitle: string }
+
 export interface PopconfirmProps extends Pick<TooltipProps, 'placement'> {
     title: React.ReactNode
     initialOpen?: boolean

admiral/ui/Popconfirm/locale/enUS.ts

@@ -1,4 +1,6 @@
-export const enUs = {
+import { PopconfirmLocaleType } from '../interfaces'
+
+export const enUs: PopconfirmLocaleType = {
     cancelTitle: 'Cancel',
     confirmTitle: 'Confirm',
 }

lib/admiral.es.js

@@ -94274,7 +94274,9 @@ const InternalForm = forwardRef$3(({ locale: locale2 = enUS$2, className, fetchI
         message: locale2.successMessage,
         type: "success"
       });
-      if (redirect) {
+      if (redirect === true) {
+        history.goBack();
+      } else if (redirect) {
         history.push({
           pathname: redirect,
           state: { update: { dataTable: true } }
@@ -96761,7 +96763,7 @@ function makeUpdatePage(config2) {
     }) : /* @__PURE__ */ React__default.createElement(Page, {
       title: title2(id)
     }, /* @__PURE__ */ React__default.createElement(Form, {
-      redirect: path,
+      redirect: true,
       submitData,
       fetchInitialData,
       locale: locale2.form
@@ -96864,4 +96866,21 @@ function createCRUD(config2) {
     UpdatePage: makeUpdatePage(config2)
   };
 }
-export { Admin, AjaxSelectInput, ArrayInput, BackButton, Badge, BooleanInput, Button$1 as Button, Card$1 as Card, Checkbox$1 as Checkbox, ColorPicker$1 as ColorPicker, ColorPickerInput, CreateButton, DatePicker, DatePickerInput, DeleteAction, DraggerInput, Drawer, EditAction, Editor, EditorInput, FileField, FilePictureInput, FilterButton, Form, FormProvider, Input$2 as Input, Layout, Menu$1 as Menu, MenuItemLink, MonthPicker, MultilineTextInput, Notification, NotificationContent, OAuthProvidersEnum, Page, Pagination, Password$1 as Password, PasswordInput, Popconfirm, QuarterPicker, Radio$1 as Radio, RadioGroup$1 as RadioGroup, RadioInput, Select, SelectInput, SlugInput, Spin, SubMenu$1 as SubMenu, Switch, Table, Tabs, TextInput, Textarea$1 as Textarea, ThemeSwitch, TimePicker, TimePickerInput, Tooltip, TopToolbar, TranslatableInput, Typography, Upload, WeekPicker, YearPicker, createCRUD, createRoutesFrom, index as filtersLocale, index$1 as formLocale, parseValue, useDataProvider, useForceUpdate, useForm, useGetIdentity, useMedia, useControlledState as useMergedState, useNav, useSafeSetState, useTheme, _useThemeVars as useThemeVars, useUrlState };
+const admiralLocales = {
+  en: {
+    CRUD: defaultLocale,
+    table: enUs$1,
+    filters: enUS$1,
+    form: enUS$2,
+    ui: {
+      datePicker: locale,
+      layout: enUs,
+      pagination: enUs$5,
+      popconfirm: enUs$3,
+      select: enUs$4,
+      upload: enUS$3
+    }
+  },
+  ru: {}
+};
+export { Admin, AjaxSelectInput, ArrayInput, BackButton, Badge, BooleanInput, Button$1 as Button, Card$1 as Card, Checkbox$1 as Checkbox, ColorPicker$1 as ColorPicker, ColorPickerInput, CreateButton, DatePicker, DatePickerInput, DeleteAction, DraggerInput, Drawer, EditAction, Editor, EditorInput, FileField, FilePictureInput, FilterButton, Form, FormProvider, Input$2 as Input, Layout, Menu$1 as Menu, MenuItemLink, MonthPicker, MultilineTextInput, Notification, NotificationContent, OAuthProvidersEnum, Page, Pagination, Password$1 as Password, PasswordInput, Popconfirm, QuarterPicker, Radio$1 as Radio, RadioGroup$1 as RadioGroup, RadioInput, Select, SelectInput, SlugInput, Spin, SubMenu$1 as SubMenu, Switch, Table, Tabs, TextInput, Textarea$1 as Textarea, ThemeSwitch, TimePicker, TimePickerInput, Tooltip, TopToolbar, TranslatableInput, Typography, Upload, WeekPicker, YearPicker, admiralLocales, createCRUD, createRoutesFrom, index as filtersLocale, index$1 as formLocale, parseValue, useDataProvider, useForceUpdate, useForm, useGetIdentity, useMedia, useControlledState as useMergedState, useNav, useSafeSetState, useTheme, _useThemeVars as useThemeVars, useUrlState };

lib/admiral/crud/locale/LocaleContext.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { CRUDLocale } from '../interfaces';
+export declare const defaultLocale: CRUDLocale;
 export declare const LocaleContext: React.Context<CRUDLocale>;
 export declare const LocaleContextProvider: React.FC<{
     value?: Partial<CRUDLocale>;

lib/admiral/dataTable/locale/enUS.d.ts

@@ -1,5 +1,5 @@
-export declare const enUs: {
-    cancelTitle: string;
-    confirmTitle: string;
+import { PopconfirmLocaleType } from '../../ui/Popconfirm/interfaces';
+export declare type DataTableType = {
     title: string;
-};
+} & PopconfirmLocaleType;
+export declare const enUs: DataTableType;

lib/admiral/form/Form.d.ts

@@ -7,7 +7,7 @@ import { Locale } from './interfaces';
 export declare type FormProps = {
     locale?: Locale;
     className?: string;
-    redirect?: string;
+    redirect?: string | boolean;
     fetchInitialData?: () => Promise<GetFormDataResult>;
     submitData?: (values: any) => Promise<any>;
     children: React.ReactNode;

lib/admiral/index.d.ts

@@ -36,3 +36,5 @@ export { TopToolbar } from './layout';
 export { createRoutesFrom } from './router';
 export { useTheme, useThemeVars } from './theme';
 export type { ThemeName, ThemePreset } from './theme/interfaces';
+export { admiralLocales } from './locales';
+export type { AdmiralLocales } from './locales';

lib/admiral/locales.d.ts

@@ -0,0 +1,30 @@
+import { CRUDLocale } from './crud/interfaces';
+import { DataTableType } from './dataTable/locale';
+import { FiltersLocale } from './filters/interfaces';
+import { Locale as FormLocale } from './form/interfaces';
+import { PickerLocale } from './ui/DatePicker/generatePicker/interfaces';
+import { LayoutLocale } from './ui/Layout/interfaces';
+import { PaginationLocale } from './ui/Pagination/interfaces';
+import { PopconfirmLocaleType } from './ui/Popconfirm/interfaces';
+import { SelectLocale } from './ui/Select/interfaces';
+import { UploadLocale } from './ui/Upload/interfaces';
+declare type AdmiralLocale = {
+    CRUD: CRUDLocale;
+    table: DataTableType;
+    filters: FiltersLocale;
+    form: FormLocale;
+    ui: {
+        datePicker: PickerLocale;
+        layout: LayoutLocale;
+        pagination: PaginationLocale;
+        popconfirm: PopconfirmLocaleType;
+        select: SelectLocale;
+        upload: UploadLocale;
+    };
+};
+export declare type AdmiralLocales = {
+    en: AdmiralLocale;
+    ru: {};
+};
+export declare const admiralLocales: AdmiralLocales;
+export {};

lib/admiral/ui/Popconfirm/interfaces.d.ts

@@ -1,5 +1,9 @@
 /// <reference types="react" />
 import { TooltipProps } from '../Tooltip/interfaces';
+export declare type PopconfirmLocaleType = {
+    cancelTitle: string;
+    confirmTitle: string;
+};
 export interface PopconfirmProps extends Pick<TooltipProps, 'placement'> {
     title: React.ReactNode;
     initialOpen?: boolean;

lib/admiral/ui/Popconfirm/locale/enUS.d.ts

@@ -1,4 +1,2 @@
-export declare const enUs: {
-    cancelTitle: string;
-    confirmTitle: string;
-};
+import { PopconfirmLocaleType } from '../interfaces';
+export declare const enUs: PopconfirmLocaleType;