@tager/admin-banners 0.3.5 → 1.0.0

package/src/hooks/useFetchZoneFields.ts

@@ -0,0 +1,39 @@
+import { computed, onMounted, Ref, SetupContext, watch } from 'vue';
+
+import { Nullable, ResourceRef, useResource } from '@tager/admin-services';
+
+import { getZoneFields } from '../services/requests';
+import { ZoneFields } from '../typings/zones';
+import { BannerFormValues } from '../typings/banners';
+
+export function useFetchZoneFields({
+  values,
+}: {
+  values: Ref<BannerFormValues>;
+}): ResourceRef<Nullable<ZoneFields>> {
+  const zoneId = computed(() => values.value.bannerZone?.value ?? '');
+
+  const [fetchZoneFields, resource] = useResource<Nullable<ZoneFields>>({
+    fetchResource: () => getZoneFields(zoneId.value),
+    initialValue: null,
+    resourceName: 'Zone Fields',
+  });
+
+  onMounted(() => {
+    if (!zoneId.value) {
+      return;
+    }
+
+    fetchZoneFields();
+  });
+
+  watch(zoneId, () => {
+    if (!zoneId.value) {
+      return;
+    }
+
+    fetchZoneFields();
+  });
+
+  return resource;
+}

package/src/hooks/useFetchZones.ts

@@ -1,17 +1,14 @@
-import { onMounted, SetupContext } from '@vue/composition-api';
+import { onMounted } from 'vue';
 
 import { ResourceRef, useResource } from '@tager/admin-services';
 
 import { getZones } from '../services/requests';
 import { Zone } from '../typings/zones';
 
-export function useFetchZones(params: {
-  context: SetupContext;
-}): ResourceRef<Zone[]> {
+export function useFetchZones(): ResourceRef<Zone[]> {
   const [fetchZones, resource] = useResource<Zone[]>({
     fetchResource: getZones,
     initialValue: [],
-    context: params.context,
     resourceName: 'Banner zones',
   });
 

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', 'banners', EN);
+  i18n.addTranslations('ru', 'banners', RU);
+}

package/src/locales/en.ts

@@ -1,4 +1,4 @@
-const EN = {
+export const EN = {
   home: 'Home',
   zone: 'Banner zone',
   zones: 'Banner zones',
@@ -24,6 +24,7 @@ const EN = {
   actions: 'actions',
   date: 'Date',
   name: 'Name',
+  priority: 'Priority',
 
   success: 'Success',
   error: 'Error',

package/src/locales/ru.ts

@@ -1,46 +1,45 @@
-import EN from './en';
+import {EN} from './en';
 
-const RU: typeof EN = {
-  home: 'Главная',
-  zone: 'Баннерная зона',
-  zones: 'Баннерные зоны',
-  banners: 'Баннеры',
-  bannerForm: 'Форма баннера',
-  createBanner: 'Добавить баннер',
-  updateBanner: 'Редактировать баннер',
-  link: 'Ссылка',
-  image: 'Картинка',
-  openNewTab: 'Открывать в новой вкладке',
-  period: 'Срок действия',
-  from: 'От',
-  to: 'До',
-  disabled: 'Выключен',
-  comment: 'Комментарий',
-  status: 'Статус',
-  bannerZoneIsDeleted: 'Баннерная зона удалена',
-  newTab: 'Новая вкладка',
-  yes: 'Да',
-  no: 'Нет',
-  edit: 'Редактировать',
-  remove: 'Удалить',
-  actions: 'Действия',
-  date: 'Дата',
-  name: 'Название',
+export const RU: typeof EN = {
+    home: 'Главная',
+    zone: 'Баннерная зона',
+    zones: 'Баннерные зоны',
+    banners: 'Баннеры',
+    bannerForm: 'Форма баннера',
+    createBanner: 'Добавить баннер',
+    updateBanner: 'Редактировать баннер',
+    link: 'Ссылка',
+    image: 'Картинка',
+    openNewTab: 'Открывать в новой вкладке',
+    period: 'Срок действия',
+    from: 'От',
+    to: 'До',
+    disabled: 'Выключен',
+    comment: 'Комментарий',
+    status: 'Статус',
+    bannerZoneIsDeleted: 'Баннерная зона удалена',
+    newTab: 'Новая вкладка',
+    yes: 'Да',
+    no: 'Нет',
+    edit: 'Редактировать',
+    remove: 'Удалить',
+    actions: 'Действия',
+    date: 'Дата',
+    name: 'Название',
+    priority: 'Приоритет',
 
-  success: 'Успех',
-  error: 'Ошибка',
+    success: 'Успех',
+    error: 'Ошибка',
 
-  statuses: {
-    waiting: 'В ожидании',
-    archived: 'Архивный',
-    active: 'Активный',
-    disabled: 'Отключен',
-  },
+    statuses: {
+        waiting: 'В ожидании',
+        archived: 'Архивный',
+        active: 'Активный',
+        disabled: 'Отключен',
+    },
 
-  bannerWasSuccessfullyCreated: 'Баннер успешно создан',
-  bannerWasSuccessfullyUpdated: 'Баннер успешно обновлен',
-  bannerCreationWasFailed: 'Не удалось создать баннер',
-  bannerUpdateWasFailed: 'Не удалось обновить баннер',
+    bannerWasSuccessfullyCreated: 'Баннер успешно создан',
+    bannerWasSuccessfullyUpdated: 'Баннер успешно обновлен',
+    bannerCreationWasFailed: 'Не удалось создать баннер',
+    bannerUpdateWasFailed: 'Не удалось обновить баннер',
 };
-
-export default RU;

package/src/main.ts

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

package/src/services/requests.ts

@@ -1,6 +1,6 @@
 import { request, ResponseBody } from '@tager/admin-services';
 
-import { Zone } from '../typings/zones';
+import { Zone, ZoneFields } from '../typings/zones';
 import { Banner, BannerPayload } from '../typings/banners';
 
 /** Zones **/
@@ -13,6 +13,12 @@ export function getZones(params?: {
   return request.get({ path: '/admin/adv/zones', params });
 }
 
+export function getZoneFields(
+  zoneId: string
+): Promise<ResponseBody<ZoneFields>> {
+  return request.get({ path: `/admin/adv/zones/${zoneId}` });
+}
+
 /** Banners **/
 
 export function getBanners(params?: {

package/src/typings/banners.ts

@@ -1,5 +1,11 @@
 import { FileType, Nullable } from '@tager/admin-services';
 import { OptionType, SingleFileInputValueType } from '@tager/admin-ui';
+import {
+  FieldShortType,
+  FieldUnion,
+  IncomingValueUnion,
+  OutgoingValueUnion,
+} from '@tager/admin-dynamic-field';
 
 export enum Status {
   Waiting = 'WAITING',
@@ -11,6 +17,7 @@ export enum Status {
 export interface Banner {
   id: number;
   status: Status;
+  priority: number;
   link: Nullable<string>;
   image: Nullable<FileType>;
   bannerZone: Nullable<string>;
@@ -19,26 +26,31 @@ export interface Banner {
   dateEnd: Nullable<string>;
   disabled: boolean;
   comment: Nullable<string>;
+  fields: FieldShortType<IncomingValueUnion>[];
 }
 
 export interface BannerFormValues {
   link: Nullable<string>;
   image: Nullable<SingleFileInputValueType>;
   bannerZone: Nullable<OptionType>;
+  priority: string;
   openNewTab: boolean;
   dateStart: string;
   dateEnd: string;
   disabled: boolean;
   comment: string;
+  fields: FieldUnion[];
 }
 
 export interface BannerPayload {
   link: Nullable<string>;
   image: Nullable<string>;
+  priority: number;
   bannerZone: string;
   openNewTab: boolean;
-  dateStart: string;
-  dateEnd: string;
+  dateStart: Nullable<string>;
+  dateEnd: Nullable<string>;
   disabled: boolean;
   comment: string;
+  fields: FieldShortType<OutgoingValueUnion>[];
 }

package/src/typings/zones.ts

@@ -1,5 +1,11 @@
+import { FieldConfigUnion } from '@tager/admin-dynamic-field';
+
 export interface Zone {
   id: string;
   name: string;
   bannersCount: number;
 }
+
+export interface ZoneFields extends Zone {
+  fields: FieldConfigUnion[];
+}

package/src/utils/paths.ts

@@ -0,0 +1,15 @@
+import {compile} from 'path-to-regexp';
+
+import {BANNERS_ROUTE_PATHS} from '../constants/paths';
+
+export function getBannersZoneListUrl() {
+    return BANNERS_ROUTE_PATHS.ZONE_LIST;
+}
+
+export function getBannersBannerListUrl() {
+    return BANNERS_ROUTE_PATHS.BANNER_LIST;
+}
+
+export function getBannersBannerFormUrl(params: { bannerId: number | string }) {
+    return compile(BANNERS_ROUTE_PATHS.BANNER_FORM)(params);
+}

package/src/views/Banners/BannerForm/BannerForm.helpers.ts

@@ -1,5 +1,6 @@
 import { OptionType } from '@tager/admin-ui';
 import { createId, Nullable } from '@tager/admin-services';
+import { universalFieldUtils } from '@tager/admin-dynamic-field';
 
 import {
   Banner,
@@ -16,6 +17,7 @@ export function convertBannerToFormValues(
   );
 
   return {
+    priority: String(banner?.priority ?? 1),
     link: banner?.link ?? '',
     image: banner?.image ? { id: createId(), file: banner.image } : null,
     bannerZone: foundZone ?? null,
@@ -24,6 +26,7 @@ export function convertBannerToFormValues(
     dateEnd: banner?.dateEnd ?? '',
     disabled: banner?.disabled ?? false,
     comment: banner?.comment ?? '',
+    fields: [],
   };
 }
 
@@ -32,7 +35,14 @@ export function convertBannerFormValuesToPayload(
 ): BannerPayload {
   return {
     ...values,
+    priority: values.priority ? Number(values.priority) : 1,
+    dateStart: values.dateStart ? values.dateStart : null,
+    dateEnd: values.dateEnd ? values.dateEnd : null,
     image: values.image?.file.id ?? null,
     bannerZone: values.bannerZone?.value ?? '',
+    fields: values.fields.map((field) => ({
+      name: field.config.name,
+      value: universalFieldUtils.getOutgoingValue(field),
+    })),
   };
 }