From 8e824754ff37f90718b4bec1742e5d3c8df9dd05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20H?= <thordur@hugsmidjan.is>
Date: Thu, 10 Oct 2024 17:03:09 +0000
Subject: [PATCH] fix(regulations-admin): Actor to draft (#16356)

* Actor to draft

* Fix propose btn styling

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 .../draft_regulation/draft_regulation.service.ts      | 11 +++++++++--
 .../src/components/SaveDeleteButtons.tsx              |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.service.ts b/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.service.ts
index 4de5b6eacefd..9dcf78778172 100644
--- a/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.service.ts
+++ b/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.service.ts
@@ -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)
diff --git a/libs/portals/admin/regulations-admin/src/components/SaveDeleteButtons.tsx b/libs/portals/admin/regulations-admin/src/components/SaveDeleteButtons.tsx
index 9c1c845f6630..5e6f3f1df75c 100644
--- a/libs/portals/admin/regulations-admin/src/components/SaveDeleteButtons.tsx
+++ b/libs/portals/admin/regulations-admin/src/components/SaveDeleteButtons.tsx
@@ -48,7 +48,7 @@ export const SaveDeleteButtons = (props: SaveDeleteButtonsProps) => {
             onClick={() => propose()}
             icon="open"
             iconType="outline"
-            variant="text"
+            variant="utility"
             size="small"
             disabled={saving}
           >