chore(release): sync upstream release/ulmo.1 into release-ulmo (#84)

* fix: support "in progress" status for lib upload

When uploading a library archive file during the creation of a new
library, the code prior to this commit did not properly handle the "In
Progress" state, which is when the celery task doing the archive
processing is actively running. Note that this is distinct from the
"Pending" state, which is when the task is waiting in the queue to be
run (which in practice should almost never happen unless there is an
operational issue).

Since celery tasks run in-process during local development, the task
was always finished by the time that the browser made a call to check
on the status. The problem only happened on slower sandboxes, where
processing truly runs asynchronously and might take a few seconds.
Because this case wasn't handled, the frontend would never poll for
updates either, so the upload was basically lost as far as the user
was concerned.

* feat: add temporary message alert in sections settings tab in libraries (openedx#2734) (openedx#2766)

- add temporary message alert in sections settings tab in libraries
- increase sidebar width to remove `More` option and display all tabs
together

(cherry picked from commit 3eeca24)

---------

Co-authored-by: David Ormsbee <[email protected]>
Co-authored-by: Navin Karkera <[email protected]>

Author: 3 people

src/library-authoring/LibraryAuthoringPage.scss

@@ -13,7 +13,7 @@
 
 .library-authoring-sidebar {
   z-index: 1000; // same as header
-  flex: 500px 0 0;
+  flex: 530px 0 0;
   position: sticky;
   top: 0;
   right: 0;

src/library-authoring/containers/ContainerInfo.tsx

@@ -8,10 +8,11 @@ import {
   Icon,
   IconButton,
   useToggle,
+  Alert,
 } from '@openedx/paragon';
 import React, { useCallback } from 'react';
 import { Link } from 'react-router-dom';
-import { MoreVert } from '@openedx/paragon/icons';
+import { InfoOutline, MoreVert } from '@openedx/paragon/icons';
 
 import { useClipboard } from '@src/generic/clipboard';
 import { ContainerType, getBlockType } from '@src/generic/key-utils';
@@ -149,6 +150,15 @@ const ContainerActions = ({
   );
 };
 
+/* istanbul ignore next */
+/* istanbul ignore next */
+const ContainerSettings = () => (
+  <Alert icon={InfoOutline} variant="info">
+    <p>
+      <FormattedMessage {...messages.containerSettingsMsg} />
+    </p>
+  </Alert>
+);
 const ContainerInfo = () => {
   const intl = useIntl();
   const {
@@ -222,7 +232,7 @@ const ContainerInfo = () => {
         {renderTab(
           CONTAINER_INFO_TABS.Settings,
           intl.formatMessage(messages.settingsTabTitle),
-          // TODO: container settings component
+          <ContainerSettings />,
         )}
       </Tabs>
     </Stack>

src/library-authoring/containers/messages.ts

@@ -66,6 +66,11 @@ const messages = defineMessages({
     defaultMessage: 'Container actions menu',
     description: 'Alt/title text for the container card menu button.',
   },
+  containerSettingsMsg: {
+    id: 'course-authoring.library-authoring.container.settings.alert.message',
+    defaultMessage: 'Section settings cannot be configured within Libraries and must be set within a course. In a future release, Libraries may support configuring some settings.',
+    description: 'Temporary message for settings tab being',
+  },
   menuOpen: {
     id: 'course-authoring.library-authoring.menu.open',
     defaultMessage: 'Open',

src/library-authoring/create-library/CreateLibrary.tsx

@@ -253,7 +253,8 @@ export const CreateLibrary = ({
 
         {(restoreTaskId || isError || restoreMutation.isError) && (
           <div className="mb-4">
-            {restoreStatus?.state === LibraryRestoreStatus.Pending && (
+            {(restoreStatus?.state === LibraryRestoreStatus.Pending
+            || restoreStatus?.state === LibraryRestoreStatus.InProgress) && (
               <Alert variant="info">
                 {intl.formatMessage(messages.restoreInProgress)}
               </Alert>

src/library-authoring/create-library/data/apiHooks.test.tsx

@@ -173,6 +173,34 @@ describe('create library apiHooks', () => {
       expect(axiosMock.history.get[0].url).toEqual(`http://localhost:18010/api/libraries/v2/restore/?task_id=${taskId}`);
     });
 
+    it('should handle in-progress status with refetch interval', async () => {
+      const taskId = 'in-progress-task-id';
+      const inProgressResult = {
+        state: LibraryRestoreStatus.InProgress,
+        result: null,
+        error: null,
+        error_log: null,
+      };
+
+      const expectedResult = {
+        state: LibraryRestoreStatus.InProgress,
+        result: null,
+        error: null,
+        errorLog: null,
+      };
+
+      axiosMock.onGet(`http://localhost:18010/api/libraries/v2/restore/?task_id=${taskId}`).reply(200, inProgressResult);
+
+      const { result } = renderHook(() => useGetLibraryRestoreStatus(taskId), { wrapper });
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBeFalsy();
+      });
+
+      expect(result.current.data).toEqual(expectedResult);
+      expect(axiosMock.history.get[0].url).toEqual(`http://localhost:18010/api/libraries/v2/restore/?task_id=${taskId}`);
+    });
+
     it('should handle failed status', async () => {
       const taskId = 'failed-task-id';
       const failedResult = {

src/library-authoring/create-library/data/apiHooks.ts

@@ -41,7 +41,10 @@ export const useGetLibraryRestoreStatus = (taskId: string) => useQuery<GetLibrar
   queryKey: libraryRestoreQueryKeys.restoreStatus(taskId),
   queryFn: () => getLibraryRestoreStatus(taskId),
   enabled: !!taskId, // Only run the query if taskId is provided
-  refetchInterval: (query) => (query.state.data?.state === LibraryRestoreStatus.Pending ? 2000 : false),
+  refetchInterval: (query) => (
+    (query.state.data?.state === LibraryRestoreStatus.Pending
+      || query.state.data?.state === LibraryRestoreStatus.InProgress
+    ) ? 2000 : false),
 });
 
 export const useCreateLibraryRestore = () => useMutation<CreateLibraryRestoreResponse, Error, File>({

src/library-authoring/create-library/data/restoreConstants.ts

@@ -32,6 +32,7 @@ export interface GetLibraryRestoreStatusResponse {
 
 export enum LibraryRestoreStatus {
   Pending = 'Pending',
+  InProgress = 'In Progress',
   Succeeded = 'Succeeded',
   Failed = 'Failed',
 }