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:
Thaïs
2023-08-23 18:20:43 +02:00
committed by GitHub
parent 76246ec880
commit 74ab0142c7
54 changed files with 1331 additions and 277 deletions

View File

@ -0,0 +1,102 @@
import { UseGuards } from '@nestjs/common';
import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
import { accessibleBy } from '@casl/prisma';
import { Prisma, Workspace } from '@prisma/client';
import { AppAbility } from 'src/ability/ability.factory';
import {
CreateViewFilterAbilityHandler,
DeleteViewFilterAbilityHandler,
ReadViewFilterAbilityHandler,
UpdateViewFilterAbilityHandler,
} from 'src/ability/handlers/view-filter.ability-handler';
import { FindManyViewFilterArgs } from 'src/core/@generated/view-filter/find-many-view-filter.args';
import { ViewFilter } from 'src/core/@generated/view-filter/view-filter.model';
import { ViewFilterService } from 'src/core/view/services/view-filter.service';
import { CheckAbilities } from 'src/decorators/check-abilities.decorator';
import {
PrismaSelect,
PrismaSelector,
} from 'src/decorators/prisma-select.decorator';
import { UserAbility } from 'src/decorators/user-ability.decorator';
import { AbilityGuard } from 'src/guards/ability.guard';
import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
import { UpdateOneViewFilterArgs } from 'src/core/@generated/view-filter/update-one-view-filter.args';
import { AuthWorkspace } from 'src/decorators/auth-workspace.decorator';
import { AffectedRows } from 'src/core/@generated/prisma/affected-rows.output';
import { DeleteManyViewFilterArgs } from 'src/core/@generated/view-filter/delete-many-view-filter.args';
import { CreateManyViewFilterArgs } from 'src/core/@generated/view-filter/create-many-view-filter.args';
@UseGuards(JwtAuthGuard)
@Resolver(() => ViewFilter)
export class ViewFilterResolver {
constructor(private readonly viewFilterService: ViewFilterService) {}
@Mutation(() => AffectedRows)
@UseGuards(AbilityGuard)
@CheckAbilities(CreateViewFilterAbilityHandler)
async createManyViewFilter(
@Args() args: CreateManyViewFilterArgs,
@AuthWorkspace() workspace: Workspace,
): Promise<AffectedRows> {
return this.viewFilterService.createMany({
data: args.data.map((data) => ({
...data,
workspaceId: workspace.id,
})),
});
}
@Query(() => [ViewFilter])
@UseGuards(AbilityGuard)
@CheckAbilities(ReadViewFilterAbilityHandler)
async findManyViewFilter(
@Args() args: FindManyViewFilterArgs,
@UserAbility() ability: AppAbility,
@PrismaSelector({ modelName: 'ViewFilter' })
prismaSelect: PrismaSelect<'ViewFilter'>,
): Promise<Partial<ViewFilter>[]> {
return this.viewFilterService.findMany({
where: args.where
? {
AND: [args.where, accessibleBy(ability).ViewFilter],
}
: accessibleBy(ability).ViewFilter,
orderBy: args.orderBy,
cursor: args.cursor,
take: args.take,
skip: args.skip,
distinct: args.distinct,
select: prismaSelect.value,
});
}
@Mutation(() => ViewFilter)
@UseGuards(AbilityGuard)
@CheckAbilities(UpdateViewFilterAbilityHandler)
async updateOneViewFilter(
@Args() args: UpdateOneViewFilterArgs,
@PrismaSelector({ modelName: 'ViewFilter' })
prismaSelect: PrismaSelect<'ViewFilter'>,
): Promise<Partial<ViewFilter>> {
return this.viewFilterService.update({
data: args.data,
where: args.where,
select: prismaSelect.value,
} as Prisma.ViewFilterUpdateArgs);
}
@Mutation(() => AffectedRows, {
nullable: false,
})
@UseGuards(AbilityGuard)
@CheckAbilities(DeleteViewFilterAbilityHandler)
async deleteManyViewFilter(
@Args() args: DeleteManyViewFilterArgs,
): Promise<AffectedRows> {
return this.viewFilterService.deleteMany({
where: args.where,
});
}
}

View File

@ -0,0 +1,39 @@
import { Injectable } from '@nestjs/common';
import { PrismaService } from 'src/database/prisma.service';
@Injectable()
export class ViewFilterService {
constructor(private readonly prismaService: PrismaService) {}
// Find
findFirst = this.prismaService.client.viewFilter.findFirst;
findFirstOrThrow = this.prismaService.client.viewFilter.findFirstOrThrow;
findUnique = this.prismaService.client.viewFilter.findUnique;
findUniqueOrThrow = this.prismaService.client.viewFilter.findUniqueOrThrow;
findMany = this.prismaService.client.viewFilter.findMany;
// Create
create = this.prismaService.client.viewFilter.create;
createMany = this.prismaService.client.viewFilter.createMany;
// Update
update = this.prismaService.client.viewFilter.update;
upsert = this.prismaService.client.viewFilter.upsert;
updateMany = this.prismaService.client.viewFilter.updateMany;
// Delete
delete = this.prismaService.client.viewFilter.delete;
deleteMany = this.prismaService.client.viewFilter.deleteMany;
// Aggregate
aggregate = this.prismaService.client.viewFilter.aggregate;
// Count
count = this.prismaService.client.viewFilter.count;
// GroupBy
groupBy = this.prismaService.client.viewFilter.groupBy;
}

View File

@ -6,14 +6,18 @@ import { ViewSortService } from './services/view-sort.service';
import { ViewSortResolver } from './resolvers/view-sort.resolver';
import { ViewService } from './services/view.service';
import { ViewResolver } from './resolvers/view.resolver';
import { ViewFilterService } from './services/view-filter.service';
import { ViewFilterResolver } from './resolvers/view-filter.resolver';
@Module({
providers: [
ViewService,
ViewFieldService,
ViewFilterService,
ViewSortService,
ViewResolver,
ViewFieldResolver,
ViewFilterResolver,
ViewSortResolver,
],
})

View File

@ -112,8 +112,6 @@ export class WorkspaceService {
activityTarget,
activity,
view,
viewField,
viewSort,
} = this.prismaService.client;
const activitys = await activity.findMany({
@ -156,12 +154,6 @@ export class WorkspaceService {
view.deleteMany({
where,
}),
viewField.deleteMany({
where,
}),
viewSort.deleteMany({
where,
}),
refreshToken.deleteMany({
where: { userId },
}),