Merge branch 'new-main-page-UX' of github.com:ucfopen/UDOIT into InlineCSSADD

Author: dmols

.env.example

@@ -16,6 +16,10 @@
 ###> symfony/framework-bundle ###
 APP_ENV=prod
 APP_SECRET=eb2f09f8a21b0b7c57b9fc36eee250eb
+
+# Add your sentry DSN if you want error tracking
+SENTRY_DSN=""
+
 #TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
 #TRUSTED_HOSTS='^(localhost|example\.com)$'
 ###< symfony/framework-bundle ###

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
         php-versions: ['8.4']
         node-version: [20.19.0]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Log in to the Container registry
         uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
@@ -35,27 +35,27 @@ jobs:
         uses: ASzc/change-string-case-action@v2
         with:
           string: ${{ github.repository }}
-      
+
       - name: Display repository name
         run: echo ${{ steps.case.outputs.lowercase }}
 
       - name: Find-and-replace strings
         id: slash
         uses: mad9000/actions-find-and-replace-string@2
         with:
-          source: ${{ github.ref_name }} 
-          find: '/' 
-          replace: '-'   
+          source: ${{ github.ref_name }}
+          find: '/'
+          replace: '-'
 
       - name: Display issue name
-        run: echo ${{ steps.slash.outputs.value }}      
+        run: echo ${{ steps.slash.outputs.value }}
 
       - name: Build Image
         run: |
           cp .env.example .env
           docker compose -f docker-compose.nginx.yml build
           docker compose -f docker-compose.nginx.yml run composer composer install --no-dev --no-interaction --no-progress --optimize-autoloader
-          docker compose -f docker-compose.nginx.yml run yarn bash -c 'cd /app && yarn install && yarn build'        
+          docker compose -f docker-compose.nginx.yml run yarn bash -c 'cd /app && yarn install && yarn build'
           docker build . -t udoit:latest -f build/nginx/Dockerfile.build
           docker tag udoit:latest ${{ env.REGISTRY }}/${{ steps.case.outputs.lowercase }}:${{ steps.slash.outputs.value }}
 

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)
   }
 
@@ -132,7 +153,7 @@ export default function AdminApp(initialData) {
         }
 
         { !loadingCourses && (
-          <div className="non-scrollable">
+          <div className="mt-3">
 
             {('courses' === navigation) &&
               <CoursesPage

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>
                 )