Remove Async EqualAccess, files can now save to LMS.

Author: mbusch3

assets/js/Components/ReviewFilesPage.js

@@ -398,9 +398,9 @@ export default function ReviewFilesPage({
    * handleFileUpload is called when a new file has already been selected by the user
    * and is ready to be uploaded to the server and verified.
    */
-  const handleFileUpload = (newFileData) => {
+  const handleFileUpload = (newFileData, changeReferences = false) => {
 
-    const tempFile = Object.assign({}, activeIssue.fileData)
+    const tempFile = Object.assign({}, activeIssue.fileData, { changeReferences: changeReferences } )
 
     updateActiveSessionIssue("file-" + tempFile.id, settings.ISSUE_STATE.SAVING)
 
@@ -409,8 +409,17 @@ export default function ReviewFilesPage({
       api.postFile(tempFile, newFileData)
         .then((responsStr) => responsStr.json())
         .then((response) => {
-          const updatedFileData = { ...tempFile, ...response.data.file }
+          if(response.errors && response.errors.length > 0) {
+            response.errors.forEach((err) => addMessage({ message: t(err), severity: 'error', visible: true }))
+            updateActiveSessionIssue("file-" + tempFile.id, settings.ISSUE_STATE.ERROR)
+            return
+          }
 
+          const updatedFileData = response?.data?.lmsResponse?.content
+          let metadataObj = tempFile.metadata ? JSON.parse(tempFile.metadata) : {}
+          console.log(updatedFileData)
+          metadataObj.replacedByFileId = updatedFileData.id
+          
           // Set messages 
           response.messages.forEach((msg) => addMessage(msg))
 

assets/js/Services/Report.js

@@ -194,6 +194,7 @@ export function analyzeReport(report, ISSUE_STATE) {
             fileReferences[fileId].push({
               contentItemTitle: contentItem.title,
               contentItemUrl: contentItem.url,
+              contentItemLmsId: contentItem.lmsContentId,
               contentType: contentItem.contentType,
               sectionIds: contentItem.sections,
             })

src/Controller/FileItemsController.php

@@ -10,6 +10,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Console\Output\ConsoleOutput;
 
 class FileItemsController extends ApiController
 {
@@ -65,6 +66,7 @@ public function reviewFile(FileItem $file, Request $request, UtilityService $uti
     #[Route('/api/files/{file}/post', methods: ['POST'], name: 'file_post')]
     public function postFile(FileItem $file, Request $request, UtilityService $util, LmsPostService $lmsPost)
     {
+        $output = new ConsoleOutput();
         $apiResponse = new ApiResponse();
         $user = $this->getUser();
 
@@ -77,10 +79,17 @@ public function postFile(FileItem $file, Request $request, UtilityService $util,
 
             $uploadedFile = $request->files->get('file');
 
+            $output->writeln("Uploading file: " . $uploadedFile->getClientOriginalName());
             // Save content to LMS
             $lmsResponse = $lmsPost->saveFileToLms($file, $uploadedFile, $user);
+            $responseContent = $lmsResponse->getContent();
 
-            $apiResponse->setData($lmsResponse);
+            $output->writeln("Response Content: " . print_r($responseContent, true));
+
+            // If the new file was successfully posted, update the FileItem metadata to point to this replacement
+            if (isset($responseContent['id'])) {
+                $file->setReplacementFile($responseContent);
+            }
 
             // Update report stats
             $report = $course->getUpdatedReport();
@@ -91,7 +100,9 @@ public function postFile(FileItem $file, Request $request, UtilityService $util,
             $apiResponse->addMessage('form.msg.success_replaced', 'success', 5000);
 
             $apiResponse->addLogMessages($util->getUnreadMessages());
+
             $apiResponse->setData([
+                'lmsResponse' => $lmsResponse,
                 'file' => ['pending' => false],
                 'report' => $report,
             ]);

src/Entity/Course.php

@@ -299,7 +299,9 @@ public function getFileItems($activeOnly = true): array
         $files = [];
 
         foreach ($this->fileItems as $file) {
-            $files[] = $file;
+            if (!$activeOnly || $file->isActive()) {
+                $files[] = $file;
+            }
         }
 
         return $files;

src/Entity/FileItem.php

@@ -137,6 +137,32 @@ public function setMetadata(?string $metadata): self
         return $this;
     }
 
+    public function setReplacementFile($fileData): self
+    {
+        $replacement = [
+            'id' => $fileData['id'],
+            'fileName' => $fileData['display_name'],
+            'fileType' => $fileData['mime_class'],
+            'url' => $fileData['url'],
+        ];
+
+        $tempMetadata = json_decode($this->getMetadata(), true);
+        $tempMetadata['replacement'] = $replacement;
+        $this->setMetadata(json_encode($tempMetadata));
+
+        return $this;
+    }
+
+    public function getReplacementFile(): ?array
+    {
+        $metadata = json_decode($this->getMetadata(), true);
+        if (isset($metadata['replacement'])) {
+            return $metadata['replacement'];
+        }
+
+        return [];
+    }
+
     public function getStatus(): ?bool
     {
         return $this->status;
@@ -188,6 +214,8 @@ public function setReviewed(?bool $reviewed): self
     public function update($file): self
     {
         $updatedDate = new \DateTime($file['updated'], UtilityService::$timezone);
+        $replacementFile = $this->getReplacementFile();
+        $file['replacement'] = $replacementFile;
 
         $this->setUpdated($updatedDate);
         $this->setActive(true);
@@ -217,6 +245,7 @@ public function jsonSerialize(): array
             'reviewed' => $this->getReviewed(),
             'downloadUrl' => $this->getDownloadUrl(),
             'lmsUrl' => $this->getLmsUrl(),
+            'metadata' => json_decode($this->getMetadata(), true),
         ];
     }
 

src/Lms/Canvas/CanvasApi.php

@@ -6,6 +6,7 @@
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\Mime\Part\DataPart;
 use Symfony\Component\Mime\Part\Multipart\FormDataPart;
+use Symfony\Component\Console\Output\ConsoleOutput;
 
 class CanvasApi {
 
@@ -111,28 +112,22 @@ public function apiPost($url, $options, $sendAuthorized = true)
     // Posts a file to Canvas
     public function apiFilePost(string $url, array $options, string $filepath, string $newFileName): LmsResponse
     {
+        // Since files are posted to REPLACE existing files, they should be placed in the same folder
         $fileResponse = $this->apiGet($url);
         $file = $fileResponse->getContent();
-
-        // TODO: handle failed call
-
         $endpointOptions = [
             'name' => $newFileName,
             'parent_folder_id' => $file['folder_id'],
-            'content_type' => $file['content-type'],
         ];
 
+        // Get the upload endpoint from Canvas for the new file
         $endpointResponse = $this->apiPost($options['postUrl'], ['query' => $endpointOptions], true);
         $endpointContent = $endpointResponse->getContent();
 
-        $this->apiDelete($url);
-
-        // TODO: handle failed call
-
+        // Attach the file and send it to the upload URL
         $formFields = $endpointContent['upload_params'];
         $formFields['file'] = DataPart::fromPath($filepath);
         $formData = new FormDataPart($formFields);
-
         $fileResponse = $this->apiPost($endpointContent['upload_url'], [
             'headers' => $formData->getPreparedHeaders()->toArray(),
             'body' => $formData->bodyToIterable(),

src/Lms/Canvas/CanvasLms.php

@@ -461,6 +461,7 @@ public function postContentItem(ContentItem $contentItem)
 
     public function postFileItem(FileItem $file, string $newFileName)
     {
+        $output = new ConsoleOutput();
         $user = $this->security->getUser();
         $apiDomain = $this->getApiDomain($user);
         $apiToken = $this->getApiToken($user);
@@ -471,13 +472,9 @@ public function postFileItem(FileItem $file, string $newFileName)
             'postUrl' => "courses/{$file->getCourse()->getLmsCourseId()}/files"
         ];
 
+        $output->writeln("Posting file to LMS: " . $url . " with file path: " . $filepath);
         $fileResponse = $canvasApi->apiFilePost($url, $options, $filepath, $newFileName);
-        $fileObj = $fileResponse->getContent();
-
-        if (isset($fileObj['id'])) {
-            $file->setLmsFileId($fileObj['id']);
-            $this->entityManager->flush();
-        }
+        
 
         return $fileResponse;
     }