fix: wpCourseware tasks fetching issue fixed

Author: RishadAlam

frontend-dev/src/components/AllIntegrations/WPCourseware/WPCourseware.jsx

@@ -8,7 +8,6 @@ import Steps from '../../Utilities/Steps'
 import { saveActionConf } from '../IntegrationHelpers/IntegrationHelpers'
 import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree'
 import WPCoursewareAuthorization from './WPCoursewareAuthorization'
-import { getWPCoursewareActions } from './WPCoursewareCommonFunc'
 import WPCoursewareIntegLayout from './WPCoursewareIntegLayout'
 
 export default function WPCourseware({ formFields, setFlow, flow, allIntegURL }) {
@@ -27,9 +26,8 @@ export default function WPCourseware({ formFields, setFlow, flow, allIntegURL })
     actions: {}
   })
 
-  const nextPage = (val) => {
+  const nextPage = val => {
     if (val === 2 && wpCoursewareConf.name !== '') {
-      getWPCoursewareActions(wpCoursewareConf, setWPCoursewareConf)
       setStep(val)
     } else if (val === 3 && wpCoursewareConf.action !== '' && wpCoursewareConf.course.length > 0) {
       setStep(val)

frontend-dev/src/components/AllIntegrations/WPCourseware/WPCoursewareCommonFunc.js

@@ -1,38 +1,24 @@
 import toast from 'react-hot-toast'
 import { __ } from '../../../Utils/i18nwrap'
 import bitsFetch from '../../../Utils/bitsFetch'
-
-export const getWPCoursewareActions = (wpCoursewareConf, setWPCoursewareConf) => {
-  const response = bitsFetch({}, 'wpCourseware_actions')
-    .then(result => {
-      const newConf = { ...wpCoursewareConf }
-      if (result.data.WPCWActions) {
-        newConf.default.WPCWActions = result.data.WPCWActions
-      }
-      getWPCoursewareCourses(newConf, setWPCoursewareConf)
-    })
-
-  toast.promise(response, {
-    success: __('Action Refreshed', 'bit-integrations'),
-    error: __('Failed, Try Again', 'bit-integrations'),
-    loading: __('Fetching...'),
-  })
-}
+import { create } from 'mutative'
 
 export const getWPCoursewareCourses = (wpCoursewareConf, setWPCoursewareConf) => {
-  const response = bitsFetch({}, 'wpCourseware_courses')
-    .then(result => {
-      const newConf = { ...wpCoursewareConf }
-      if (result.data.WPCWCourses) {
-        newConf.default.WPCWCourses = result.data.WPCWCourses
-      }
-      setWPCoursewareConf({ ...newConf })
-    })
+  const response = bitsFetch({}, 'wpCourseware_courses').then(result => {
+    const newConf = { ...wpCoursewareConf }
+    setWPCoursewareConf(prevConf =>
+      create(prevConf, draftConf => {
+        if (result.data.WPCWCourses) {
+          draftConf.default.WPCWCourses = result.data.WPCWCourses
+        }
+      })
+    )
+  })
 
   toast.promise(response, {
     success: __('Course Refreshed', 'bit-integrations'),
     error: __('Failed, Try Again', 'bit-integrations'),
-    loading: __('Fetching...'),
+    loading: __('Fetching...')
   })
 }
 

frontend-dev/src/components/AllIntegrations/WPCourseware/WPCoursewareIntegLayout.jsx

@@ -3,6 +3,7 @@ import MultiSelect from 'react-multiple-select-dropdown-lite'
 import { __ } from '../../../Utils/i18nwrap'
 import { getWPCoursewareCourses } from './WPCoursewareCommonFunc'
 import Note from '../../Utilities/Note'
+import { create } from 'mutative'
 
 export default function WPCoursewareIntegLayout({
   wpCoursewareConf,
@@ -12,16 +13,22 @@ export default function WPCoursewareIntegLayout({
   setSnackbar
 }) {
   const inputHandler = ({ target: { name, value } }) => {
-    setWPCoursewareConf({ ...wpCoursewareConf, [name]: value })
+    setWPCoursewareConf(prevConf =>
+      create(prevConf, draftConf => {
+        draftConf[name] = value
+      })
+    )
+
+    getWPCoursewareCourses(wpCoursewareConf, setWPCoursewareConf, setIsLoading, setSnackbar)
   }
 
-  const setCourses = (val) => {
+  const setCourses = val => {
     const newConf = { ...wpCoursewareConf }
 
     if (val.includes('select_all_course')) {
       newConf.selectedAllCourse = wpCoursewareConf.default.WPCWCourses.filter(
-        (course) => course.id !== 'select_all_course'
-      ).map((course) => course.id)
+        course => course.id !== 'select_all_course'
+      ).map(course => course.id)
     } else {
       delete newConf.selectedAllCourse
     }
@@ -36,17 +43,13 @@ export default function WPCoursewareIntegLayout({
       <div className="flx">
         <b className="wdt-200 d-in-b">{__('WP Courseware Actions:', 'bit-integrations')}</b>
         <select
-          onChange={(e) => inputHandler(e)}
+          onChange={e => inputHandler(e)}
           name="action"
           value={wpCoursewareConf.action}
           className="btcd-paper-inp w-5">
           <option value="">{__('Select Action', 'bit-integrations')}</option>
-          {wpCoursewareConf?.default?.WPCWActions &&
-            Object.values(wpCoursewareConf.default.WPCWActions).map(({ id, title }) => (
-              <option key={`${id}-1`} value={id}>
-                {title}
-              </option>
-            ))}
+          <option value="enroll">{__('Enroll user in a Course', 'bit-integrations')}</option>
+          <option value="unroll">{__('Unroll user in a Course', 'bit-integrations')}</option>
         </select>
       </div>
 
@@ -63,16 +66,11 @@ export default function WPCoursewareIntegLayout({
                 value: id.toString()
               }))
             }
-            onChange={(val) => setCourses(val)}
+            onChange={val => setCourses(val)}
           />
           <button
             onClick={() =>
-              getWPCoursewareCourses(
-                wpCoursewareConf,
-                setWPCoursewareConf,
-                setIsLoading,
-                setSnackbar
-              )
+              getWPCoursewareCourses(wpCoursewareConf, setWPCoursewareConf, setIsLoading, setSnackbar)
             }
             className="icn-btn sh-sm ml-2 mr-2 tooltip"
             style={{

includes/Actions/WPCourseware/Routes.php

@@ -4,9 +4,8 @@
     exit;
 }
 
-use BitCode\FI\Actions\WPCourseware\WPCoursewareController;
 use BitCode\FI\Core\Util\Route;
+use BitCode\FI\Actions\WPCourseware\WPCoursewareController;
 
 Route::post('wpCourseware_authorize', [WPCoursewareController::class, 'wpCoursewareAuthorize']);
-Route::post('wpCourseware_actions', [WPCoursewareController::class, 'WPCWActions']);
 Route::post('wpCourseware_courses', [WPCoursewareController::class, 'WPCWCourses']);

includes/Actions/WPCourseware/WPCoursewareController.php

@@ -23,24 +23,6 @@ public static function wpCoursewareAuthorize()
         }
     }
 
-    public static function WPCWActions()
-    {
-        if (!is_plugin_active('wp-courseware/wp-courseware.php')) {
-            wp_send_json_error(__('WP Courseware Plugin is not active or installed', 'bit-integrations'), 400);
-        }
-
-        $actions = [];
-        foreach (self::$actions as $action) {
-            $actions[] = (object) [
-                'id'    => $action['id'],
-                'title' => $action['title']
-            ];
-        }
-
-        $response['WPCWActions'] = $actions;
-        wp_send_json_success($response, 200);
-    }
-
     public static function WPCWCourses()
     {
         if (!is_plugin_active('wp-courseware/wp-courseware.php')) {
@@ -87,18 +69,4 @@ public function execute($integrationData, $fieldValues)
 
         return $recordApiHelper->execute($action, $course, $userId, $allCourse);
     }
-
-    protected static function actions()
-    {
-        return [
-            'enroll' => [
-                'id'    => 'enroll',
-                'title' => __('Enroll user in a Course', 'bit-integrations')
-            ],
-            'unroll' => [
-                'id'    => 'unroll',
-                'title' => __('Unroll user in a Course', 'bit-integrations')
-            ],
-        ];
-    }
 }