feat: persist view filters and sorts on Update View button click (#1290)
* feat: add viewFilters table Closes #1121 * feat: add Update View button + Create View dropdown Closes #1124, #1289 * feat: add View Filter resolvers * feat: persist view filters and sorts on Update View button click Closes #1123 * refactor: code review - Rename recoil selectors - Rename filters `field` property to `key`
This commit is contained in:
@ -3,47 +3,49 @@ import { Injectable } from '@nestjs/common';
|
||||
import { PureAbility, AbilityBuilder } from '@casl/ability';
|
||||
import { createPrismaAbility, PrismaQuery, Subjects } from '@casl/prisma';
|
||||
import {
|
||||
Attachment,
|
||||
Activity,
|
||||
Company,
|
||||
ActivityTarget,
|
||||
Attachment,
|
||||
Comment,
|
||||
Company,
|
||||
Favorite,
|
||||
Person,
|
||||
Pipeline,
|
||||
PipelineProgress,
|
||||
PipelineStage,
|
||||
RefreshToken,
|
||||
User,
|
||||
Workspace,
|
||||
WorkspaceMember,
|
||||
ActivityTarget,
|
||||
Pipeline,
|
||||
PipelineStage,
|
||||
PipelineProgress,
|
||||
UserSettings,
|
||||
View,
|
||||
ViewField,
|
||||
Favorite,
|
||||
ViewFilter,
|
||||
ViewSort,
|
||||
Workspace,
|
||||
WorkspaceMember,
|
||||
} from '@prisma/client';
|
||||
|
||||
import { AbilityAction } from './ability.action';
|
||||
|
||||
type SubjectsAbility = Subjects<{
|
||||
User: User;
|
||||
Workspace: Workspace;
|
||||
WorkspaceMember: WorkspaceMember;
|
||||
Company: Company;
|
||||
Person: Person;
|
||||
RefreshToken: RefreshToken;
|
||||
Activity: Activity;
|
||||
Comment: Comment;
|
||||
ActivityTarget: ActivityTarget;
|
||||
Pipeline: Pipeline;
|
||||
PipelineStage: PipelineStage;
|
||||
PipelineProgress: PipelineProgress;
|
||||
Attachment: Attachment;
|
||||
Comment: Comment;
|
||||
Company: Company;
|
||||
Favorite: Favorite;
|
||||
Person: Person;
|
||||
Pipeline: Pipeline;
|
||||
PipelineProgress: PipelineProgress;
|
||||
PipelineStage: PipelineStage;
|
||||
RefreshToken: RefreshToken;
|
||||
User: User;
|
||||
UserSettings: UserSettings;
|
||||
View: View;
|
||||
ViewField: ViewField;
|
||||
Favorite: Favorite;
|
||||
ViewFilter: ViewFilter;
|
||||
ViewSort: ViewSort;
|
||||
Workspace: Workspace;
|
||||
WorkspaceMember: WorkspaceMember;
|
||||
}>;
|
||||
|
||||
export type AppAbility = PureAbility<
|
||||
@ -147,10 +149,11 @@ export class AbilityFactory {
|
||||
can(AbilityAction.Create, 'ViewField', { workspaceId: workspace.id });
|
||||
can(AbilityAction.Update, 'ViewField', { workspaceId: workspace.id });
|
||||
|
||||
//Favorite
|
||||
can(AbilityAction.Read, 'Favorite', { workspaceId: workspace.id });
|
||||
can(AbilityAction.Create, 'Favorite');
|
||||
can(AbilityAction.Delete, 'Favorite', { workspaceId: workspace.id });
|
||||
// ViewFilter
|
||||
can(AbilityAction.Read, 'ViewFilter', { workspaceId: workspace.id });
|
||||
can(AbilityAction.Create, 'ViewFilter', { workspaceId: workspace.id });
|
||||
can(AbilityAction.Update, 'ViewFilter', { workspaceId: workspace.id });
|
||||
can(AbilityAction.Delete, 'ViewFilter', { workspaceId: workspace.id });
|
||||
|
||||
// ViewSort
|
||||
can(AbilityAction.Read, 'ViewSort', { workspaceId: workspace.id });
|
||||
@ -158,6 +161,11 @@ export class AbilityFactory {
|
||||
can(AbilityAction.Update, 'ViewSort', { workspaceId: workspace.id });
|
||||
can(AbilityAction.Delete, 'ViewSort', { workspaceId: workspace.id });
|
||||
|
||||
// Favorite
|
||||
can(AbilityAction.Read, 'Favorite', { workspaceId: workspace.id });
|
||||
can(AbilityAction.Create, 'Favorite');
|
||||
can(AbilityAction.Delete, 'Favorite', { workspaceId: workspace.id });
|
||||
|
||||
return build();
|
||||
}
|
||||
}
|
||||
|
||||
@ -116,6 +116,12 @@ import {
|
||||
UpdateViewAbilityHandler,
|
||||
DeleteViewAbilityHandler,
|
||||
} from './handlers/view.ability-handler';
|
||||
import {
|
||||
CreateViewFilterAbilityHandler,
|
||||
DeleteViewFilterAbilityHandler,
|
||||
ReadViewFilterAbilityHandler,
|
||||
UpdateViewFilterAbilityHandler,
|
||||
} from './handlers/view-filter.ability-handler';
|
||||
|
||||
@Global()
|
||||
@Module({
|
||||
@ -213,6 +219,11 @@ import {
|
||||
ReadViewFieldAbilityHandler,
|
||||
CreateViewFieldAbilityHandler,
|
||||
UpdateViewFieldAbilityHandler,
|
||||
// ViewFilter
|
||||
ReadViewFilterAbilityHandler,
|
||||
CreateViewFilterAbilityHandler,
|
||||
UpdateViewFilterAbilityHandler,
|
||||
DeleteViewFilterAbilityHandler,
|
||||
// ViewSort
|
||||
ReadViewSortAbilityHandler,
|
||||
CreateViewSortAbilityHandler,
|
||||
@ -312,6 +323,11 @@ import {
|
||||
ReadViewFieldAbilityHandler,
|
||||
CreateViewFieldAbilityHandler,
|
||||
UpdateViewFieldAbilityHandler,
|
||||
// ViewFilter
|
||||
ReadViewFilterAbilityHandler,
|
||||
CreateViewFilterAbilityHandler,
|
||||
UpdateViewFilterAbilityHandler,
|
||||
DeleteViewFilterAbilityHandler,
|
||||
// ViewSort
|
||||
ReadViewSortAbilityHandler,
|
||||
CreateViewSortAbilityHandler,
|
||||
|
||||
122
server/src/ability/handlers/view-filter.ability-handler.ts
Normal file
122
server/src/ability/handlers/view-filter.ability-handler.ts
Normal file
@ -0,0 +1,122 @@
|
||||
import {
|
||||
ExecutionContext,
|
||||
Injectable,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
import { GqlExecutionContext } from '@nestjs/graphql';
|
||||
|
||||
import { subject } from '@casl/ability';
|
||||
|
||||
import { IAbilityHandler } from 'src/ability/interfaces/ability-handler.interface';
|
||||
|
||||
import { AbilityAction } from 'src/ability/ability.action';
|
||||
import { AppAbility } from 'src/ability/ability.factory';
|
||||
import {
|
||||
convertToWhereInput,
|
||||
relationAbilityChecker,
|
||||
} from 'src/ability/ability.util';
|
||||
import { PrismaService } from 'src/database/prisma.service';
|
||||
import { assert } from 'src/utils/assert';
|
||||
import { ViewFilterWhereUniqueInput } from 'src/core/@generated/view-filter/view-filter-where-unique.input';
|
||||
import { ViewFilterWhereInput } from 'src/core/@generated/view-filter/view-filter-where.input';
|
||||
|
||||
class ViewFilterArgs {
|
||||
where?: ViewFilterWhereInput | ViewFilterWhereUniqueInput;
|
||||
[key: string]: any;
|
||||
}
|
||||
|
||||
const isViewFilterWhereUniqueInput = (
|
||||
input: ViewFilterWhereInput | ViewFilterWhereUniqueInput,
|
||||
): input is ViewFilterWhereUniqueInput => 'viewId_key' in input;
|
||||
|
||||
@Injectable()
|
||||
export class ReadViewFilterAbilityHandler implements IAbilityHandler {
|
||||
handle(ability: AppAbility) {
|
||||
return ability.can(AbilityAction.Read, 'ViewFilter');
|
||||
}
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class CreateViewFilterAbilityHandler implements IAbilityHandler {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
async handle(ability: AppAbility, context: ExecutionContext) {
|
||||
const gqlContext = GqlExecutionContext.create(context);
|
||||
const args = gqlContext.getArgs();
|
||||
|
||||
const allowed = await relationAbilityChecker(
|
||||
'ViewFilter',
|
||||
ability,
|
||||
this.prismaService.client,
|
||||
args,
|
||||
);
|
||||
|
||||
if (!allowed) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return ability.can(AbilityAction.Create, 'ViewFilter');
|
||||
}
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class UpdateViewFilterAbilityHandler implements IAbilityHandler {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
async handle(ability: AppAbility, context: ExecutionContext) {
|
||||
const gqlContext = GqlExecutionContext.create(context);
|
||||
const args = gqlContext.getArgs<ViewFilterArgs>();
|
||||
const viewFilter = await this.prismaService.client.viewFilter.findFirst({
|
||||
where:
|
||||
args.where && isViewFilterWhereUniqueInput(args.where)
|
||||
? args.where.viewId_key
|
||||
: args.where,
|
||||
});
|
||||
assert(viewFilter, '', NotFoundException);
|
||||
|
||||
const allowed = await relationAbilityChecker(
|
||||
'ViewFilter',
|
||||
ability,
|
||||
this.prismaService.client,
|
||||
args,
|
||||
);
|
||||
|
||||
if (!allowed) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return ability.can(AbilityAction.Update, subject('ViewFilter', viewFilter));
|
||||
}
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class DeleteViewFilterAbilityHandler implements IAbilityHandler {
|
||||
constructor(private readonly prismaService: PrismaService) {}
|
||||
|
||||
async handle(ability: AppAbility, context: ExecutionContext) {
|
||||
const gqlContext = GqlExecutionContext.create(context);
|
||||
const args = gqlContext.getArgs<ViewFilterArgs>();
|
||||
const where = convertToWhereInput(
|
||||
args.where && isViewFilterWhereUniqueInput(args.where)
|
||||
? args.where.viewId_key
|
||||
: args.where,
|
||||
);
|
||||
const viewFilters = await this.prismaService.client.viewFilter.findMany({
|
||||
where,
|
||||
});
|
||||
assert(viewFilters.length, '', NotFoundException);
|
||||
|
||||
for (const viewFilter of viewFilters) {
|
||||
const allowed = ability.can(
|
||||
AbilityAction.Delete,
|
||||
subject('ViewFilter', viewFilter),
|
||||
);
|
||||
|
||||
if (!allowed) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user