@tager/admin-blog 0.3.31 → 0.3.36

package/src/views/Categories/CategoryList/CategoryList.vue

@@ -1,16 +1,12 @@
 <template>
   <page
     :title="$t('blog:blogCategories')"
-    :header-buttons="
-      [
-        canViewAdministrators
-          ? {
-              text: $t('blog:newCategory'),
-              href: getBlogCategoryFormUrl({ categoryId: 'create' }),
-            }
-          : null,
-      ].filter(Boolean)
-    "
+    :header-buttons="[
+      {
+        text: $t('blog:newCategory'),
+        href: getBlogCategoryFormUrl({ categoryId: 'create' }),
+      },
+    ]"
   >
     <template v-slot:content>
       <data-table
@@ -102,7 +98,7 @@ import isEqual from 'lodash.isequal';
 import { useResourceDelete } from '@tager/admin-services';
 import { useDataTable } from '@tager/admin-ui';
 
-import { useFetchModuleConfig, useUserPermission } from '../../../hooks';
+import { useFetchModuleConfig } from '../../../hooks';
 import { getBlogCategoryFormUrl } from '../../../constants/paths';
 import {
   deleteCategory,
@@ -110,7 +106,6 @@ import {
   moveCategory,
 } from '../../../services/requests';
 import { Category, Language } from '../../../typings/model';
-import { Scope } from '../../../constants/scopes';
 
 import {
   convertCategoryList,
@@ -122,11 +117,6 @@ import { useAdvancedSearch } from './hooks';
 export default defineComponent({
   name: 'BlogCategoryList',
   setup(props, context) {
-    const canViewAdministrators = useUserPermission(
-      context,
-      Scope.AdministratorsView
-    );
-
     /** Fetch module config **/
 
     const {
@@ -232,11 +222,7 @@ export default defineComponent({
     );
 
     const columnDefs = computed(() =>
-      getCategoryTableColumnDefs(
-        moduleConfig.value,
-        context.root.$t,
-        canViewAdministrators.value
-      )
+      getCategoryTableColumnDefs(moduleConfig.value, context.root.$t)
     );
 
     return {
@@ -262,9 +248,6 @@ export default defineComponent({
       languageOptionList,
       tags,
       tagRemovalHandler,
-
-      // Permissions
-      canViewAdministrators,
     };
   },
 });

package/src/views/Posts/PostForm/PostForm.vue

@@ -530,7 +530,7 @@ export default defineComponent({
       const newSelectedOptions: OptionType<number>[] = [];
 
       selectedOptions.forEach((selectedOption) => {
-        const findTreeSelectedCategory = (categoryId: number) => {
+        const findTreeSelectedCategory = (categoryId: Nullable<number>) => {
           const foundSelectedCategory = categoryList.value.find(
             ({ id }) => id === categoryId
           );

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

@@ -38,8 +38,7 @@ export function convertPostList(
 
 export function getPostTableColumnDefs(
   moduleConfig: Nullable<ModuleConfig>,
-  t: TFunction,
-  canViewAdministrators: boolean
+  t: TFunction
 ): ColumnDefinition<PostShort>[] {
   const isLangSpecific = moduleConfig
     ? moduleConfig.languages.length > 0
@@ -91,15 +90,13 @@ export function getPostTableColumnDefs(
       format: ({ row }) =>
         row.categories.map((category) => category.name).join(', '),
     },
-    canViewAdministrators
-      ? {
-          id: 7,
-          name: t('blog:actions'),
-          field: 'actions',
-          style: { whiteSpace: 'nowrap', width: '120px' },
-          headStyle: { whiteSpace: 'nowrap', width: '120px' },
-        }
-      : null,
+    {
+      id: 7,
+      name: t('blog:actions'),
+      field: 'actions',
+      style: { whiteSpace: 'nowrap', width: '120px' },
+      headStyle: { whiteSpace: 'nowrap', width: '120px' },
+    },
   ];
 
   return COLUMN_DEFS.filter(notEmpty);

package/src/views/Posts/PostList/PostList.vue

@@ -1,16 +1,12 @@
 <template>
   <page
     :title="pageTitle"
-    :header-buttons="
-      [
-        canViewAdministrators
-          ? {
-              text: $t('blog:newPost'),
-              href: getBlogPostFormUrl({ postId: 'create' }),
-            }
-          : null,
-      ].filter(Boolean)
-    "
+    :header-buttons="[
+      {
+        text: $t('blog:newPost'),
+        href: getBlogPostFormUrl({ postId: 'create' }),
+      },
+    ]"
   >
     <template v-slot:content>
       <data-table
@@ -126,12 +122,7 @@ import {
   useResourceDelete,
 } from '@tager/admin-services';
 
-import { Scope } from '../../../constants/scopes';
-import {
-  useFetchModuleConfig,
-  useFetchCategories,
-  useUserPermission,
-} from '../../../hooks';
+import { useFetchModuleConfig, useFetchCategories } from '../../../hooks';
 import {
   clonePost,
   deleteBlogPost,
@@ -153,11 +144,6 @@ export default defineComponent({
   setup(props, context) {
     const { t } = useTranslation(context);
 
-    const canViewAdministrators = useUserPermission(
-      context,
-      Scope.AdministratorsView
-    );
-
     const categoryId = computed<string>(() => {
       return Array.isArray(context.root.$route.query.category)
         ? context.root.$route.query.category[0] ?? ''
@@ -289,7 +275,7 @@ export default defineComponent({
       confirmMessage: t('blog:cloneConfirm'),
       successMessage: t('blog:cloneSuccess'),
       failureMessage: t('blog:cloneFailure'),
-      onSuccessRedirectTo: (data: PostFull) => `/posts/${data.id}`,
+      onSuccessRedirectTo: (data: PostFull) => `/blog/posts/${data.id}`,
       context,
     });
 
@@ -298,11 +284,7 @@ export default defineComponent({
     }
 
     const columnDefs = computed<ColumnDefinition<PostShort>[]>(() =>
-      getPostTableColumnDefs(
-        moduleConfig.value,
-        context.root.$t,
-        canViewAdministrators.value
-      )
+      getPostTableColumnDefs(moduleConfig.value, context.root.$t)
     );
 
     return {
@@ -332,9 +314,6 @@ export default defineComponent({
       tags,
       tagRemovalHandler,
 
-      // Permissions
-      canViewAdministrators,
-
       // Clone
       handleResourceClone,
       isBusy,

package/dist/constants/scopes.d.ts

@@ -1,11 +0,0 @@
-export declare const Scope: {
-    readonly All: "*";
-    readonly OrdersCreate: "orders.create";
-    readonly OrdersView: "orders.view";
-    readonly OrdersDelete: "orders.delete";
-    readonly RbacViewRoles: "rbac.view-roles";
-    readonly RbacEditRoles: "rbac.edit-roles";
-    readonly AdministratorsView: "administrators.view";
-    readonly AdministratorsEdit: "administrators.edit";
-    readonly AdministratorsDelete: "administrators.delete";
-};

package/dist/hooks/useStore.d.ts

@@ -1,4 +0,0 @@
-import { Store } from 'vuex';
-import { SetupContext } from '@vue/composition-api';
-import { RootState } from '../store';
-export declare function useStore(context: SetupContext): Store<RootState>;

package/dist/hooks/useUserPermission.d.ts

@@ -1,3 +0,0 @@
-import { ComputedRef, SetupContext } from '@vue/composition-api';
-import { ScopeType } from '../typings/model';
-export declare function useUserPermission(context: SetupContext, scope: ScopeType): ComputedRef<boolean>;

package/dist/hooks/useUserProfile.d.ts

@@ -1,3 +0,0 @@
-import { ComputedRef, SetupContext } from '@vue/composition-api';
-import { UserModel } from '../typings/model';
-export declare function useUserProfile(context: SetupContext): ComputedRef<UserModel>;

package/dist/store/index.d.ts

@@ -1,6 +0,0 @@
-import { UserModuleStateModel } from '../store/user';
-export interface RootState {
-    user: UserModuleStateModel;
-}
-declare const store: import("vuex").Store<RootState>;
-export default store;

package/dist/store/user.d.ts

@@ -1,14 +0,0 @@
-import { Module } from 'vuex';
-import { FetchStatus } from '@tager/admin-services';
-import { UserModel } from '../typings/model';
-import { RootState } from './index';
-export interface UserModuleStateModel {
-    profile: UserModel | null;
-    status: FetchStatus;
-}
-export declare const USER_MODULE_NAMESPACE = "user";
-export declare const USER_ACTION_TYPES: {
-    readonly FETCH_USER_PROFILE: "fetchUserProfile";
-};
-declare const userModule: Module<UserModuleStateModel, RootState>;
-export default userModule;

package/src/constants/scopes.ts

@@ -1,11 +0,0 @@
-export const Scope = {
-  All: '*',
-  OrdersCreate: 'orders.create',
-  OrdersView: 'orders.view',
-  OrdersDelete: 'orders.delete',
-  RbacViewRoles: 'rbac.view-roles',
-  RbacEditRoles: 'rbac.edit-roles',
-  AdministratorsView: 'administrators.view',
-  AdministratorsEdit: 'administrators.edit',
-  AdministratorsDelete: 'administrators.delete',
-} as const;

package/src/hooks/useStore.ts

@@ -1,8 +0,0 @@
-import { Store } from 'vuex';
-import { SetupContext } from '@vue/composition-api';
-
-import { RootState } from '../store';
-
-export function useStore(context: SetupContext): Store<RootState> {
-  return context.root.$store;
-}

package/src/hooks/useUserPermission.ts

@@ -1,16 +0,0 @@
-import { computed, ComputedRef, SetupContext } from '@vue/composition-api';
-
-import { ScopeType } from '../typings/model';
-import { useStore } from '../hooks';
-import { userNamespace } from '../utils/common';
-
-export function useUserPermission(
-  context: SetupContext,
-  scope: ScopeType
-): ComputedRef<boolean> {
-  const store = useStore(context);
-
-  return computed<boolean>(() => {
-    return store.getters[userNamespace('userHasPermission')](scope);
-  });
-}

package/src/hooks/useUserProfile.ts

@@ -1,13 +0,0 @@
-import { computed, ComputedRef, SetupContext } from '@vue/composition-api';
-
-import { UserModel } from '../typings/model';
-import { useStore } from '../hooks';
-import { userNamespace } from '../utils/common';
-
-export function useUserProfile(context: SetupContext): ComputedRef<UserModel> {
-  const store = useStore(context);
-
-  return computed<UserModel>(() => {
-    return store.getters[userNamespace('userProfile')];
-  });
-}

package/src/store/index.ts

@@ -1,21 +0,0 @@
-import Vue from 'vue';
-import Vuex from 'vuex';
-
-import userModule, {
-  USER_MODULE_NAMESPACE,
-  UserModuleStateModel,
-} from '../store/user';
-
-Vue.use(Vuex);
-
-export interface RootState {
-  user: UserModuleStateModel;
-}
-
-const store = new Vuex.Store({
-  modules: {
-    [USER_MODULE_NAMESPACE]: userModule,
-  },
-});
-
-export default store;

package/src/store/user.ts

@@ -1,110 +0,0 @@
-import { GetterTree, Module } from 'vuex';
-
-import { FETCH_STATUSES, FetchStatus } from '@tager/admin-services';
-
-import { ScopeType, UserModel } from '../typings/model';
-import { getUserProfile } from '../services/requests';
-import { Scope } from '../constants/scopes';
-
-import { RootState } from './index';
-
-export interface UserModuleStateModel {
-  profile: UserModel | null;
-  status: FetchStatus;
-}
-
-export const USER_MODULE_NAMESPACE = 'user';
-
-const USER_MUTATION_TYPES = {
-  PROFILE_REQUEST_STARTED: 'profileRequestStarted',
-  PROFILE_REQUEST_FULFILLED: 'profileRequestFulfilled',
-  PROFILE_REQUEST_REJECTED: 'profileRequestRejected',
-};
-
-export const USER_ACTION_TYPES = {
-  FETCH_USER_PROFILE: 'fetchUserProfile',
-} as const;
-
-type ReturnValueMapType<
-  T extends { [key: string]: (...args: any[]) => any }
-> = { [key in keyof T]: ReturnType<T[key]> };
-
-interface UserGettersType extends GetterTree<UserModuleStateModel, RootState> {
-  userScopes: (state: UserModuleStateModel) => Array<ScopeType>;
-  userHasPermission: (
-    state: UserModuleStateModel,
-    getters: ReturnValueMapType<UserGettersType>
-  ) => (scope: ScopeType) => boolean;
-}
-
-const userGetters: UserGettersType = {
-  userProfile(state) {
-    return state.profile;
-  },
-  userScopes(state) {
-    const roles = state.profile ? state.profile.roles : [];
-    const scopes: Array<ScopeType> = [];
-
-    roles.forEach((role) => {
-      scopes.push(...role.scopes);
-    });
-
-    return scopes;
-  },
-  userHasPermission: (state, getters) => (scope: ScopeType) => {
-    const scopes = getters.userScopes;
-
-    if (scopes.includes(Scope.All)) return true;
-
-    return scopes.includes(scope);
-  },
-};
-
-const userModule: Module<UserModuleStateModel, RootState> = {
-  namespaced: true,
-  state: {
-    profile: null,
-    status: FETCH_STATUSES.IDLE,
-  },
-  mutations: {
-    [USER_MUTATION_TYPES.PROFILE_REQUEST_STARTED](state) {
-      if (state.status === FETCH_STATUSES.IDLE) {
-        state.status = FETCH_STATUSES.LOADING;
-      }
-    },
-    [USER_MUTATION_TYPES.PROFILE_REQUEST_FULFILLED](state, user: UserModel) {
-      if (state.status === FETCH_STATUSES.LOADING) {
-        state.status = FETCH_STATUSES.SUCCESS;
-        state.profile = user;
-      }
-    },
-    [USER_MUTATION_TYPES.PROFILE_REQUEST_REJECTED](state) {
-      if (state.status === FETCH_STATUSES.LOADING) {
-        state.status = FETCH_STATUSES.FAILURE;
-        state.profile = null;
-      }
-    },
-  },
-  actions: {
-    [USER_ACTION_TYPES.FETCH_USER_PROFILE](store) {
-      if (store.state.status !== FETCH_STATUSES.IDLE) return;
-
-      store.commit(USER_MUTATION_TYPES.PROFILE_REQUEST_STARTED);
-
-      getUserProfile()
-        .then((response) => {
-          store.commit(
-            USER_MUTATION_TYPES.PROFILE_REQUEST_FULFILLED,
-            response.data
-          );
-        })
-        .catch((error) => {
-          console.error(error);
-          store.commit(USER_MUTATION_TYPES.PROFILE_REQUEST_REJECTED);
-        });
-    },
-  },
-  getters: userGetters,
-};
-
-export default userModule;