From 0aa6ef38f4f25b9bb7ade47287e593c458bf2120 Mon Sep 17 00:00:00 2001
From: Daniel <daniel.ostkamp@ru.nl>
Date: Thu, 7 Dec 2023 16:05:18 +0000
Subject: [PATCH] Removed attr values for signing

---
 src/lib/ambient.d.ts                           |  2 +-
 .../AttributeForm/AttributeCon.svelte          |  2 +-
 .../AttributeForm/AttributeForm.svelte         |  4 ++--
 .../AttributeForm/AttributeValue.svelte        | 18 +++++++++++++++++-
 src/lib/components/TopBar/TopBar.story.svelte  |  2 +-
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/lib/ambient.d.ts b/src/lib/ambient.d.ts
index f837e42..7ea2dd3 100644
--- a/src/lib/ambient.d.ts
+++ b/src/lib/ambient.d.ts
@@ -20,7 +20,7 @@ declare global {
 
     interface AttributeRequest {
         t: string
-        v: string
+        v?: string
     }
 
     interface AttributeType {
diff --git a/src/lib/components/AttributeForm/AttributeCon.svelte b/src/lib/components/AttributeForm/AttributeCon.svelte
index 42d9ebb..cf7ee73 100644
--- a/src/lib/components/AttributeForm/AttributeCon.svelte
+++ b/src/lib/components/AttributeForm/AttributeCon.svelte
@@ -80,7 +80,7 @@
                 >{$_(`addAttribute${signing ? 'Sign' : ''}`)}</option
             >
             {#each possibleChoices as { ident }}
-                <option required value={ident} label={$_(`attributeTypes.${ident}`)} />
+                <option value={ident} label={$_(`attributeTypes.${ident}`)} />
             {/each}
         </select>
     {/if}
diff --git a/src/lib/components/AttributeForm/AttributeForm.svelte b/src/lib/components/AttributeForm/AttributeForm.svelte
index 596c724..3400ecb 100644
--- a/src/lib/components/AttributeForm/AttributeForm.svelte
+++ b/src/lib/components/AttributeForm/AttributeForm.svelte
@@ -53,10 +53,10 @@
 
         const res: { [key: string]: AttributeCon } = {}
         for (const { id, con } of $policy) {
-            res[id] = [{ t: EMAIL, v: id.toLowerCase() }]
+            res[id] = signing ? [{ t: EMAIL }] : [{ t: EMAIL, v: id.toLowerCase() }]
             for (let { t, v } of con) {
                 if (t === 'pbdf.gemeente.personalData.dateofbirth') v = v.replace(/\.|\//g, '-')
-                res[id].push({ t, v })
+                res[id].push(signing ? { t } : { t, v })
             }
         }
 
diff --git a/src/lib/components/AttributeForm/AttributeValue.svelte b/src/lib/components/AttributeForm/AttributeValue.svelte
index 2181397..adbb3d9 100644
--- a/src/lib/components/AttributeForm/AttributeValue.svelte
+++ b/src/lib/components/AttributeForm/AttributeValue.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { tick, onMount } from 'svelte'
+    import { getContext } from 'svelte'
 
     import './../../app.css'
 
@@ -25,10 +26,22 @@
         ? typ.placeholder.length * 0.8 + 1
         : 10
 
+    const { policy, signing } = getContext('store')
+
     onMount(() => element.focus())
 </script>
 
-{#if typ?.options}
+{#if signing}
+    <input
+    bind:this={element}
+    on:blur={onblur}
+    bind:value
+    readonly
+    size=1
+    class="signing"
+    {...inputProps}
+    />
+{:else if typ?.options}
     <select bind:this={element} on:blur={onblur} bind:value required>
         {#each typ.options as option}
             <option>{option}</option>
@@ -64,4 +77,7 @@
         height: 100%;
         padding: 0px 2px;
     }
+    input.signing {
+        cursor: default !important;
+    }
 </style>
diff --git a/src/lib/components/TopBar/TopBar.story.svelte b/src/lib/components/TopBar/TopBar.story.svelte
index c0bba82..a65e916 100644
--- a/src/lib/components/TopBar/TopBar.story.svelte
+++ b/src/lib/components/TopBar/TopBar.story.svelte
@@ -13,7 +13,7 @@
     }
 
     const initialPolicySign = {
-        'alice@example.com': [{ t: 'pbdf.sidn-pbdf.email.email', v: 'alice@example.com' }]
+        'alice@example.com': [{ t: 'pbdf.sidn-pbdf.email.email'}]
     }
 
     const onSubmit = async (policy: Policy) => {