Merge branch 'master' of github.com:Simon-Initiative/oli-torus into p…

…rerelease-v0.29.0
Simon-Initiative · Dec 3, 2024 · dbf4e4a · dbf4e4a
2 parents 50f48bb + fd4b703
commit dbf4e4a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/auto-deploy.yml b/.github/workflows/auto-deploy.yml
@@ -9,7 +9,8 @@ on:
 jobs:
   auto-deploy:
     name: Auto Deploy
-    if: vars.AUTO_DEPLOY_ENABLED == 'TRUE' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == vars.AUTO_DEPLOY_REF
+    # always() is required here due to a strange bug in GitHub Actions https://github.com/actions/runner/issues/2205#issuecomment-1534430719
+    if: always() && (vars.AUTO_DEPLOY_ENABLED == 'TRUE' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == vars.AUTO_DEPLOY_REF)
     runs-on: ubuntu-latest
     environment:
       name: ${{ vars.AUTO_DEPLOY_TARGET }}

diff --git a/assets/src/apps/authoring/components/ScreenList/ScreenList.tsx b/assets/src/apps/authoring/components/ScreenList/ScreenList.tsx
@@ -118,6 +118,7 @@ export const ScreenList: React.FC<Props> = ({ onFlowchartMode }) => {
 
   const onSelectScreen = useCallback(
     (screenResourceId: EntityId) => {
+      dispatch(setCurrentPartPropertyFocus({ focus: false }));
       dispatch(setCurrentActivityId({ activityId: screenResourceId }));
     },
     [dispatch],

diff --git a/assets/src/apps/authoring/components/SequenceEditor/SequenceEditor.tsx b/assets/src/apps/authoring/components/SequenceEditor/SequenceEditor.tsx
@@ -90,7 +90,7 @@ const SequenceEditor: React.FC<any> = (props: any) => {
 
   const handleItemClick = (e: any, entry: SequenceEntry<SequenceEntryChild>) => {
     e.stopPropagation();
-    dispatch(setCurrentPartPropertyFocus({ focus: true }));
+    dispatch(setCurrentPartPropertyFocus({ focus: false }));
     dispatch(setCurrentActivityFromSequence(entry.custom.sequenceId));
     dispatch(
       setRightPanelActiveTab({