Merge pull request ucfopen#1058 from barnesc3/user-info-update

Show instructors in Admin Reports and populate user full names in DB

Author: dmols

INSTALL_CANVAS.md

@@ -46,6 +46,7 @@ We strongly recommend you enforce scopes with your API key. The following scopes
   * url:PUT|/api/v1/courses/:id
   * url:GET|/api/v1/courses/:id
   * url:POST|/api/v1/courses/:course_id/files
+  * url:GET|/api/v1/courses/:course_id/users
 * discussion_topics
   * url:GET|/api/v1/courses/:course_id/discussion_topics
   * url:PUT|/api/v1/courses/:course_id/discussion_topics/:topic_id
@@ -78,6 +79,10 @@ We strongly recommend you enforce scopes with your API key. The following scopes
   * url:GET|/api/v1/courses/:course_id/pages
   * url:GET|/api/v1/courses/:course_id/pages/:url_or_id
   * url:PUT|/api/v1/courses/:course_id/pages/:url_or_id
+ 
+* enrollments_api
+  * url:GET|/api/v1/courses/:course_id/enrollments
+  *   
 
 ---
 ## Create an LTI Developer Key

assets/js/Components/Admin/AdminApp.js

@@ -92,8 +92,29 @@ export default function AdminApp(initialData) {
   }, [filters])
 
   const handleCourseUpdate = (courseData) => {
-    let tempCourses = Object.assign({}, courses)
-    tempCourses[courseData.id] = courseData
+    let tempCourses = {...courses}
+    
+    // If there's an oldId, this is a newly scanned course that needs the old entry removed
+    if (courseData.oldId && courseData.oldId !== courseData.id) {
+      // Remove the old unscanned course entry
+      if (tempCourses[courseData.oldId]) {
+        delete tempCourses[courseData.oldId]
+      }
+      
+      // Add the new scanned course entry
+      const updatedCourse = {...courseData}
+      delete updatedCourse.oldId  // Remove the signal flag
+      tempCourses[courseData.id] = updatedCourse
+    }
+    // If updating an existing course, just update its data
+    else if (tempCourses[courseData.id]) {
+      tempCourses[courseData.id] = {...tempCourses[courseData.id], ...courseData}
+    } 
+    // If it's a new course, add it
+    else {
+      tempCourses[courseData.id] = courseData
+    }
+    
     setCourses(tempCourses)
   }
 

assets/js/Components/Admin/AdminFilters.js

@@ -69,15 +69,15 @@ export default function AdminFilters({
             <select
               id="inputAccount"
               disabled={loadingContent}
+              value={filters.accountId.toString()}
               onChange={(e) => handleAccountSelect(e.target.value)}
             >
               {accountOptions.map((acct, i) => {
                 return (
                   <option
                     key={`acct-${i}`}
                     value={acct.id}
-                    selected={filters.accountId.toString() === acct.id.toString()}
-                    >
+                  >
                     {acct.name}
                   </option>
                 )
@@ -93,15 +93,15 @@ export default function AdminFilters({
             <select
               id="inputTerm"
               disabled={loadingContent}
+              value={filters.accountId.toString()}
               onChange={(e) => handleTermSelect(e.target.value)}
             >
               {termOptions.map((term, i) => {
                 return (
                   <option
                     key={`term-${i}`}
                     value={term.id}
-                    selected={filters.termId.toString() === term.id.toString()}
-                    >
+                  >
                     {term.name}
                   </option>
                 )