From d3d2ae5889e29238166a74429f0700cf7b79d644 Mon Sep 17 00:00:00 2001
From: Kamran Ahmed <kamranahmed.se@gmail.com>
Date: Sun, 14 May 2023 03:05:54 +0100
Subject: [PATCH] Refactor update topic progress functionality

---
 src/components/TopicDetail/TopicDetail.tsx    |  2 +
 .../TopicDetail/TopicProgressButton.tsx       | 69 +++----------------
 2 files changed, 10 insertions(+), 61 deletions(-)

diff --git a/src/components/TopicDetail/TopicDetail.tsx b/src/components/TopicDetail/TopicDetail.tsx
index ff5c9d132..2305377ec 100644
--- a/src/components/TopicDetail/TopicDetail.tsx
+++ b/src/components/TopicDetail/TopicDetail.tsx
@@ -45,6 +45,7 @@ export function TopicDetail() {
     }
   };
 
+
   // Close the topic detail when user clicks outside the topic detail
   useOutsideClick(topicRef, () => {
     setIsActive(false);
@@ -169,6 +170,7 @@ export function TopicDetail() {
                 topicId={topicId}
                 resourceId={resourceId}
                 resourceType={resourceType}
+                onShowLoginPopup={showLoginPopup}
                 onClose={() => {
                   setIsActive(false);
                 }}
diff --git a/src/components/TopicDetail/TopicProgressButton.tsx b/src/components/TopicDetail/TopicProgressButton.tsx
index 38eefe6c7..a5ed10aa1 100644
--- a/src/components/TopicDetail/TopicProgressButton.tsx
+++ b/src/components/TopicDetail/TopicProgressButton.tsx
@@ -1,9 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'preact/hooks';
 import { useOutsideClick } from '../../hooks/use-outside-click';
-import CheckIcon from '../../icons/check.svg';
 import DownIcon from '../../icons/down.svg';
-import ProgressIcon from '../../icons/progress.svg';
-import ResetIcon from '../../icons/reset.svg';
 import SpinnerIcon from '../../icons/spinner.svg';
 import { isLoggedIn } from '../../lib/jwt';
 import {
@@ -19,6 +16,7 @@ type TopicProgressButtonProps = {
   resourceId: string;
   resourceType: ResourceType;
 
+  onShowLoginPopup: () => void;
   onClose: () => void;
 };
 
@@ -30,7 +28,7 @@ const statusColors: Record<ResourceProgressType, string> = {
 };
 
 export function TopicProgressButton(props: TopicProgressButtonProps) {
-  const { topicId, resourceId, resourceType, onClose } = props;
+  const { topicId, resourceId, resourceType, onClose, onShowLoginPopup } = props;
 
   const [isUpdatingProgress, setIsUpdatingProgress] = useState(true);
   const [progress, setProgress] = useState<ResourceProgressType>('pending');
@@ -59,6 +57,12 @@ export function TopicProgressButton(props: TopicProgressButtonProps) {
   }, [topicId, resourceId, resourceType]);
 
   const handleUpdateResourceProgress = (progress: ResourceProgressType) => {
+    if (isGuest) {
+      onClose();
+      onShowLoginPopup();
+      return;
+    }
+
     setIsUpdatingProgress(true);
     updateResourceProgress(
       {
@@ -170,61 +174,4 @@ export function TopicProgressButton(props: TopicProgressButtonProps) {
       )}
     </div>
   );
-
-  if (isGuest) {
-    return (
-      <div className="flex items-center gap-2">
-        <button
-          data-popup="login-popup"
-          className="inline-flex items-center rounded-md bg-green-600 p-1 px-2 text-sm text-white hover:bg-green-700"
-          onClick={onClose}
-        >
-          <img alt="Check" class="w-3" src={CheckIcon} />
-          <span className="ml-2">Mark as Done</span>
-        </button>
-        <button
-          data-popup="login-popup"
-          className="inline-flex items-center rounded-md bg-[#dad1fd] p-1 px-2 text-sm text-[#0E033B] hover:bg-[#C4B6FC]"
-          onClick={onClose}
-        >
-          <img alt="Learning" class="w-4" src={ProgressIcon} />
-          <span className="ml-2">In Progress</span>
-        </button>
-      </div>
-    );
-  }
-
-  return (
-    <div class="flex items-center gap-2 rounded-md">
-      {allowMarkingDone && (
-        <button
-          className="inline-flex items-center rounded-md border border-green-600 bg-green-600 p-1 px-2 text-sm text-white hover:bg-green-700"
-          onClick={() => handleUpdateResourceProgress('done')}
-        >
-          <img alt="Check" class="w-3" src={CheckIcon} />
-          <span className="ml-1">Done</span>
-        </button>
-      )}
-
-      {allowMarkingLearning && (
-        <button
-          className="inline-flex items-center rounded-md bg-[#dad1fd] p-1 px-2 text-sm text-[#0E033B] hover:bg-[#C4B6FC]"
-          onClick={() => handleUpdateResourceProgress('learning')}
-        >
-          <img alt="Learning" className="w-4" src={ProgressIcon} />
-          <span className="ml-1">Doing</span>
-        </button>
-      )}
-
-      {allowMarkingPending && (
-        <button
-          className="inline-flex items-center rounded-md border border-red-600 bg-red-600 p-1 px-2 text-sm text-white hover:bg-red-700"
-          onClick={() => handleUpdateResourceProgress('pending')}
-        >
-          <img alt="Check" class="h-4" src={ResetIcon} />
-          <span className="ml-2">Pending</span>
-        </button>
-      )}
-    </div>
-  );
 }