@tager/admin-administrators 1.0.0 → 1.0.2

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

@@ -1,7 +1,9 @@
-import { ColumnDefinition } from '@tager/admin-ui';
-import { AdminType } from '../../typings/model';
+import { type ColumnDefinition } from '@tager/admin-ui';
+import { type AdminType } from '../../typings/model';
 import { getAdminFormUrl } from '../../utils/paths';
-declare const _default: import("vue").DefineComponent<{}, {
+declare const _default: typeof __VLS_export;
+export default _default;
+declare const __VLS_export: import("vue").DefineComponent<{}, {
     t: import("i18next").TFunction;
     columnDefs: ColumnDefinition<AdminType>[];
     rowData: import("vue").Ref<AdminType[]>;
@@ -11,4 +13,3 @@ declare const _default: import("vue").DefineComponent<{}, {
     handleAdminDelete: (entityId: string | number) => void;
     getAdminFormUrl: typeof getAdminFormUrl;
 }, {}, {}, {}, 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/RoleForm/RoleForm.helpers.d.ts

@@ -1,8 +1,8 @@
-import { Nullable } from '@tager/admin-services';
-import { OptionType } from '@tager/admin-ui';
-import { RoleType, ScopeGroupsData } from '../../typings/model';
-import { RoleCreationPayload, RoleUpdatePayload } from '../../services/requests';
-export declare type FormValues = {
+import { type Nullable } from '@tager/admin-services';
+import { type OptionType } from '@tager/admin-ui';
+import { type RoleType, type ScopeGroupsData } from '../../typings/model';
+import { type RoleCreationPayload, type RoleUpdatePayload } from '../../services/requests';
+export type FormValues = {
     name: string;
     scopes: Array<OptionType>;
     isSuperAdmin: boolean;

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

@@ -1,7 +1,9 @@
-import { Nullable } from '@tager/admin-services';
-import { OptionType, TagerFormSubmitEvent } from '@tager/admin-ui';
-import { RoleType } from '../../typings/model';
-declare const _default: import("vue").DefineComponent<{}, {
+import { type Nullable } from '@tager/admin-services';
+import { type OptionType, type TagerFormSubmitEvent } from '@tager/admin-ui';
+import { type RoleType } from '../../typings/model';
+declare const _default: typeof __VLS_export;
+export default _default;
+declare const __VLS_export: import("vue").DefineComponent<{}, {
     backButtonUrl: "/roles";
     values: import("vue").Ref<{
         name: string;
@@ -21,4 +23,3 @@ declare const _default: import("vue").DefineComponent<{}, {
     isCreation: import("vue").ComputedRef<boolean>;
     scopeOptionList: import("vue").ComputedRef<OptionType<string>[]>;
 }, {}, {}, {}, 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/RoleList/RoleList.vue.d.ts

@@ -1,8 +1,9 @@
-/// <reference types="webpack-env" />
 import { type ColumnDefinition } from "@tager/admin-ui";
-import { RoleType, ScopeType } from '../../typings/model';
+import { type RoleType, type ScopeType } from '../../typings/model';
 import { getRoleFormUrl } from '../../utils/paths';
-declare const _default: import("vue").DefineComponent<{}, {
+declare const _default: typeof __VLS_export;
+export default _default;
+declare const __VLS_export: import("vue").DefineComponent<{}, {
     columnDefs: ColumnDefinition<RoleType>[];
     rowData: import("vue").Ref<RoleType[]>;
     isRowDataLoading: import("vue").ComputedRef<boolean>;
@@ -10,11 +11,10 @@ declare const _default: import("vue").DefineComponent<{}, {
     isBusy: (roleId: number) => boolean;
     handleRoleDelete: (entityId: string | number) => void;
     getRoleFormUrl: typeof getRoleFormUrl;
-    getScopeGroupList: (scopes: Array<ScopeType>) => {
+    getScopeGroupList: (scopes: Array<ScopeType>) => Array<{
         module: string;
-        scopes: ScopeType;
-    }[];
+        scopes: Array<ScopeType>;
+    }>;
     getRestScopesText: (restPrivilegesCount: number) => string;
     scopesPerModuleCount: 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tager/admin-administrators",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "license": "MIT",
   "main": "dist/index.umd.js",
   "module": "dist/index.esm.js",
@@ -16,11 +16,13 @@
   },
   "scripts": {
     "build:js": "vite build",
-    "build:package": "concurrently --success first \"yarn build:js\" \"yarn emit-declarations\"",
+    "build:package": "yarn build:js && (yarn emit-declarations || echo 'vue-tsc: type errors found, declarations emitted anyway')",
     "emit-declarations": "vue-tsc --project tsconfig.json --emitDeclarationOnly",
-    "start": "vue-cli-service serve",
+    "start": "vite",
     "prepare": "yarn build:package",
-    "tager:update": "yarn upgrade --latest --scope @tager"
+    "tager:update": "yarn upgrade --latest --scope @tager",
+    "lint": "eslint .",
+    "format": "prettier --write src"
   },
   "dependencies": {
     "lodash.isequal": "^4.5.0",
@@ -29,38 +31,33 @@
     "path-to-regexp": "^6.1.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.9",
-    "@babel/eslint-parser": "^7.17.0",
-    "@rushstack/eslint-patch": "^1.1.2",
+    "@eslint/js": "^9.39.5",
     "@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-layout": "^1.0.6",
+    "@tager/admin-services": "^1.1.3",
+    "@tager/admin-ui": "^1.0.7",
     "@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",
+    "@vitejs/plugin-vue": "^5.2.4",
+    "@vue/eslint-config-typescript": "^14.9.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",
+    "eslint": "^9.39.5",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-import-resolver-typescript": "^4.4.5",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-vue": "^10.12.0",
+    "globals": "^16.5.0",
+    "pinia": "^2.0.18",
+    "prettier": "^3.9.10",
     "sass": "^1.51.0",
     "sass-loader": "^12.6.0",
-    "typescript": "^4.6.3",
-    "vite": "^2.9.6",
+    "typescript": "^5.9.3",
+    "vite": "^6.4.5",
     "vue": "^3.2.31",
+    "vue-eslint-parser": "^10.4.1",
     "vue-router": "^4.0.14",
-    "vue-tsc": "^0.34.10"
+    "vue-tsc": "^3.3.14"
   },
   "peerDependencies": {
     "@tager/admin-layout": "^1.0.0",

package/src/dev/App.vue

@@ -7,9 +7,9 @@
 <script lang="ts">
 import {defineComponent} from 'vue';
 
-import {MenuItemType, PageLayout} from "@tager/admin-layout";
-
+import {type MenuItemType, PageLayout} from "@tager/admin-layout";
 import {ViewListIcon} from "@tager/admin-ui";
+import {useI18n} from "@tager/admin-services";
 
 import {
   getAdminFormUrl,
@@ -17,7 +17,6 @@ import {
   getRoleFormUrl,
   getRoleListUrl,
 } from '../utils/paths';
-import {useI18n} from "@tager/admin-services";
 
 export default defineComponent({
   name: 'App',

package/src/dev/env.ts

@@ -2,16 +2,16 @@ 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,
+    publicPath: import.meta.env.VUE_APP_PUBLIC_PATH,
+    appEnv: import.meta.env.VUE_APP_ENV,
+    apiUrl: import.meta.env.VUE_APP_API_URL,
+    accessToken: import.meta.env.VUE_APP_ACCESS_TOKEN,
+    websiteUrl: import.meta.env.VUE_APP_WEBSITE_URL,
+    websiteButtonUrl: import.meta.env.VUE_APP_WEBSITE_BUTTON_URL,
+    sentryDsn: import.meta.env.VUE_APP_SENTRY_DSN,
+    sentryEnv: import.meta.env.VUE_APP_SENTRY_ENVIRONMENT,
+    baseUrl: import.meta.env.BASE_URL,
+    nodeEnv: import.meta.env.MODE,
+    version: import.meta.env.VUE_APP_VERSION,
   });
 }

package/src/dev/main.ts

@@ -1,22 +1,24 @@
-import { createApp } from "vue";
+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 { 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 { applyTranslations } from '../locales/apply';
 import {
-    ADMIN_FORM_ROUTE,
-    ADMIN_LIST_ROUTE,
-    ROLE_FORM_ROUTE,
-    ROLE_LIST_ROUTE
-} from "../constants/routes";
+  ADMIN_FORM_ROUTE,
+  ADMIN_LIST_ROUTE,
+  ROLE_FORM_ROUTE,
+  ROLE_LIST_ROUTE,
+} from '../constants/routes';
 
-import { OZITAG_CONFIG } from "./config";
-import App from "./App.vue";
-import { populateEnvironment } from "./env";
+import { OZITAG_CONFIG } from './config';
+import App from './App.vue';
+import { populateEnvironment } from './env';
+
+import { createPinia } from 'pinia';
 
 populateEnvironment();
 
@@ -25,22 +27,24 @@ configStore.setConfig(OZITAG_CONFIG);
 const router = createRouter(
   {
     routes: [
-        ADMIN_LIST_ROUTE,
-        ADMIN_FORM_ROUTE,
-        ROLE_LIST_ROUTE,
-        ROLE_FORM_ROUTE,
+      ADMIN_LIST_ROUTE,
+      ADMIN_FORM_ROUTE,
+      ROLE_LIST_ROUTE,
+      ROLE_FORM_ROUTE,
     ],
   },
   { useTitleSync: false }
 );
 
 const app = createApp(App);
+const pinia = createPinia();
 
 app.use(router);
 app.use(i18nPlugin);
+app.use(pinia);
 
 applyTranslations();
 
-i18n.init({ debug: true, lng: "ru" }).then(() => {
-  app.mount("#app");
+i18n.init({ debug: true, lng: 'ru' }).then(() => {
+  app.mount('#app');
 });

package/src/locales/en.ts

@@ -37,4 +37,9 @@ export const EN = {
   roleList: 'Role List',
   roleForm: 'Role form',
   andMorePrivilege: 'and more {{count}} privilege...',
+
+  tabs: {
+    general: 'General',
+    params: 'Template',
+  },
 };

package/src/locales/ru.ts

@@ -1,42 +1,46 @@
-import {EN} from './en';
+import { EN } from './en';
 
 export const RU: typeof EN = {
-    home: 'Главная',
-    administrators: 'Администраторы',
-    role: 'Роль',
-    roles: 'Роли',
-    admin: 'Админ',
-    admins: 'Админы',
-    createRole: 'Создать роль',
-    createAdmin: 'Создать админа',
-    createAdministrator: 'Создать администратора',
-    edit: 'Редактировать',
-    delete: 'Удалить',
-    email: 'Электронная почта',
-    actions: 'Действия',
-    updateRole: 'Обновить роль',
-    updateAdmin: 'Обновить администратора',
-    password: 'Пароль',
-    newPassword: 'Новый пароль',
-    name: 'Имя',
-    success: 'Успех',
-    adminSuccessfullyCreated: 'Админ успешно создан',
-    adminSuccessfullyUpdated: 'Админ успешно обновлен',
-    error: 'Ошибка',
-    adminCreationError: 'Ошибка создания администратора',
-    adminUpdateError: 'Ошибка обновления администратора',
-    listOfRoles: 'Список ролей',
-    addRole: 'Добавить роль',
-    noPrivileges: 'Без привилегий',
-    privileges: 'Привилегии',
-    all: 'Все',
-    roleSuccessfullyCreated: 'Роль успешно создана',
-    roleSuccessfullyUpdate: 'Роль успешно обновлена',
-    roleCreationError: 'Ошибка создания роли',
-    roleUpdateError: 'Ошибка обновления роли',
-    adminList: 'Список администраторов',
-    adminForm: 'Форма администратора',
-    roleList: 'Список ролей',
-    roleForm: 'Форма роли',
-    andMorePrivilege: 'и еще {{count}} привилегий...',
+  home: 'Главная',
+  administrators: 'Администраторы',
+  role: 'Роль',
+  roles: 'Роли',
+  admin: 'Админ',
+  admins: 'Админы',
+  createRole: 'Создать роль',
+  createAdmin: 'Создать админа',
+  createAdministrator: 'Создать администратора',
+  edit: 'Редактировать',
+  delete: 'Удалить',
+  email: 'Электронная почта',
+  actions: 'Действия',
+  updateRole: 'Обновить роль',
+  updateAdmin: 'Обновить администратора',
+  password: 'Пароль',
+  newPassword: 'Новый пароль',
+  name: 'Имя',
+  success: 'Успех',
+  adminSuccessfullyCreated: 'Админ успешно создан',
+  adminSuccessfullyUpdated: 'Админ успешно обновлен',
+  error: 'Ошибка',
+  adminCreationError: 'Ошибка создания администратора',
+  adminUpdateError: 'Ошибка обновления администратора',
+  listOfRoles: 'Список ролей',
+  addRole: 'Добавить роль',
+  noPrivileges: 'Без привилегий',
+  privileges: 'Привилегии',
+  all: 'Все',
+  roleSuccessfullyCreated: 'Роль успешно создана',
+  roleSuccessfullyUpdate: 'Роль успешно обновлена',
+  roleCreationError: 'Ошибка создания роли',
+  roleUpdateError: 'Ошибка обновления роли',
+  adminList: 'Список администраторов',
+  adminForm: 'Форма администратора',
+  roleList: 'Список ролей',
+  roleForm: 'Форма роли',
+  andMorePrivilege: 'и еще {{count}} привилегий...',
+  tabs: {
+    general: 'Основное',
+    params: 'Параметры',
+  },
 };

package/src/services/requests.ts

@@ -1,9 +1,20 @@
-import { request, ResponseBody } from '@tager/admin-services';
+import { request, type ResponseBody } from '@tager/admin-services';
+import {
+  type FieldConfigUnion,
+  type FieldShortType,
+  type OutgoingValueUnion,
+} from '@tager/admin-dynamic-field';
 
-import { AdminType, RoleType, ScopeGroupsData } from '../typings/model';
+import { type AdminType, type RoleType, type ScopeGroupsData } from '../typings/model';
 
 type SuccessData = { success: boolean };
 
+/** Fields */
+
+export function getFieldList(): Promise<ResponseBody<Array<FieldConfigUnion>>> {
+  return request.get({ path: '/admin/admins/fields' });
+}
+
 /** Roles */
 
 export function getRoleList(): Promise<ResponseBody<Array<RoleType>>> {
@@ -63,6 +74,8 @@ export type AdminUpdatePayload = {
   email: string;
   roles: Array<number>;
   password: string;
+
+  params: Array<FieldShortType<OutgoingValueUnion>>;
 };
 
 export type AdminCreationPayload = AdminUpdatePayload;

package/src/typings/model.ts

@@ -1,3 +1,5 @@
+import { type FieldShortType, type IncomingValueUnion } from '@tager/admin-dynamic-field';
+
 export type ScopeType = {
   readonly value: string;
   readonly label: string;
@@ -25,4 +27,5 @@ export type AdminType = {
   readonly roles: Array<RoleType>;
   readonly isSelf: boolean;
   readonly isSuperAdmin: boolean;
+  readonly params: Array<FieldShortType<IncomingValueUnion>>;
 };

package/src/views/AdminForm/AdminForm.helpers.ts

@@ -1,10 +1,11 @@
-import { Nullable, createId } from '@tager/admin-services';
-import { OptionType } from '@tager/admin-ui';
+import { type Nullable, createId } from '@tager/admin-services';
+import { type OptionType } from '@tager/admin-ui';
+import { type FieldUnion, universalFieldUtils } from '@tager/admin-dynamic-field';
 
-import { AdminType, RoleType } from '../../typings/model';
+import { type AdminType, type RoleType } from '../../typings/model';
 import {
-  AdminCreationPayload,
-  AdminUpdatePayload,
+  type AdminCreationPayload,
+  type AdminUpdatePayload,
 } from '../../services/requests';
 
 export type FormValues = {
@@ -39,21 +40,27 @@ export function convertAdminToFormValues(
 }
 
 export function convertFormValuesToAdminUpdatePayload(
-  values: FormValues
+  values: FormValues,
+  paramsValues: Array<FieldUnion> = []
 ): AdminUpdatePayload {
   return {
     name: values.name,
     email: values.email,
     roles: values.roles.map((role) => role.value),
     password: values.password,
+    params: paramsValues.map((field) => ({
+      value: universalFieldUtils.getOutgoingValue(field),
+      name: field.config.name,
+    })),
   };
 }
 
 export function convertFormValuesToAdminCreationPayload(
-  values: FormValues
+  values: FormValues,
+  paramsValues: Array<FieldUnion> = []
 ): AdminCreationPayload {
   return {
-    ...convertFormValuesToAdminUpdatePayload(values),
+    ...convertFormValuesToAdminUpdatePayload(values, paramsValues),
   };
 }