Added proposal to suggestion.

amyjko · Jul 3, 2024 · c4843ca · c4843ca
1 parent 3ae650b
commit c4843ca
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 26 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -5,6 +5,10 @@ Dates should be in`YYYY-MM-DD` format and versions are in [semantic versioning](
 
 ## 0.5.2
 
+### Added
+
+- Added proposal field to suggestions, to capture draft changes.
+
 ### Fixed
 
 - Fixed rendering of numbered lists.

diff --git a/src/database/OrganizationsDB.ts b/src/database/OrganizationsDB.ts
@@ -941,6 +941,15 @@ class OrganizationsDB {
 		return error;
 	}
 
+	async updateSuggestionProposal(suggestion: SuggestionRow, proposal: string) {
+		if (suggestion.proposal === proposal) return null;
+		const { error } = await this.supabase
+			.from('suggestions')
+			.update({ proposal })
+			.eq('id', suggestion.id);
+		return error;
+	}
+
 	async updateSuggestionStatus(suggestion: SuggestionRow, status: Status, who: PersonID) {
 		if (suggestion.status === status) return null;
 		const { error } = await this.supabase

diff --git a/src/database/database.types.ts b/src/database/database.types.ts
@@ -450,6 +450,7 @@ export type Database = {
           id: string
           orgid: string
           processes: string[]
+          proposal: string
           roles: string[]
           status: Database["public"]["Enums"]["status"]
           visibility: Database["public"]["Enums"]["visibility"]
@@ -465,6 +466,7 @@ export type Database = {
           id?: string
           orgid: string
           processes?: string[]
+          proposal?: string
           roles?: string[]
           status?: Database["public"]["Enums"]["status"]
           visibility?: Database["public"]["Enums"]["visibility"]
@@ -480,6 +482,7 @@ export type Database = {
           id?: string
           orgid?: string
           processes?: string[]
+          proposal?: string
           roles?: string[]
           status?: Database["public"]["Enums"]["status"]
           visibility?: Database["public"]["Enums"]["visibility"]
@@ -545,14 +548,25 @@ export type Database = {
       [_ in never]: never
     }
     Functions: {
-      create_org: {
-        Args: {
-          adminname: string
-          orgname: string
-          invite: string
-        }
-        Returns: string
-      }
+      create_org:
+        | {
+            Args: {
+              adminname: string
+              orgname: string
+              invite: string
+            }
+            Returns: string
+          }
+        | {
+            Args: {
+              adminname: string
+              orgname: string
+              invite: string
+              uid: string
+              email: string
+            }
+            Returns: string
+          }
       getprofileid: {
         Args: {
           _orgid: string
@@ -871,6 +885,10 @@ export type Database = {
           updated_at: string
         }[]
       }
+      operation: {
+        Args: Record<PropertyKey, never>
+        Returns: string
+      }
       search: {
         Args: {
           prefix: string

diff --git a/src/lib/SuggestionView.svelte b/src/lib/SuggestionView.svelte
@@ -21,6 +21,7 @@
 	import Header from './Header.svelte';
 	import FormDialog from './FormDialog.svelte';
 	import Visibility from './Visibility.svelte';
+	import Subheader from './Subheader.svelte';
 
 	export let suggestion: SuggestionRow;
 
@@ -83,25 +84,41 @@
 
 <Tip>Use suggestions as a place to capture progress on a change and to document decisions.</Tip>
 
-<Paragraph
-	>On <TimeView date={timestampToDate(suggestion.when)} />
-	<PersonLink profile={$org.getProfileWithPersonID(suggestion.who)} /> reported:</Paragraph
+<Paragraph>
+	<PersonLink profile={$org.getProfileWithPersonID(suggestion.who)} /> reported this problem on <TimeView
+		date={timestampToDate(suggestion.when)}
+	/>.</Paragraph
 >
 
-<Quote
-	><MarkupView
-		markup={suggestion.description}
-		placeholder="No description"
-		edit={editable
-			? (text) =>
-					queryOrError(
-						errors,
-						$db.updateSuggestionDescription(suggestion, text),
-						"Couldn't update suggestion description."
-					)
-			: undefined}
-	/></Quote
->
+<Header>Problem</Header>
+
+<MarkupView
+	markup={suggestion.description}
+	placeholder="No description"
+	edit={editable
+		? (text) =>
+				queryOrError(
+					errors,
+					$db.updateSuggestionDescription(suggestion, text),
+					"Couldn't update suggestion description."
+				)
+		: undefined}
+/>
+
+<Header>Proposal</Header>
+
+<MarkupView
+	markup={suggestion.proposal}
+	placeholder="No proposal"
+	edit={editable
+		? (text) =>
+				queryOrError(
+					errors,
+					$db.updateSuggestionProposal(suggestion, text),
+					"Couldn't update suggestion description."
+				)
+		: undefined}
+/>
 
 <Header>Affected roles</Header>
 <div class="row">
@@ -192,7 +209,7 @@
 	{/if}
 </div>
 
-<Header>Comments</Header>
+<Header>Discussion</Header>
 
 {#await $db.getComments(suggestion.comments)}
 	<Loading />

diff --git a/supabase/migrations/20240703005756_remote_schema.sql b/supabase/migrations/20240703005756_remote_schema.sql
@@ -0,0 +1,3 @@
+alter table "public"."suggestions" add column "proposal" text not null default ''::text;
+
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		alter table "public"."suggestions" add column "proposal" text not null default ''::text;