diff --git a/apps/web/components/Regulations/RegulationTexts.types.ts b/apps/web/components/Regulations/RegulationTexts.types.ts index 9db3ce98e3da..323337272156 100644 --- a/apps/web/components/Regulations/RegulationTexts.types.ts +++ b/apps/web/components/Regulations/RegulationTexts.types.ts @@ -88,7 +88,7 @@ export type RegulationPageTexts = Partial< | 'historyTitle' // 'Breytingasaga reglugerðar ${name}' | 'historyStart' // 'Stofnreglugerð gefin út' | 'historyStartAmending' // 'Reglugerðin gefin út' - | 'historyChange' // 'Breytt af ${name}' + | 'historyChange' // 'Breytt með ${name}' | 'historyCancel' // 'Brottfelld af ${name}' | 'historyCurrentVersion' // 'Núgildandi útgáfa' | 'historyPastSplitter' // 'Gildandi breytingar' diff --git a/libs/api/domains/regulations/src/lib/api-domains-regulations.resolver.ts b/libs/api/domains/regulations/src/lib/api-domains-regulations.resolver.ts index af38f214031d..054eca834d73 100644 --- a/libs/api/domains/regulations/src/lib/api-domains-regulations.resolver.ts +++ b/libs/api/domains/regulations/src/lib/api-domains-regulations.resolver.ts @@ -1,12 +1,13 @@ import { Args, Mutation, Query, Resolver } from '@nestjs/graphql' import graphqlTypeJson from 'graphql-type-json' - +import { UseGuards } from '@nestjs/common' import { RegulationsService } from '@island.is/clients/regulations' +import { IdsUserGuard, ScopesGuard } from '@island.is/auth-nest-tools' import { RegulationSearchResults, RegulationYears, - RegulationListItem, } from '@island.is/regulations/web' +import { Audit } from '@island.is/nest/audit' import { Regulation, RegulationDiff, @@ -20,18 +21,20 @@ import { GetRegulationInput } from './dto/getRegulation.input' import { GetRegulationsLawChaptersInput } from './dto/getRegulationsLawChapters.input' import { GetRegulationsMinistriesInput } from './dto/getRegulationsMinistriesInput.input' import { GetRegulationsSearchInput } from './dto/getRegulationsSearch.input' -import { CreatePresignedPostInput } from './dto/createPresignedPost.input' +import { CreateRegulationPresignedPostInput } from './dto/createPresignedPost.input' import { PresignedPostResults } from '@island.is/regulations/admin' const validPage = (page: number | undefined) => (page && page >= 1 ? page : 1) - +@Audit({ namespace: '@island.is/api/regulations' }) @Resolver() export class RegulationsResolver { constructor(private regulationsService: RegulationsService) {} - @Mutation(() => graphqlTypeJson) + @Audit() + @UseGuards(IdsUserGuard, ScopesGuard) + @Mutation(() => graphqlTypeJson, { name: 'regulationCreatePresignedPost' }) createPresignedPost( - @Args('input') input: CreatePresignedPostInput, + @Args('input') input: CreateRegulationPresignedPostInput, ): Promise { return this.regulationsService.createPresignedPost( input.fileName, diff --git a/libs/api/domains/regulations/src/lib/dto/createPresignedPost.input.ts b/libs/api/domains/regulations/src/lib/dto/createPresignedPost.input.ts index aebda893850b..ff8b66208ea1 100644 --- a/libs/api/domains/regulations/src/lib/dto/createPresignedPost.input.ts +++ b/libs/api/domains/regulations/src/lib/dto/createPresignedPost.input.ts @@ -2,7 +2,7 @@ import { Field, InputType } from '@nestjs/graphql' import { IsString } from 'class-validator' @InputType() -export class CreatePresignedPostInput { +export class CreateRegulationPresignedPostInput { @Field() @IsString() readonly fileName!: string diff --git a/libs/portals/admin/regulations-admin/src/components/TaskList.tsx b/libs/portals/admin/regulations-admin/src/components/TaskList.tsx index c4b7f6e657ef..94d79382522b 100644 --- a/libs/portals/admin/regulations-admin/src/components/TaskList.tsx +++ b/libs/portals/admin/regulations-admin/src/components/TaskList.tsx @@ -30,7 +30,7 @@ export const TaskList = () => { if (loading) { return ( - + ) @@ -38,25 +38,29 @@ export const TaskList = () => { if (error) { return ( - - - + + + + + ) } if (drafts && drafts.length === 0) { return ( - - - + + + + + ) } diff --git a/libs/portals/admin/regulations-admin/src/components/impacts/ImpactListItem.tsx b/libs/portals/admin/regulations-admin/src/components/impacts/ImpactListItem.tsx index 59b7f0125f04..7f1179e4dbd7 100644 --- a/libs/portals/admin/regulations-admin/src/components/impacts/ImpactListItem.tsx +++ b/libs/portals/admin/regulations-admin/src/components/impacts/ImpactListItem.tsx @@ -72,7 +72,7 @@ export const ImpactListItem = (props: ImpactListItemProps) => { variant="small" color={getCurrentEffect(effect) ? 'mint800' : 'blueberry600'} > - Breytt af{' '} + Breytt með{' '} {getCurrentEffect(effect) ? 'núverandi reglugerð' : effect.name} diff --git a/libs/portals/admin/regulations-admin/src/utils/dataHooks.ts b/libs/portals/admin/regulations-admin/src/utils/dataHooks.ts index cba4e71d4a79..ecd9499fec78 100644 --- a/libs/portals/admin/regulations-admin/src/utils/dataHooks.ts +++ b/libs/portals/admin/regulations-admin/src/utils/dataHooks.ts @@ -46,8 +46,10 @@ type QueryResult = // --------------------------------------------------------------------------- export const CreatePresignedPostMutation = gql` - mutation CreatePresignedPostMutation($input: CreatePresignedPostInput!) { - createPresignedPost(input: $input) + mutation CreatePresignedPostMutation( + $input: CreateRegulationPresignedPostInput! + ) { + regulationCreatePresignedPost(input: $input) } ` export type UploadingState = @@ -97,7 +99,7 @@ export const useS3Upload = () => { }, }, }) - return post.data?.createPresignedPost.data + return post.data?.regulationCreatePresignedPost.data } catch (error) { setUploadStatus({ uploading: false,