@tager/admin-export 1.0.0 → 1.0.2

package/dist/views/ExportList/ExportList.vue.d.ts

@@ -1,4 +1,4 @@
-import { type ColumnDefinition } from "@tager/admin-ui";
+import { type ColumnDefinition } from '@tager/admin-ui';
 import { ExportType } from '../../typings/model';
 import { getExportFormUrl } from '../../utils/paths';
 declare const _default: import("vue").DefineComponent<{}, {
@@ -12,5 +12,5 @@ declare const _default: import("vue").DefineComponent<{}, {
     pageSize: import("vue").Ref<number>;
     pageCount: import("vue").ComputedRef<number>;
     pageNumber: import("vue").Ref<number>;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
 export default _default;

package/dist/views/ExportList/components/CellHistory/CellHistory.vue.d.ts

@@ -8,12 +8,12 @@ declare const _default: import("vue").DefineComponent<{
     };
 }, {
     dateTimeFormat: typeof dateTimeFormat;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     history: {
         type: PropType<HistoryType[]>;
         default: () => never[];
     };
 }>>, {
     history: HistoryType[];
-}>;
+}, {}>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tager/admin-export",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "license": "MIT",
   "main": "dist/index.umd.js",
   "module": "dist/index.esm.js",
@@ -29,13 +29,14 @@
     "path-to-regexp": "^6.1.0"
   },
   "devDependencies": {
+    "pinia": "^2.1.7",
     "@babel/core": "^7.17.9",
     "@babel/eslint-parser": "^7.17.0",
     "@rushstack/eslint-patch": "^1.1.2",
-    "@tager/admin-dynamic-field": "^1.0.0",
-    "@tager/admin-layout": "^1.0.0",
-    "@tager/admin-services": "^1.0.0",
-    "@tager/admin-ui": "^1.0.1",
+    "@tager/admin-dynamic-field": "^1.1.4",
+    "@tager/admin-layout": "^1.0.23",
+    "@tager/admin-services": "^1.1.17",
+    "@tager/admin-ui": "^1.0.120",
     "@types/lodash.isequal": "^4.5.6",
     "@types/lodash.pick": "^4.4.7",
     "@types/node": "16.x",
@@ -58,7 +59,7 @@
     "sass-loader": "^12.6.0",
     "typescript": "^4.6.3",
     "vite": "^2.9.6",
-    "vue": "^3.2.31",
+    "vue": "^3.3.0",
     "vue-router": "^4.0.14",
     "vue-tsc": "^0.34.10"
   },

package/src/dev/config.ts

@@ -16,7 +16,6 @@ export const OZITAG_CONFIG: AppConfigType = {
     subtitle: '',
   },
   SPLASH_SCREEN: {
-    enabled: true,
     logo: 'logo-white.svg',
     background: '#1e1e1e',
   },

package/src/dev/main.ts

@@ -1,4 +1,5 @@
 import { createApp } from 'vue';
+import { createPinia } from 'pinia';
 
 import { configStore, i18n, i18nPlugin } from '@tager/admin-services';
 import { createRouter } from '@tager/admin-layout';
@@ -25,9 +26,11 @@ const router = createRouter(
 );
 
 const app = createApp(App);
+const pinia = createPinia();
 
 app.use(router);
 app.use(i18nPlugin);
+app.use(pinia);
 
 applyTranslations();
 

package/src/locales/en.ts

@@ -4,6 +4,7 @@ export const EN = {
   exportList: 'Export List',
   exportForm: 'Export Form',
   type: 'Type',
+  params: 'Params',
   exportType: 'Export type',
   status: 'status',
   message: 'Message',

package/src/locales/ru.ts

@@ -6,6 +6,7 @@ export const RU: typeof EN = {
   exportList: 'Список экспортов',
   exportForm: 'Форма экспорта',
   type: 'Тип',
+  params: 'Параметры',
   exportType: 'Тип экспорта',
   status: 'Статус',
   message: 'Сообщение',

package/src/typings/model.ts

@@ -17,6 +17,7 @@ export interface ExportType {
   readonly message: string | null;
   readonly history: Array<HistoryType>;
   readonly file: FileType | null;
+  readonly params: Record<string, string>;
 }
 
 export interface StrategyType {

package/src/views/ExportList/ExportList.vue

@@ -1,7 +1,7 @@
 <template>
   <Page
-      :title="$i18n.t('export:export')"
-      :header-buttons="[
+    :title="$i18n.t('export:export')"
+    :header-buttons="[
       {
         text: $i18n.t('export:newExport'),
         href: getExportFormUrl({ exportId: 'create' }),
@@ -9,50 +9,52 @@
     ]"
   >
     <DataTable
-        :column-defs="columnDefs"
-        :row-data="rowData"
-        :loading="isRowDataLoading"
-        :error-message="errorMessage"
-        :pagination="{
+      :column-defs="columnDefs"
+      :row-data="rowData"
+      :loading="isRowDataLoading"
+      :error-message="errorMessage"
+      :pagination="{
         pageSize,
         pageCount,
         pageNumber,
         disabled: isRowDataLoading,
       }"
-        :use-search="false"
-        @change="handleChange"
+      :use-search="false"
+      @change="handleChange"
     >
       <template #cell(history)="{ row }">
-        <CellHistory :history="row.history"/>
+        <CellHistory :history="row.history" />
       </template>
     </DataTable>
   </Page>
 </template>
 
 <script lang="ts">
-import {defineComponent, onMounted} from "vue";
-import {useI18n} from '@tager/admin-services';
-import {Page} from "@tager/admin-layout";
+import { defineComponent, onMounted } from 'vue';
+
+import { useI18n } from '@tager/admin-services';
+import { Page } from '@tager/admin-layout';
 import {
   type ColumnDefinition,
   DataTable,
   useDataTable,
-} from "@tager/admin-ui";
+} from '@tager/admin-ui';
 
-import {getExportList} from '../../services/requests';
-import {ExportType} from '../../typings/model';
-import {getExportFormUrl} from '../../utils/paths';
+import { getExportList } from '../../services/requests';
+import { ExportType } from '../../typings/model';
+import { getExportFormUrl } from '../../utils/paths';
 
-import {CellHistory} from './components/CellHistory';
+import { CellHistory } from './components/CellHistory';
 
 export default defineComponent({
   name: 'ExportList',
   components: {
-    Page, CellHistory,
+    Page,
+    CellHistory,
     DataTable,
   },
   setup() {
-    const {t} = useI18n();
+    const { t } = useI18n();
 
     const {
       fetchEntityList: fetchExportList,
@@ -66,10 +68,10 @@ export default defineComponent({
       pageNumber,
     } = useDataTable<ExportType>({
       fetchEntityList: (params) =>
-          getExportList({
-            pageNumber: params.pageNumber,
-            pageSize: params.pageSize,
-          }),
+        getExportList({
+          pageNumber: params.pageNumber,
+          pageSize: params.pageSize,
+        }),
       initialValue: [],
       resourceName: 'Export list',
       pageSize: 100,
@@ -84,43 +86,56 @@ export default defineComponent({
         id: 1,
         name: 'ID',
         field: 'id',
-        style: {width: '50px', textAlign: 'center'},
-        headStyle: {width: '50px', textAlign: 'center'},
+        width: '50px',
       },
       {
         id: 2,
-        name: t('export:type'),
-        field: 'strategy',
-        style: {width: '15%'},
-        headStyle: {width: '15%'},
+        name: t('export:status'),
+        field: 'status',
+        width: '120px',
       },
       {
         id: 3,
-        name: t('export:status'),
-        field: 'status',
-        style: {width: '15%'},
-        headStyle: {width: '15%'},
+        name: t('export:type'),
+        field: 'strategy',
+        width: '150px',
       },
       {
         id: 4,
+        name: t('export:params'),
+        field: 'params',
+        type: 'key-value',
+        format: ({ row }) => {
+          const result: any[] = [];
+
+          Object.keys(row.params).forEach((param) => {
+            result.push({
+              key: param,
+              value: row.params[param],
+            });
+          });
+
+          return result;
+        },
+      },
+      {
+        id: 5,
         name: t('export:message'),
         field: 'message',
+        width: '200px',
       },
-
       {
-        id: 5,
+        id: 6,
         name: t('export:log'),
         field: 'history',
-        style: {width: '25%'},
-        headStyle: {width: '25%'},
+        width: '300px',
       },
       {
-        id: 6,
+        id: 7,
         name: t('export:file'),
         field: 'file',
         type: 'file',
-        style: {width: '150px', textAlign: 'center'},
-        headStyle: {width: '150px', textAlign: 'center'},
+        width: '100px',
       },
     ];
 

package/src/views/ExportList/components/CellHistory/CellHistory.helpers.ts

@@ -1,12 +1,12 @@
 export function dateTimeFormat(value: number | string | Date): string {
-  const options = {
-    /*year: 'numeric',
+  const date = new Date(value);
+
+  return new Intl.DateTimeFormat('ru-RU', {
+    year: 'numeric',
     month: 'numeric',
     day: 'numeric',
     hour: 'numeric',
     minute: 'numeric',
-    second: 'numeric',*/
-  };
-  const date = new Date(value);
-  return new Intl.DateTimeFormat('ru-RU', options).format(date);
+    second: 'numeric',
+  }).format(date);
 }