@tager/admin-import 0.1.1 → 1.0.0

package/dist/views/ImportForm/index.d.ts

@@ -1 +1 @@
-export { default } from './ImportForm.vue';
+export { default } from './ImportForm.vue';

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

@@ -1,41 +1,16 @@
-import { ColumnDefinition } from '@tager/admin-ui';
-import { ImportType } from '../../typings/model';
-import { getImportFormUrl } from '../../utils/paths';
-declare const _default: import("vue").ComponentOptions<import("vue").default, import("@vue/composition-api").ShallowUnwrapRef<{
-    columnDefs: ColumnDefinition<ImportType>[];
-    getImportFormUrl: typeof getImportFormUrl;
-    rowData: import("@vue/composition-api").Ref<ImportType[]>;
-    isRowDataLoading: import("@vue/composition-api").ComputedRef<boolean>;
-    errorMessage: import("@vue/composition-api").Ref<import("@tager/admin-services").Nullable<string>>;
-    searchQuery: import("@vue/composition-api").Ref<string>;
-    handleChange: (event: import("@tager/admin-ui").TableChangeEvent) => void;
-    pageSize: import("@vue/composition-api").Ref<number>;
-    pageCount: import("@vue/composition-api").ComputedRef<number>;
-    pageNumber: import("@vue/composition-api").Ref<number>;
-    t: import("i18next").TFunction;
-    dateTimeFormat: (value: number | string | Date) => string;
-}> & {
-    [key: string]: unknown;
-}, {}, {}, unknown, {
-    [x: string]: any;
-}> & import("vue").VueConstructor<import("vue").default> & (new (...args: any[]) => import("@vue/composition-api").ComponentRenderProxy<{
-    [x: string]: any;
-}, import("@vue/composition-api").ShallowUnwrapRef<{
-    columnDefs: ColumnDefinition<ImportType>[];
-    getImportFormUrl: typeof getImportFormUrl;
-    rowData: import("@vue/composition-api").Ref<ImportType[]>;
-    isRowDataLoading: import("@vue/composition-api").ComputedRef<boolean>;
-    errorMessage: import("@vue/composition-api").Ref<import("@tager/admin-services").Nullable<string>>;
-    searchQuery: import("@vue/composition-api").Ref<string>;
-    handleChange: (event: import("@tager/admin-ui").TableChangeEvent) => void;
-    pageSize: import("@vue/composition-api").Ref<number>;
-    pageCount: import("@vue/composition-api").ComputedRef<number>;
-    pageNumber: import("@vue/composition-api").Ref<number>;
-    t: import("i18next").TFunction;
-    dateTimeFormat: (value: number | string | Date) => string;
-}>, {
-    [x: string]: any;
-}, {}, {}, {
-    [x: string]: any;
-}>);
-export default _default;
+import { ColumnDefinition } from '@tager/admin-ui';
+import { ImportType } from '../../typings/model';
+import { getImportFormUrl } from '../../utils/paths';
+declare const _default: import("vue").DefineComponent<{}, {
+    columnDefs: ColumnDefinition<ImportType>[];
+    getImportFormUrl: typeof getImportFormUrl;
+    rowData: import("vue").Ref<ImportType[]>;
+    isRowDataLoading: import("vue").ComputedRef<boolean>;
+    errorMessage: import("vue").Ref<import("@tager/admin-services").Nullable<string>>;
+    searchQuery: import("vue").Ref<string>;
+    handleChange: (event: import("@tager/admin-ui/dist/components/DataTable/DataTable.types").TableChangeEvent) => void;
+    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<{}>>, {}>;
+export default _default;

package/dist/views/ImportList/components/CellHistory/CellHistory.helpers.d.ts

@@ -0,0 +1 @@
+export declare function dateTimeFormat(value: number | string | Date): string;

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

@@ -0,0 +1,19 @@
+import { PropType } from "vue";
+import { dateTimeFormat } from './CellHistory.helpers';
+import { HistoryType } from "../../../../typings/model";
+declare const _default: import("vue").DefineComponent<{
+    history: {
+        type: PropType<HistoryType[]>;
+        default: () => never[];
+    };
+}, {
+    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<{
+    history: {
+        type: PropType<HistoryType[]>;
+        default: () => never[];
+    };
+}>>, {
+    history: HistoryType[];
+}>;
+export default _default;

package/dist/views/ImportList/components/CellHistory/index.d.ts

@@ -0,0 +1 @@
+export { default as CellHistory } from './CellHistory.vue';

package/dist/views/ImportList/index.d.ts

@@ -1 +1 @@
-export { default } from './ImportList.vue';
+export { default } from './ImportList.vue';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tager/admin-import",
-  "version": "0.1.1",
+  "version": "1.0.0",
   "license": "MIT",
   "main": "dist/index.umd.js",
   "module": "dist/index.esm.js",
@@ -10,62 +10,64 @@
     "typings",
     "src"
   ],
+  "exports": {
+    "./css": "./dist/style.css",
+    ".": "./dist/index.mjs"
+  },
   "scripts": {
+    "build:js": "vite build",
+    "build:package": "concurrently --success first \"yarn build:js\" \"yarn emit-declarations\"",
+    "emit-declarations": "vue-tsc --project tsconfig.json --emitDeclarationOnly",
     "start": "vue-cli-service serve",
-    "lint": "vue-cli-service lint",
-    "build": "rollup --config",
-    "prepare": "vue-docgen-web-types && yarn build",
-    "tager:update": "node scripts/tager-update.js",
-    "yalc:clean": "yalc remove --all"
+    "prepare": "yarn build:package",
+    "tager:update": "yarn upgrade --latest --scope @tager"
   },
   "dependencies": {
+    "lodash.isequal": "^4.5.0",
     "lodash.kebabcase": "^4.1.1",
+    "lodash.pick": "^4.4.0",
     "path-to-regexp": "^6.1.0"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^14.0.0",
-    "@rollup/plugin-node-resolve": "^8.1.0",
-    "@tager/admin-layout": "^0.5.1",
-    "@tager/admin-services": "^0.2.23",
-    "@tager/admin-ui": "^0.8.58",
-    "@types/lodash.kebabcase": "^4.1.6",
-    "@types/node": "12.x",
-    "@typescript-eslint/eslint-plugin": "^2.26.0",
-    "@typescript-eslint/parser": "^2.26.0",
-    "@vue/cli-plugin-babel": "~4.4.6",
-    "@vue/cli-plugin-eslint": "~4.4.6",
-    "@vue/cli-plugin-router": "~4.4.6",
-    "@vue/cli-plugin-typescript": "~4.4.6",
-    "@vue/cli-service": "~4.4.6",
-    "@vue/composition-api": "^1.0.0-beta.14",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/eslint-config-typescript": "^5.0.2",
-    "babel-eslint": "^10.1.0",
-    "core-js": "^3.6.5",
-    "eslint": "^6.7.2",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-vue": "^6.2.2",
-    "prettier": "^2.0.5",
-    "rollup": "^2.23.1",
-    "rollup-plugin-typescript2": "^0.27.2",
-    "rollup-plugin-vue": "^5.1.9",
-    "sass-loader": "^9.0.3",
-    "typescript": "~3.9.6",
-    "vue": "2.6.x",
-    "vue-docgen-web-types": "^0.1.6",
-    "vue-router": "^3.5.1",
-    "vue-template-compiler": "^2.6.11"
+    "@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",
+    "@types/lodash.isequal": "^4.5.6",
+    "@types/lodash.pick": "^4.4.7",
+    "@types/node": "16.x",
+    "@typescript-eslint/eslint-plugin": "^5.21.0",
+    "@typescript-eslint/parser": "^5.21.0",
+    "@vitejs/plugin-vue": "^2.3.1",
+    "@vue/cli-plugin-babel": "^5.0.4",
+    "@vue/cli-plugin-typescript": "^5.0.4",
+    "@vue/cli-service": "~5.0.0",
+    "@vue/eslint-config-prettier": "^7.0.0",
+    "@vue/eslint-config-typescript": "^10.0.0",
+    "concurrently": "^7.1.0",
+    "core-js": "^3.22.3",
+    "eslint": "^8.14.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-vue": "^8.7.1",
+    "sass": "^1.51.0",
+    "sass-loader": "^12.6.0",
+    "typescript": "^4.6.3",
+    "vite": "^2.9.6",
+    "vue": "^3.2.31",
+    "vue-router": "^4.0.14",
+    "vue-tsc": "^0.34.10"
   },
   "peerDependencies": {
-    "@tager/admin-layout": ">=0.4.2",
-    "@tager/admin-services": ">=0.2.11",
-    "@tager/admin-ui": ">=0.7.5",
-    "@vue/composition-api": ">=1.0.0-beta.14",
-    "vue": "2.6.x"
-  },
-  "resolutions": {
-    "prettier": "2.x"
+    "@tager/admin-layout": "^1.0.0",
+    "@tager/admin-services": "^1.0.0",
+    "@tager/admin-ui": "^1.0.1",
+    "vue": "^3.2.31",
+    "vue-router": "^4.0.14"
   },
   "publishConfig": {
     "access": "public"

package/src/constants/routes.ts

@@ -1,31 +1,31 @@
-import { CustomRouteConfig } from '@tager/admin-layout';
+import type { RouteRecordRaw } from 'vue-router';
 
 import ImportList from '../views/ImportList';
 import ImportForm from '../views/ImportForm';
 
 import { IMPORT_ROUTE_PATHS } from './paths';
 
-export const IMPORT_LIST_ROUTE: CustomRouteConfig = {
+export const IMPORT_LIST_ROUTE: RouteRecordRaw = {
   path: IMPORT_ROUTE_PATHS.IMPORT_LIST,
   component: ImportList,
   name: 'Import List',
   meta: {
-    getBreadcrumbs: (route, t) => [
-      { url: '/', text: t('import:home') },
-      { url: route.path, text: t('import:importList') },
+    getBreadcrumbs: (route, i18n) => [
+      { url: '/', text: i18n.t('import:home') },
+      { url: route.path, text: i18n.t('import:importList') },
     ],
   },
 };
 
-export const IMPORT_FORM_ROUTE: CustomRouteConfig = {
+export const IMPORT_FORM_ROUTE: RouteRecordRaw = {
   path: IMPORT_ROUTE_PATHS.IMPORT_FORM,
   component: ImportForm,
   name: 'Import Form',
   meta: {
-    getBreadcrumbs: (route, t) => [
-      { url: '/', text: t('import:home') },
-      { url: IMPORT_LIST_ROUTE.path, text: t('import:importList') },
-      { url: route.path, text: t('import:importForm') },
+    getBreadcrumbs: (route, i18n) => [
+      { url: '/', text: i18n.t('import:home') },
+      { url: IMPORT_LIST_ROUTE.path, text: i18n.t('import:importList') },
+      { url: route.path, text: i18n.t('import:importForm') },
     ],
   },
 };

package/src/dev/App.vue

@@ -0,0 +1,38 @@
+<template>
+  <PageLayout :sidebar-menu-list="sidebarMenuList">
+    <router-view/>
+  </PageLayout>
+</template>
+
+<script lang="ts">
+import {defineComponent} from 'vue';
+import {MenuItemType, PageLayout} from "@tager/admin-layout";
+import {ViewListIcon} from "@tager/admin-ui";
+import {getImportListUrl} from '../utils/paths';
+import {useI18n} from "@tager/admin-services";
+
+export default defineComponent({
+  name: 'App',
+  components: {
+    PageLayout,
+  },
+  setup() {
+    const i18n = useI18n();
+
+    const sidebarMenuList: Array<MenuItemType> = [
+      {
+        id: 'import',
+        text: i18n.t('import:import'),
+        icon: ViewListIcon,
+        children: [{text: i18n.t('import:import'), url: getImportListUrl()}],
+      },
+    ];
+
+    return {
+      sidebarMenuList,
+    };
+  },
+});
+</script>
+
+<style scoped lang="scss"></style>

package/src/dev/config.ts

@@ -0,0 +1,23 @@
+import type { AppConfigType } from '@tager/admin-services';
+
+export const OZITAG_CONFIG: AppConfigType = {
+  APP_NAME: 'OZiTAG_ADMIN',
+  TITLE_TEMPLATE: 'OZiTAG Admin - {{title}}',
+  LANGUAGE: 'EN',
+  BRAND: {
+    small: {
+      logo: 'logo-small.svg',
+    },
+    large: {
+      logo: 'logo.svg',
+      label: 'OZiTAG',
+      'label-color': '#DD6900',
+    },
+    subtitle: '',
+  },
+  SPLASH_SCREEN: {
+    enabled: true,
+    logo: 'logo-white.svg',
+    background: '#1e1e1e',
+  },
+};

package/src/dev/env.ts

@@ -0,0 +1,17 @@
+import { initializeEnvironment } from '@tager/admin-services';
+
+export function populateEnvironment() {
+  initializeEnvironment({
+    publicPath: process.env.VUE_APP_PUBLIC_PATH,
+    appEnv: process.env.VUE_APP_ENV,
+    apiUrl: process.env.VUE_APP_API_URL,
+    accessToken: process.env.VUE_APP_ACCESS_TOKEN,
+    websiteUrl: process.env.VUE_APP_WEBSITE_URL,
+    websiteButtonUrl: process.env.VUE_APP_WEBSITE_BUTTON_URL,
+    sentryDsn: process.env.VUE_APP_SENTRY_DSN,
+    sentryEnv: process.env.VUE_APP_SENTRY_ENVIRONMENT,
+    baseUrl: process.env.BASE_URL,
+    nodeEnv: process.env.NODE_ENV,
+    version: process.env.VUE_APP_VERSION,
+  });
+}

package/src/dev/main.ts

@@ -0,0 +1,36 @@
+import { createApp } from 'vue';
+
+import { configStore, i18n, i18nPlugin } from '@tager/admin-services';
+import { createRouter } from '@tager/admin-layout';
+import '@tager/admin-ui/css';
+import '@tager/admin-layout/css';
+import '@tager/admin-dynamic-field/css';
+
+import { applyTranslations } from '../locales/apply';
+import {IMPORT_LIST_ROUTE, IMPORT_FORM_ROUTE} from '../constants/routes';
+
+import { OZITAG_CONFIG } from './config';
+import App from './App.vue';
+import { populateEnvironment } from './env';
+
+populateEnvironment();
+
+configStore.setConfig(OZITAG_CONFIG);
+
+const router = createRouter(
+  {
+    routes: [IMPORT_LIST_ROUTE, IMPORT_FORM_ROUTE],
+  },
+  { useTitleSync: false }
+);
+
+const app = createApp(App);
+
+app.use(router);
+app.use(i18nPlugin);
+
+applyTranslations();
+
+i18n.init({ debug: true, lng: 'ru' }).then(() => {
+  app.mount('#app');
+});

package/src/locales/apply.ts

@@ -0,0 +1,9 @@
+import { i18n } from '@tager/admin-services';
+
+import { EN } from './en';
+import { RU } from './ru';
+
+export function applyTranslations() {
+  i18n.addTranslations('en', 'import', EN);
+  i18n.addTranslations('ru', 'import', RU);
+}

package/src/locales/en.ts

@@ -1,6 +1,5 @@
-const EN = {
+export const EN = {
   home: 'Home',
-  exportAndImport: 'Export / Import',
   import: 'Import',
   importList: 'Import List',
   importForm: 'Import Form',
@@ -9,6 +8,7 @@ const EN = {
   status: 'status',
   message: 'Message',
   log: 'Log',
+  params: 'Params',
   file: 'file',
   newImport: 'New import',
   importCreation: 'Import creation',
@@ -17,5 +17,3 @@ const EN = {
   createdSuccessMessage: 'Import has been successfully created',
   createdErrorMessage: 'Import creation has been failed',
 };
-
-export default EN;

package/src/locales/ru.ts

@@ -1,23 +1,21 @@
-import EN from './en';
+import {EN} from './en';
 
-const RU: typeof EN = {
-  home: 'Главная',
-  exportAndImport: 'Экспорт / Импорт',
-  import: 'Импорт',
-  importList: 'Список импортов',
-  importForm: 'Форма импорта',
-  type: 'Тип',
-  importType: 'Тип импорта',
-  status: 'Статус',
-  message: 'Сообщение',
-  log: 'Лог',
-  file: 'Файл',
-  newImport: 'Новый импорт',
-  importCreation: 'Создание импорта',
-  success: 'Успех',
-  error: 'Ошибка',
-  createdSuccessMessage: 'Импорт была успешно создан',
-  createdErrorMessage: 'Создание импорта не удалось',
+export const RU: typeof EN = {
+    home: 'Главная',
+    import: 'Импорт',
+    importList: 'Список импортов',
+    importForm: 'Форма импорта',
+    type: 'Тип',
+    importType: 'Тип импорта',
+    status: 'Статус',
+    message: 'Сообщение',
+    log: 'Лог',
+    params: 'Параметры',
+    file: 'Файл',
+    newImport: 'Новый импорт',
+    importCreation: 'Создание импорта',
+    success: 'Успех',
+    error: 'Ошибка',
+    createdSuccessMessage: 'Импорт была успешно создан',
+    createdErrorMessage: 'Создание импорта не удалось',
 };
-
-export default RU;

package/src/main.ts

@@ -1,10 +1,6 @@
-import { i18n } from '@tager/admin-services';
+import { applyTranslations } from './locales/apply';
 
-import EN from './locales/en';
-import RU from './locales/ru';
-
-i18n.addTranslations('en', 'import', EN);
-i18n.addTranslations('ru', 'import', RU);
+applyTranslations();
 
 export * from './constants/routes';
 export * from './utils/paths';

package/src/typings/model.ts

@@ -1,22 +1,34 @@
 import { FileType } from '@tager/admin-services';
+import {
+  FieldConfigUnion,
+  FieldShortType,
+  OutgoingValueUnion,
+} from '@tager/admin-dynamic-field';
 
-interface HistoryType {
+export interface HistoryType {
   readonly datetime: string;
   readonly status: string;
 }
 
+export interface ParamType {
+  readonly label: string;
+  readonly value: string;
+}
+
 export interface ImportType {
   readonly id: number;
   readonly strategy: string;
   readonly status: string;
   readonly message: string | null;
   readonly history: Array<HistoryType>;
+  readonly params: Array<ParamType> | null;
   readonly file: FileType | null;
 }
 
 export interface StrategyType {
   readonly id: string;
   readonly name: string;
+  readonly fields: Array<FieldConfigUnion>;
 }
 
 export interface ModuleInfoType {
@@ -27,4 +39,5 @@ export interface ModuleInfoType {
 export interface ImportCreatePayload {
   strategy: string;
   file: string;
+  params: Array<FieldShortType<OutgoingValueUnion>>;
 }

package/src/views/ImportForm/ImportForm.helpers.ts

@@ -1,6 +1,7 @@
 import { OptionType, SingleFileInputValueType } from '@tager/admin-ui';
+import { FieldUnion, universalFieldUtils } from '@tager/admin-dynamic-field';
 
-import { ImportCreatePayload } from '../../typings/model';
+import { ImportCreatePayload, StrategyType } from '../../typings/model';
 
 export type FormValues = {
   strategy: OptionType | null;
@@ -8,10 +9,24 @@ export type FormValues = {
 };
 
 export function convertImportFormValuesToCreationPayload(
-  values: FormValues
+  values: FormValues,
+  templateValues: Array<FieldUnion>
 ): ImportCreatePayload {
   return {
     strategy: values.strategy?.value ?? '',
     file: values.file?.file.id ?? '',
+    params: templateValues.map((field) => ({
+      name: field.config.name,
+      value: universalFieldUtils.getOutgoingValue(field),
+    })),
   };
 }
+
+export function convertStrategiesToStrategyOptionList(
+  strategies: Array<StrategyType>
+): Array<OptionType> {
+  return strategies.map((strategy) => ({
+    value: strategy.id,
+    label: strategy.name,
+  }));
+}