fix: frontend stop mining loading state & stepper progress tracker

Author: malek10xdev

backend/src/services/tasks-manager/TasksManager.ts

@@ -369,16 +369,7 @@ export default class TasksManager {
           : !p.stoppedAt && p.id && processIds?.includes(p.id)
       );
 
-      if (endEntireTask) {
-        // Signal to indicate the mining is completed
-        progressHandlerSSE.sendSSE('mining-completed', 'mining-completed');
-        progressHandlerSSE.stop();
-        this.ACTIVE_MINING_TASKS.delete(miningId);
-      }
-
-      if (processesToStop.length) {
-        await this.stopTask(processesToStop, true);
-      }
+      const promise = this.stopTask(processesToStop, true);
 
       const status =
         fetch.stoppedAt !== undefined &&
@@ -387,8 +378,17 @@ export default class TasksManager {
         signature.stoppedAt !== undefined;
 
       if (status) {
-        await refineContacts(task.userId);
-        await mailMiningComplete(miningId);
+        // Signal to indicate the mining is completed
+        try {
+          await promise;
+          await refineContacts(task.userId);
+          await mailMiningComplete(miningId);
+        } catch (err) {
+          logger.error('Edge-functions failed');
+        }
+        this.ACTIVE_MINING_TASKS.delete(miningId);
+        progressHandlerSSE.sendSSE('mining-completed', 'mining-completed');
+        progressHandlerSSE.stop();
       }
     } catch (error) {
       logger.error('Error when deleting task', error);

frontend/src/components/Mining/StepperPanels/CleanPanel.vue

@@ -25,6 +25,7 @@
       icon-pos="right"
       severity="danger"
       outlined
+      :loading="$leadminerStore.isLoadingStopMining"
       :label="t('halt_cleaning')"
       @click="haltCleaning"
     />
@@ -93,8 +94,6 @@ onMounted(() => {
 });
 
 async function haltCleaning() {
-  $leadminerStore.isLoadingStopMining = true;
-
   try {
     await $leadminerStore.stopMining(true, null);
     $toast.add({
@@ -103,9 +102,7 @@ async function haltCleaning() {
       detail: t('cleaning_canceled'),
       life: 3000,
     });
-    $leadminerStore.isLoadingStopMining = false;
   } catch (error) {
-    $leadminerStore.isLoadingStopMining = false;
     if (error instanceof FetchError && error.response?.status === 404) {
       $toast.add({
         severity: 'warn',

frontend/src/components/Mining/StepperPanels/MinePanel.vue

@@ -55,7 +55,7 @@
     <Button
       v-else
       id="mine-stepper-stop-button"
-      :loading="$leadminerStore?.isLoadingStartMining"
+      :loading="$leadminerStore?.isLoadingStopMining"
       icon="pi pi-stop"
       icon-pos="right"
       severity="danger"
@@ -235,6 +235,7 @@ const { isSupported, permissionGranted, show } = useWebNotification({
 });
 
 watch(extractionFinished, async (finished) => {
+  console.log('im heeeeeeeeeeere', finished)
   if (canceled.value) {
     $toast.add({
       severity: 'info',
@@ -243,7 +244,6 @@ watch(extractionFinished, async (finished) => {
       life: 3000,
     });
     $stepper.next();
-    await reloadContacts();
   } else if (finished) {
     $toast.add({
       severity: 'info',

frontend/src/stores/leadminer.ts

@@ -393,9 +393,9 @@ export const useLeadminerStore = defineStore('leadminer', () => {
         miningTask.value = undefined;
         fetchingFinished.value = true;
         cleaningFinished.value = true;
-        isLoadingStopMining.value = false;
       }
       extractionFinished.value = true;
+      isLoadingStopMining.value = false;
     } catch (err) {
       fetchingFinished.value = true;
       extractionFinished.value = true;