@tager/admin-blog 0.3.38 → 0.3.42

package/dist/locales/en.d.ts

@@ -31,7 +31,6 @@ declare const EN: {
     actions: string;
     updatePost: string;
     title: string;
-    status: string;
     link: string;
     excerpt: string;
     body: string;
@@ -73,8 +72,15 @@ declare const EN: {
     };
     parentCategory: string;
     noParent: string;
+    status: string;
     statusPublished: string;
     statusDraft: string;
     statusArchived: string;
+    scheduleArchive: string;
+    schedulePublish: string;
+    archiveAt: string;
+    publishAt: string;
+    archiveAtLabel: string;
+    publishAtLabel: string;
 };
 export default EN;

package/dist/services/requests.d.ts

@@ -30,6 +30,8 @@ export interface PostCreationPayload {
     relatedPosts: number[];
     tags: string[];
     additionalFields: FieldShortType<OutgoingValueUnion>[];
+    archiveAt: Nullable<string>;
+    publishAt: Nullable<string>;
 }
 export declare function createBlogPost(payload: PostCreationPayload): Promise<ResponseBody<PostFull>>;
 export declare type PostUpdatePayload = PostCreationPayload & {

package/dist/typings/model.d.ts

@@ -53,6 +53,8 @@ export interface PostFull extends SeoInfo {
     readonly relatedPosts: Pick<PostShort, 'id' | 'title'>[];
     readonly tags: string[];
     readonly additionalFields: FieldShortType<IncomingValueUnion>[];
+    readonly archiveAt: Nullable<string>;
+    readonly publishAt: Nullable<string>;
 }
 export interface Language {
     readonly id: string;
@@ -84,6 +86,7 @@ export interface CategoryFormValues {
     name: string;
     parent: OptionType<Nullable<number>>;
     urlAlias: string;
+    isDefault: boolean;
     pageTitle: Nullable<string>;
     pageDescription: Nullable<string>;
     pageKeywords: Nullable<string>;

package/dist/views/Categories/CategoryForm/CategoryForm.vue.d.ts

@@ -16,6 +16,7 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
             disabled?: boolean | undefined;
         };
         urlAlias: string;
+        isDefault: boolean;
         pageTitle: Nullable<string>;
         pageDescription: Nullable<string>;
         pageKeywords: Nullable<string>;
@@ -72,6 +73,7 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
             disabled?: boolean | undefined;
         };
         urlAlias: string;
+        isDefault: boolean;
         pageTitle: Nullable<string>;
         pageDescription: Nullable<string>;
         pageKeywords: Nullable<string>;

package/dist/views/Posts/PostForm/PostForm.helpers.d.ts

@@ -1,8 +1,10 @@
+import { TFunction } from 'i18next';
 import { Nullable } from '@tager/admin-services';
 import { OptionType, SingleFileInputValueType } from '@tager/admin-ui';
 import { FieldConfigUnion, FieldUnion } from '@tager/admin-dynamic-field';
 import { PostCreationPayload, PostUpdatePayload } from '../../../services/requests';
 import { Category, PostFull } from '../../../typings/model';
+export declare const getStatusOptions: (t: TFunction) => OptionType[];
 export interface FormValues {
     title: string;
     excerpt: string;
@@ -20,8 +22,11 @@ export interface FormValues {
     relatedPosts: OptionType<number>[];
     tags: string;
     additionalFields: FieldUnion[];
+    status: OptionType;
+    statusDateEnabled: boolean;
+    statusDate: Nullable<string>;
 }
-export declare function convertPostToFormValues(post: Nullable<PostFull>, languageOptionList: OptionType[], postOptionList: OptionType<number>[], additionalFieldList: FieldConfigUnion[]): FormValues;
+export declare function convertPostToFormValues(post: Nullable<PostFull>, languageOptionList: OptionType[], postOptionList: OptionType<number>[], additionalFieldList: FieldConfigUnion[], statusOptions: OptionType[]): FormValues;
 export declare function convertFormValuesToCreationPayload(values: FormValues): PostCreationPayload;
 export declare function convertFormValuesToUpdatePayload(values: FormValues): PostUpdatePayload;
 export declare function convertCategoryListToOptions(categoryList: Category[], languageId: Nullable<string>): OptionType<number>[];

package/dist/views/Posts/PostForm/PostForm.vue.d.ts

@@ -4657,6 +4657,13 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
             };
             value: null;
         })[];
+        status: {
+            value: string;
+            label: string;
+            disabled?: boolean | undefined;
+        };
+        statusDateEnabled: boolean;
+        statusDate: Nullable<string>;
     }>;
     errors: import("@vue/composition-api").Ref<{
         [x: string]: string;
@@ -4679,11 +4686,12 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
         href: string;
         target?: string | undefined;
     }[]>;
-    handleSeoFieldGroupChange: ({ title, description, image, }: SeoChangeEvent) => void;
+    handleSeoFieldGroupChange: ({ title, description, image }: SeoChangeEvent) => void;
     handleTitleChange: (value: string) => void;
     handleAliasChange: () => void;
     urlAliasTemplate: import("@vue/composition-api").ComputedRef<string>;
     handleCategoriesChange: (selectedOptions: OptionType<number>[]) => void;
+    statusOptions: import("@vue/composition-api").ComputedRef<OptionType<string>[]>;
 }> & {
     [key: string]: unknown;
 }, {}, {}, unknown, {
@@ -9347,6 +9355,13 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
             };
             value: null;
         })[];
+        status: {
+            value: string;
+            label: string;
+            disabled?: boolean | undefined;
+        };
+        statusDateEnabled: boolean;
+        statusDate: Nullable<string>;
     }>;
     errors: import("@vue/composition-api").Ref<{
         [x: string]: string;
@@ -9369,11 +9384,12 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
         href: string;
         target?: string | undefined;
     }[]>;
-    handleSeoFieldGroupChange: ({ title, description, image, }: SeoChangeEvent) => void;
+    handleSeoFieldGroupChange: ({ title, description, image }: SeoChangeEvent) => void;
     handleTitleChange: (value: string) => void;
     handleAliasChange: () => void;
     urlAliasTemplate: import("@vue/composition-api").ComputedRef<string>;
     handleCategoriesChange: (selectedOptions: OptionType<number>[]) => void;
+    statusOptions: import("@vue/composition-api").ComputedRef<OptionType<string>[]>;
 }>, {
     [x: string]: any;
 }, {}, {}, {

package/dist/views/Posts/PostList/PostList.vue.d.ts

@@ -1,7 +1,10 @@
-import { ColumnDefinition } from '@tager/admin-ui';
+import { ColumnDefinition, OptionType, formatDateTime } from '@tager/admin-ui';
 import { getBlogPostFormUrl } from '../../../constants/paths';
 import { Category, PostShort } from '../../../typings/model';
+import { getStatuses } from './PostList.helpers';
 declare const _default: import("vue").ComponentOptions<import("vue").default, import("@vue/composition-api").ShallowUnwrapRef<{
+    t: import("i18next").TFunction;
+    formatDateTime: typeof formatDateTime;
     columnDefs: import("@vue/composition-api").ComputedRef<ColumnDefinition<PostShort>[]>;
     rowData: import("@vue/composition-api").ComputedRef<PostShort[]>;
     handleResourceDelete: (entityId: string | number) => void;
@@ -16,15 +19,18 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     pageNumber: import("@vue/composition-api").Ref<number>;
     pageCount: import("@vue/composition-api").ComputedRef<number>;
     pageSize: import("@vue/composition-api").Ref<number>;
-    categoryFilter: import("@vue/composition-api").Ref<import("@tager/admin-ui").OptionType<string>[]>;
-    categoryOptionList: import("@vue/composition-api").ComputedRef<import("@tager/admin-ui").OptionType<string>[]>;
+    categoryFilter: import("@vue/composition-api").Ref<OptionType<string>[]>;
+    categoryOptionList: import("@vue/composition-api").ComputedRef<OptionType<string>[]>;
     isLangSpecific: import("@vue/composition-api").ComputedRef<boolean>;
-    languageFilter: import("@vue/composition-api").Ref<import("@tager/admin-ui").OptionType<string>[]>;
-    languageOptionList: import("@vue/composition-api").ComputedRef<import("@tager/admin-ui").OptionType<string>[]>;
+    languageFilter: import("@vue/composition-api").Ref<OptionType<string>[]>;
+    languageOptionList: import("@vue/composition-api").ComputedRef<OptionType<string>[]>;
     fromDateFilter: import("@vue/composition-api").Ref<string>;
     toDateFilter: import("@vue/composition-api").Ref<string>;
+    statusFilter: import("@vue/composition-api").Ref<OptionType<string>[]>;
+    statusOptionList: import("@vue/composition-api").ComputedRef<OptionType<string>[]>;
     tags: import("@vue/composition-api").ComputedRef<import("@tager/admin-ui").FilterTagType[]>;
     tagRemovalHandler: (event: import("@tager/admin-ui").FilterTagType) => void;
+    getStatuses: typeof getStatuses;
     handleResourceClone: (entityId: string | number) => void;
     isBusy: (postId: number) => boolean;
 }> & {
@@ -34,6 +40,8 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
 }> & import("vue").VueConstructor<import("vue").default> & (new (...args: any[]) => import("@vue/composition-api").ComponentRenderProxy<{
     [x: string]: any;
 }, import("@vue/composition-api").ShallowUnwrapRef<{
+    t: import("i18next").TFunction;
+    formatDateTime: typeof formatDateTime;
     columnDefs: import("@vue/composition-api").ComputedRef<ColumnDefinition<PostShort>[]>;
     rowData: import("@vue/composition-api").ComputedRef<PostShort[]>;
     handleResourceDelete: (entityId: string | number) => void;
@@ -48,15 +56,18 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     pageNumber: import("@vue/composition-api").Ref<number>;
     pageCount: import("@vue/composition-api").ComputedRef<number>;
     pageSize: import("@vue/composition-api").Ref<number>;
-    categoryFilter: import("@vue/composition-api").Ref<import("@tager/admin-ui").OptionType<string>[]>;
-    categoryOptionList: import("@vue/composition-api").ComputedRef<import("@tager/admin-ui").OptionType<string>[]>;
+    categoryFilter: import("@vue/composition-api").Ref<OptionType<string>[]>;
+    categoryOptionList: import("@vue/composition-api").ComputedRef<OptionType<string>[]>;
     isLangSpecific: import("@vue/composition-api").ComputedRef<boolean>;
-    languageFilter: import("@vue/composition-api").Ref<import("@tager/admin-ui").OptionType<string>[]>;
-    languageOptionList: import("@vue/composition-api").ComputedRef<import("@tager/admin-ui").OptionType<string>[]>;
+    languageFilter: import("@vue/composition-api").Ref<OptionType<string>[]>;
+    languageOptionList: import("@vue/composition-api").ComputedRef<OptionType<string>[]>;
     fromDateFilter: import("@vue/composition-api").Ref<string>;
     toDateFilter: import("@vue/composition-api").Ref<string>;
+    statusFilter: import("@vue/composition-api").Ref<OptionType<string>[]>;
+    statusOptionList: import("@vue/composition-api").ComputedRef<OptionType<string>[]>;
     tags: import("@vue/composition-api").ComputedRef<import("@tager/admin-ui").FilterTagType[]>;
     tagRemovalHandler: (event: import("@tager/admin-ui").FilterTagType) => void;
+    getStatuses: typeof getStatuses;
     handleResourceClone: (entityId: string | number) => void;
     isBusy: (postId: number) => boolean;
 }>, {

package/dist/views/Posts/PostList/hooks/useAdvancedSearch.d.ts

@@ -5,6 +5,7 @@ interface Params {
     context: SetupContext;
     categoryList: ComputedRef<Category[]>;
     languageList: ComputedRef<Language[]>;
+    statusOptionList: ComputedRef<OptionType[]>;
 }
 interface State {
     categoryFilter: Ref<OptionType[]>;
@@ -13,10 +14,11 @@ interface State {
     languageOptionList: ComputedRef<OptionType[]>;
     fromDateFilter: Ref<string>;
     toDateFilter: Ref<string>;
+    statusFilter: Ref<OptionType[]>;
     filterParams: ComputedRef<Record<string, string | string[]>>;
     tags: ComputedRef<FilterTagType[]>;
     tagRemovalHandler(event: FilterTagType): void;
 }
 export declare const dateFormat: (date: string) => string;
-export declare function useAdvancedSearch({ context, categoryList, languageList, }: Params): State;
+export declare function useAdvancedSearch({ context, categoryList, languageList, statusOptionList, }: Params): State;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tager/admin-blog",
-  "version": "0.3.38",
+  "version": "0.3.42",
   "license": "MIT",
   "main": "dist/index.umd.js",
   "module": "dist/index.esm.js",
@@ -27,9 +27,9 @@
     "@rollup/plugin-commonjs": "^15.0.0",
     "@rollup/plugin-node-resolve": "^9.0.0",
     "@tager/admin-dynamic-field": "^0.1.18",
-    "@tager/admin-layout": "^0.5.3",
+    "@tager/admin-layout": "^0.5.4",
     "@tager/admin-services": "^0.2.26",
-    "@tager/admin-ui": "^0.8.85",
+    "@tager/admin-ui": "^0.8.96",
     "@types/lodash.isequal": "^4.5.5",
     "@types/lodash.pick": "^4.4.6",
     "@types/node": "12.x",

package/src/locales/en.ts

@@ -31,7 +31,6 @@ const EN = {
   actions: 'Actions',
   updatePost: 'Update post',
   title: 'Title',
-  status: 'Status',
   link: 'Link',
   excerpt: 'Excerpt',
   body: 'Body',
@@ -77,9 +76,17 @@ const EN = {
   parentCategory: 'Parent category',
   noParent: 'No parent',
 
+  status: 'Status',
   statusPublished: 'Published',
   statusDraft: 'Draft',
-  statusArchived: 'Archived'
+  statusArchived: 'Archived',
+
+  scheduleArchive: 'Schedule archive',
+  schedulePublish: 'Schedule publish',
+  archiveAt: 'Archive at',
+  publishAt: 'Publish at',
+  archiveAtLabel: 'Archive at',
+  publishAtLabel: 'Publish at',
 };
 
 export default EN;

package/src/locales/ru.ts

@@ -34,7 +34,6 @@ const RU: typeof EN = {
   updatePost: 'Обновить пост',
   title: 'Заголовок',
   link: 'Ссылка',
-  status: 'Статус',
   excerpt: 'Краткое описание',
   defaultCategory: 'Категория по-умолчанию',
   body: 'Содержание',
@@ -79,9 +78,17 @@ const RU: typeof EN = {
   parentCategory: 'Родительская категория',
   noParent: 'Нет родительской',
 
+  status: 'Статус',
   statusPublished: 'Опубликован',
   statusDraft: 'Черновик',
-  statusArchived: 'Снят с публикации'
+  statusArchived: 'В архиве',
+
+  scheduleArchive: 'Запланировать перенос в архив',
+  schedulePublish: 'Запланировать публикацию',
+  archiveAt: 'Перенести в архив в',
+  publishAt: 'Опубликовать в',
+  archiveAtLabel: 'Перенос в архив',
+  publishAtLabel: 'Публикация',
 };
 
 export default RU;

package/src/services/requests.ts

@@ -53,6 +53,8 @@ export interface PostCreationPayload {
   relatedPosts: number[];
   tags: string[];
   additionalFields: FieldShortType<OutgoingValueUnion>[];
+  archiveAt: Nullable<string>;
+  publishAt: Nullable<string>;
 }
 
 export function createBlogPost(

package/src/typings/model.ts

@@ -62,6 +62,8 @@ export interface PostFull extends SeoInfo {
   readonly relatedPosts: Pick<PostShort, 'id' | 'title'>[];
   readonly tags: string[];
   readonly additionalFields: FieldShortType<IncomingValueUnion>[];
+  readonly archiveAt: Nullable<string>;
+  readonly publishAt: Nullable<string>;
 }
 
 export interface Language {
@@ -98,6 +100,7 @@ export interface CategoryFormValues {
   name: string;
   parent: OptionType<Nullable<number>>;
   urlAlias: string;
+  isDefault: boolean;
 
   pageTitle: Nullable<string>;
   pageDescription: Nullable<string>;

package/src/views/Categories/CategoryForm/CategoryForm.helpers.ts

@@ -25,6 +25,7 @@ export function convertCategoryToFormValues(
       name: '',
       parent: { value: null, label: t('blog:noParent') },
       urlAlias: '',
+      isDefault: false,
 
       pageTitle: '',
       pageDescription: '',
@@ -37,6 +38,7 @@ export function convertCategoryToFormValues(
 
   return {
     language: currentLangOption ?? null,
+    isDefault: category.isDefault,
     name: category.name,
     parent: category.parent
       ? { value: category.parent.id, label: category.parent.name }
@@ -62,7 +64,7 @@ export function convertCategoryFormValuesToPayload(
     name: values.name,
     parent: values.parent.value,
     urlAlias: values.urlAlias,
-    isDefault: false,
+    isDefault: values.isDefault,
 
     pageTitle: values.pageTitle,
     pageDescription: values.pageDescription,

package/src/views/Categories/CategoryForm/CategoryForm.vue

@@ -62,6 +62,13 @@
               :error="errors.language"
             />
 
+            <form-field-checkbox
+              v-model="values.isDefault"
+              name="isDefault"
+              :label="$t('blog:defaultCategory')"
+              :error="errors.isDefault"
+            />
+
             <form-field
               v-model="values.name"
               name="name"

package/src/views/Posts/PostForm/PostForm.helpers.ts

@@ -1,18 +1,26 @@
+import { TFunction } from 'i18next';
+
 import { createId, Nullable } from '@tager/admin-services';
 import { OptionType, SingleFileInputValueType } from '@tager/admin-ui';
 import {
   FieldConfigUnion,
   FieldUnion,
-  universalFieldUtils,
+  universalFieldUtils
 } from '@tager/admin-dynamic-field';
 
 import {
   PostCreationPayload,
-  PostUpdatePayload,
+  PostUpdatePayload
 } from '../../../services/requests';
 import { getNameWithDepth } from '../../../utils/common';
 import { Category, PostFull } from '../../../typings/model';
 
+export const getStatusOptions = (t: TFunction): OptionType[] => [
+  { label: t('blog:statusPublished'), value: 'PUBLISHED' },
+  { label: t('blog:statusDraft'), value: 'DRAFT' },
+  { label: t('blog:statusArchived'), value: 'ARCHIVED' }
+];
+
 export interface FormValues {
   title: string;
   excerpt: string;
@@ -30,13 +38,17 @@ export interface FormValues {
   relatedPosts: OptionType<number>[];
   tags: string;
   additionalFields: FieldUnion[];
+  status: OptionType;
+  statusDateEnabled: boolean;
+  statusDate: Nullable<string>;
 }
 
 export function convertPostToFormValues(
   post: Nullable<PostFull>,
   languageOptionList: OptionType[],
   postOptionList: OptionType<number>[],
-  additionalFieldList: FieldConfigUnion[]
+  additionalFieldList: FieldConfigUnion[],
+  statusOptions: OptionType[]
 ): FormValues {
   if (!post) {
     return {
@@ -58,6 +70,9 @@ export function convertPostToFormValues(
       additionalFields: additionalFieldList.map((fieldConfig) =>
         universalFieldUtils.createFormField(fieldConfig, null)
       ),
+      status: statusOptions[0],
+      statusDateEnabled: false,
+      statusDate: null
     };
   }
 
@@ -69,6 +84,10 @@ export function convertPostToFormValues(
     post.relatedPosts.some((relatedPost) => relatedPost.id === option.value)
   );
 
+  const foundStatus =
+    statusOptions.find(({ value }) => value === post.status) ??
+    statusOptions[0];
+
   return {
     title: post.title,
     excerpt: post.excerpt,
@@ -89,20 +108,23 @@ export function convertPostToFormValues(
     urlAlias: post.urlAlias,
     categories: post.categories.map((category) => ({
       value: category.id,
-      label: category.name,
+      label: category.name
     })),
     language: currentLangOption ?? null,
     relatedPosts: selectedPostOptionList,
     tags: post.tags.join(','),
-    additionalFields: additionalFieldList.map((fieldConfig, index) => {
+    additionalFields: additionalFieldList.map((fieldConfig) => {
       const postAdditionalField = post.additionalFields.find(
-        (item) => item.name === fieldConfig.name
+        ({ name }) => name === fieldConfig.name
       );
       return universalFieldUtils.createFormField(
         fieldConfig,
         postAdditionalField?.value
       );
     }),
+    status: foundStatus,
+    statusDateEnabled: post.status === 'PUBLISHED' ? !!post.archiveAt : (post.status === 'DRAFT' ? !!post.publishAt : false),
+    statusDate: post.status === 'PUBLISHED' && post.archiveAt ? post.archiveAt.substr(0, 10) : (post.status === 'DRAFT' && post.publishAt ? post.publishAt.substr(0, 10) : null)
   };
 }
 
@@ -121,7 +143,6 @@ export function convertFormValuesToCreationPayload(
     pageTitle: values.pageTitle,
     pageDescription: values.pageDescription,
     openGraphImage: values.openGraphImage?.file.id ?? null,
-    status: 'PUBLISHED',
     categories: values.categories.map((option) => option.value),
     language: values.language?.value ?? null,
     relatedPosts: values.relatedPosts.map(
@@ -130,8 +151,11 @@ export function convertFormValuesToCreationPayload(
     tags: values.tags.split(',').filter((tag) => tag.trim().length > 0),
     additionalFields: values.additionalFields.map((field) => ({
       name: field.config.name,
-      value: universalFieldUtils.getOutgoingValue(field),
+      value: universalFieldUtils.getOutgoingValue(field)
     })),
+    status: values.status.value,
+    archiveAt: values.status.value === 'PUBLISHED' && values.statusDateEnabled && values.statusDate ? values.statusDate : null,
+    publishAt: values.status.value === 'DRAFT' && values.statusDateEnabled && values.statusDate ? values.statusDate : null
   };
 }
 
@@ -140,7 +164,7 @@ export function convertFormValuesToUpdatePayload(
 ): PostUpdatePayload {
   return {
     ...convertFormValuesToCreationPayload(values),
-    urlAlias: values.urlAlias,
+    urlAlias: values.urlAlias
   };
 }
 
@@ -152,6 +176,6 @@ export function convertCategoryListToOptions(
     .filter(({ language }) => (languageId ? language === languageId : true))
     .map(({ id, name, depth }) => ({
       value: id,
-      label: getNameWithDepth(name, depth),
+      label: getNameWithDepth(name, depth)
     }));
 }