fix ability to unassign user (#709)

stakwork · Sep 18, 2023 · 835d243 · 835d243
1 parent 65a131d
commit 835d243
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/frontend/app/src/people/interfaces.ts b/frontend/app/src/people/interfaces.ts
@@ -236,7 +236,7 @@ export interface WantedSummaryProps {
   show: boolean;
   setIsModalSideButton: (any) => void;
   setIsExtraStyle: (any) => void;
-  formSubmit: (any) => void;
+  formSubmit: (any, close?: boolean) => void;
   title: string;
   org_uuid?: string;
   id?: number;

diff --git a/frontend/app/src/people/main/FocusView.tsx b/frontend/app/src/people/main/FocusView.tsx
@@ -201,7 +201,8 @@ function FocusedView(props: FocusViewProps) {
     return newBody;
   }
 
-  async function submitForm(body: any) {
+  // eslint-disable-next-line @typescript-eslint/no-inferrable-types
+  async function submitForm(body: any, shouldCloseModal: boolean = true) {
     let newBody = cloneDeep(body);
     try {
       newBody = await preSubmitFunctions(newBody);
@@ -219,12 +220,10 @@ function FocusedView(props: FocusViewProps) {
     if (!info) return console.log('no meInfo');
     setLoading(true);
     try {
-      if (newBody?.assignee?.owner_pubkey) {
-        newBody.assignee = newBody.assignee.owner_pubkey;
-      }
-      if (body?.assignee?.owner_pubkey) {
-        newBody.assignee = body.assignee.owner_pubkey;
+      if (typeof newBody?.assignee !== 'string' || !newBody?.assignee) {
+        newBody.assignee = newBody.assignee?.owner_pubkey ?? 'emptyid';
       }
+
       if (body.one_sentence_summary !== '') {
         newBody.title = body.one_sentence_summary;
       } else {
@@ -238,7 +237,9 @@ function FocusedView(props: FocusViewProps) {
       if (window.location.href.includes('wanted')) {
         await main.getPersonCreatedWanteds({}, info.pubkey);
       }
-      closeModal();
+      if(shouldCloseModal) {
+        closeModal();
+      }
     } catch (e) {
       console.log('e', e);
     }

diff --git a/frontend/app/src/people/widgetViews/summaries/WantedSummary.tsx b/frontend/app/src/people/widgetViews/summaries/WantedSummary.tsx
@@ -173,7 +173,25 @@ function WantedSummary(props: WantedSummaryProps) {
 
   const changeAssignedPerson = useCallback(() => {
     setIsAssigned(false);
-  }, []);
+
+      setAssignedPerson(null);
+      const newValue = {
+        title: titleString,
+        wanted_type: wanted_type,
+        one_sentence_summary: one_sentence_summary,
+        ticketUrl: ticket_url,
+        github_description: github_description,
+        description: description,
+        price: price,
+        assignee: '',
+        coding_language: coding_languages?.map((x: string) => ({ label: x, value: x })),
+        estimated_session_length: estimated_session_length,
+        show: show,
+        type: type,
+        created: created
+      };
+      formSubmit && formSubmit(newValue, false);
+  }, [coding_languages, created, description, estimated_session_length, formSubmit, github_description, one_sentence_summary, price, show, ticket_url, titleString, type, wanted_type]);
 
   useEffect(() => {
     (async () => {