checkpoint: 07-08-2025 13:08:58

Author: purfectliterature

app/controllers/components/course/scholaistic_component.rb

@@ -55,11 +55,13 @@ def assistant_sidebar_items
   def admin_sidebar_items
     [
       {
+        key: :scholaistic_assistants,
         type: :admin,
         icon: :chatbot,
         title: I18n.t('components.scholaistic.manage_assistants'),
         weight: 9,
-        path: course_scholaistic_assistants_path(current_course)
+        path: course_scholaistic_assistants_path(current_course),
+        exact: true
       }
     ]
   end

app/controllers/course/admin/scholaistic_settings_controller.rb

@@ -15,7 +15,7 @@ def confirm_link_course
     key = ScholaisticApiService.parse_link_course_callback_request(request, params)
     head :bad_request and return if key.blank?
 
-    @settings.update(integration_key: key) && current_course.save
+    @settings.update(integration_key: key, last_synced_at: nil) && current_course.save
   end
 
   def link_course
@@ -35,7 +35,7 @@ def unlink_course
 
     ScholaisticApiService.unlink_course!(@settings.integration_key)
 
-    update_settings_and_render(integration_key: nil)
+    update_settings_and_render(integration_key: nil, last_synced_at: nil)
   end
 
   protected

app/controllers/course/scholaistic/assistants_controller.rb

@@ -3,15 +3,22 @@ class Course::Scholaistic::AssistantsController < Course::Scholaistic::Controlle
   def index
     authorize! :manage_scholaistic_assistants, current_course
 
-    @embed_src = ScholaisticApiService.embed(current_course_user, ScholaisticApiService.assistants_path)
+    @embed_src = ScholaisticApiService.embed!(
+      current_course_user,
+      ScholaisticApiService.assistants_path,
+      request.origin
+    )
   end
 
   def show
     authorize! :read_scholaistic_assistants, current_course
 
-    assistant_id = params[:id]
+    @assistant_title = ScholaisticApiService.assistant!(current_course, params[:id])[:title]
 
-    @assistant_title = ScholaisticApiService.assistant!(current_course, assistant_id)[:title]
-    @embed_src = ScholaisticApiService.embed(current_course_user, ScholaisticApiService.assistant_path(assistant_id))
+    @embed_src = ScholaisticApiService.embed!(
+      current_course_user,
+      ScholaisticApiService.assistant_path(params[:id]),
+      request.origin
+    )
   end
 end

app/controllers/course/scholaistic/scholaistic_assessments_controller.rb

@@ -2,7 +2,7 @@
 class Course::Scholaistic::ScholaisticAssessmentsController < Course::Scholaistic::Controller
   load_and_authorize_resource :scholaistic_assessment, through: :course, class: Course::ScholaisticAssessment.name
 
-  before_action :sync_scholaistic_assessments!
+  before_action :sync_scholaistic_assessments!, only: [:index, :show, :edit]
 
   def index
     submissions_status_hash = ScholaisticApiService.submissions!(
@@ -12,30 +12,43 @@ def index
 
     @assessments_status = @scholaistic_assessments.to_h do |assessment|
       [assessment.id,
-       submissions_status_hash[assessment.upstream_id]&.status ||
+       submissions_status_hash[assessment.upstream_id]&.[](:status) ||
          (condition_satisfied?(assessment) ? 'unavailable' : 'open')]
     end
   end
 
   def new
-    @embed_src = ScholaisticApiService.embed(current_course_user, ScholaisticApiService.new_assessment_path)
+    @embed_src = ScholaisticApiService.embed!(
+      current_course_user,
+      ScholaisticApiService.new_assessment_path,
+      request.origin
+    )
   end
 
   def show
     upstream_id = @scholaistic_assessment.upstream_id
 
     @embed_src =
       if can?(:update, @scholaistic_assessment)
-        ScholaisticApiService.embed(current_course, ScholaisticApiService.edit_assessment_path(upstream_id))
+        ScholaisticApiService.embed!(
+          current_course_user,
+          ScholaisticApiService.edit_assessment_path(upstream_id),
+          request.origin
+        )
       else
-        ScholaisticApiService.embed(current_course_user, ScholaisticApiService.assessment_path(upstream_id))
+        ScholaisticApiService.embed!(
+          current_course_user,
+          ScholaisticApiService.assessment_path(upstream_id),
+          request.origin
+        )
       end
   end
 
   def edit
-    @embed_src = ScholaisticApiService.embed(
-      current_course,
-      ScholaisticApiService.edit_assessment_details_path(@scholaistic_assessment.upstream_id)
+    @embed_src = ScholaisticApiService.embed!(
+      current_course_user,
+      ScholaisticApiService.edit_assessment_details_path(@scholaistic_assessment.upstream_id),
+      request.origin
     )
   end
 
@@ -78,8 +91,9 @@ def sync_scholaistic_assessments!
         end.save!
       end
 
-      if response[:deleted].present?
-        current_course.scholaistic_assessments.where(upstream_id: response[:deleted]).destroy_all
+      if response[:deleted].present? && !current_course.scholaistic_assessments.
+         where(upstream_id: response[:deleted]).destroy_all
+        raise ActiveRecord::Rollback
       end
 
       current_course.settings(:course_scholaistic_component).public_send('last_synced_at=', response[:last_synced_at])

app/controllers/course/scholaistic/submissions_controller.rb

@@ -5,16 +5,23 @@ class Course::Scholaistic::SubmissionsController < Course::Scholaistic::Controll
   before_action :sync_scholaistic_submission!, only: [:show]
 
   def index
-    @embed_src = ScholaisticApiService.embed(
-      current_course_user, ScholaisticApiService.submissions_path(@scholaistic_assessment.upstream_id)
+    @embed_src = ScholaisticApiService.embed!(
+      current_course_user,
+      ScholaisticApiService.submissions_path(@scholaistic_assessment.upstream_id),
+      request.origin
     )
   end
 
   def show
-    @creator_name = ScholaisticApiService.submission!(submission_id)
+    result = ScholaisticApiService.submission!(current_course, submission_id)
+    head :not_found and return if result[:status] == :not_found
 
-    @embed_src = ScholaisticApiService.embed(
-      current_course_user, ScholaisticApiService.submission_path(@scholaistic_assessment.upstream_id, submission_id)
+    @creator_name = result[:creator_name]
+
+    @embed_src = ScholaisticApiService.embed!(
+      current_course_user,
+      ScholaisticApiService.submission_path(@scholaistic_assessment.upstream_id, submission_id),
+      request.origin
     )
   end
 

app/services/scholaistic_api_service.rb

@@ -33,118 +33,95 @@ def assistant_path(assistant_id)
       "/assistants/#{assistant_id}"
     end
 
-    # TODO
-    def embed(course_user, path)
-      # connection!(course_user, :post, 'embed', body: {
-      #   key: settings(course_user.course).integration_key,
-      #   path: path
-      # })
-
-      # 'https://beta.scholaistic.com/courses/1adc364a-c5cb-45f2-80b8-09fec4fc19ce/administration/assessments/6c20d164-989d-498e-b792-5f4c98a2f9f4/submissions'
-      'https://beta.scholaistic.com/courses/1adc364a-c5cb-45f2-80b8-09fec4fc19ce/administration/assessments/6c20d164-989d-498e-b792-5f4c98a2f9f4/details'
+    def embed!(course_user, path, origin)
+      connection!(:post, 'embed', body: {
+        key: settings(course_user.course).integration_key,
+        path: path,
+        origin: origin,
+        upsert_course_user: course_user_upsert_payload(course_user)
+      })
     end
 
-    # TODO
     def assistant!(course, assistant_id)
-      # connection!(:get, 'assistant', query: { key: settings(course).integration_key, id: assistant_id })
+      result = connection!(:get, 'assistant', query: { key: settings(course).integration_key, id: assistant_id })
 
-      {
-        title: 'gptboy'
-      }
+      { title: result[:title] }
     end
 
-    # TODO
     def assistants!(course)
-      # connection!(:get, 'assistants', query: { key: settings(course).integration_key })
+      result = connection!(:get, 'assistants', query: { key: settings(course).integration_key })
 
-      [{
-        id: 'gptboy',
-        title: 'gptboy',
-        sidebar_title: 'gptboy'
-      }, {
-        id: 'gptgirl',
-        title: 'gptgirl',
-        sidebar_title: 'gptgirl'
-      }]
+      result.filter_map do |assistant|
+        next if assistant[:activityType] != 'assistant' || !assistant[:isPublished]
+
+        {
+          id: assistant[:id],
+          title: assistant[:title],
+          sidebar_title: assistant[:altTitle]
+        }
+      end
     end
 
-    # TODO
     def find_or_create_submission!(course_user, assessment_id)
-      # connection!(course_user, :post, 'submission', body: {
-      #   key: settings(course_user.course).integration_key,
-      #   assessmentId: assessment_id,
-      #   upsertCourseUser: course_user_upsert_payload(course_user)
-      # })
+      result = connection!(:post, 'submission', body: {
+        key: settings(course_user.course).integration_key,
+        assessment_id: assessment_id,
+        upsert_course_user: course_user_upsert_payload(course_user)
+      })
 
-      '12345' # Example submission ID
+      result[:id]
     end
 
-    # TODO
     def submission!(course, submission_id)
-      # connection!(:get, 'submission', query: {
-      #   key: settings(course).integration_key,
-      #   id: submission_id
-      # })
+      result = connection!(:get, 'submission', query: {
+        key: settings(course).integration_key,
+        id: submission_id
+      })
 
       {
-        creator_name: 'hamad',
-        creator_email: '[email protected]',
-        status: :graded
+        creator_name: result[:creatorName],
+        creator_email: result[:creatorEmail],
+        status: result[:status]
       }
     rescue Excon::Error::NotFound
       { status: :not_found }
     end
 
-    # TODO
     def submissions!(assessment_ids, course_user)
-      # connection!(:post, 'submissions', body: {
-      #   key: settings(course_user.course).integration_key,
-      #   assessmentIds: assessment_ids,
-      #   upsertCourseUser: course_user_upsert_payload(course_user)
-      # })
+      result = connection!(:post, 'submissions', body: {
+        key: settings(course_user.course).integration_key,
+        assessment_ids: assessment_ids,
+        upsert_course_user: course_user_upsert_payload(course_user)
+      })
 
-      {
-        '12345': {
-          status: 'attempting',
-          id: '12345'
-        }
-      }
+      result.to_h do |assessment_id, submission|
+        [assessment_id.to_s,
+         status: submission[:status],
+         id: submission[:submissionId]]
+      end
     end
 
-    # TODO
     def assessments!(course)
-      # connection!(:get, 'assessments', query: {
-      #   key: settings(course).integration_key,
-      #   lastSynced: settings(course).last_synced_at
-      # }.compact)
+      result = connection!(:get, 'assessments', query: {
+        key: settings(course).integration_key,
+        lastSynced: settings(course).last_synced_at
+      }.compact)
 
       {
-        assessments: [
-          {
-            upstream_id: '12345',
-            published: true,
-            title: 'Sample Assessment2',
-            description: 'This is a sample assessment for testing purposes.',
-            start_at: Time.current.iso8601,
-            end_at: (Time.current + 1.week).iso8601
-          },
+        assessments: result[:assessments].filter_map do |assessment|
+          next if assessment[:activityType] != 'assessment'
+
           {
-            upstream_id: '67890',
-            published: false,
-            title: 'Draft Assessment',
-            description: 'This assessment is still in draft mode and not yet published.',
-            start_at: (Time.current + 1.day).iso8601
+            upstream_id: assessment[:id],
+            published: assessment[:isPublished],
+            title: assessment[:title],
+            description: assessment[:description],
+            start_at: assessment[:startsAt],
+            end_at: assessment[:endsAt]
           }
-          # {
-          #   upstream_id: '11223',
-          #   published: true,
-          #   title: 'Upcoming Assessment',
-          #   description: 'This assessment will be available in the future.',
-          #   start_at: (Time.current + 2.days).iso8601
-          # }
-        ],
-        deleted: ['11223'],
-        last_synced_at: Time.current.iso8601
+        end,
+        deleted: result[:deleted],
+        last_synced_at: result[:lastSynced]
       }
     end
 

client/app/bundles/course/scholaistic/components/ScholaisticAsyncContainer.tsx

@@ -0,0 +1,34 @@
+import { ComponentType, ReactNode, Suspense } from 'react';
+import { Await, useLoaderData } from 'react-router-dom';
+
+import LoadingIndicator from 'lib/components/core/LoadingIndicator';
+
+const ScholaisticAsyncContainer = ({
+  children,
+}: {
+  children: ReactNode;
+}): JSX.Element => {
+  const data = useLoaderData() as { promise: Promise<unknown> };
+
+  return (
+    <Suspense fallback={<LoadingIndicator />}>
+      <Await errorElement={<p>oopsie</p>} resolve={data.promise}>
+        {children}
+      </Await>
+    </Suspense>
+  );
+};
+
+export const withScholaisticAsyncContainer = (
+  Component: ComponentType,
+): ComponentType => {
+  const WrappedComponent: ComponentType = (props) => (
+    <ScholaisticAsyncContainer>
+      <Component {...props} />
+    </ScholaisticAsyncContainer>
+  );
+
+  WrappedComponent.displayName = `withScholaisticAsyncContainer(${Component.displayName || Component.name})`;
+
+  return WrappedComponent;
+};