Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(regulations-admin): Actor to draft #16356

Merged
merged 3 commits into from
Oct 10, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ import {
ShippedSummary,
TaskListType,
} from '@island.is/regulations/admin'
import { Kennitala, RegQueryName } from '@island.is/regulations'
import { Kennitala, MinistrySlug, RegQueryName } from '@island.is/regulations'
import * as kennitala from 'kennitala'
import { NationalRegistryV3ClientService } from '@island.is/clients/national-registry-v3'
import type { User } from '@island.is/auth-nest-tools'
@@ -255,13 +255,20 @@ export class DraftRegulationService {
): Promise<DraftRegulationModel> {
this.logger.debug('Creating a new DraftRegulation')

// If user is in delegation, use actor. Else use user.
let creatorNationalId = user?.nationalId
if (user?.actor) {
creatorNationalId = user.actor.nationalId
// If the user is in delegation from a valid ministry, add ministry to create?
}

const createData: Partial<DraftRegulationModel> = {
drafting_status: 'draft',
title: '',
text: '',
drafting_notes: '',
type: create.type,
authors: [user?.nationalId as Kennitala],
authors: [creatorNationalId as Kennitala],
}

return this.draftRegulationModel.create(createData)
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ export const SaveDeleteButtons = (props: SaveDeleteButtonsProps) => {
onClick={() => propose()}
icon="open"
iconType="outline"
variant="text"
variant="utility"
size="small"
disabled={saving}
>