Hotfixes into unstable cascade merge

.github/workflows/deploytest.yml

@@ -61,7 +61,9 @@ jobs:
           ${{ runner.os }}-pyprod-
     - name: Install pip-tools and python dependencies
       run: |
-        python -m pip install --upgrade pip
+        # Pin pip to 25.2 to avoid incompatibility with pip-tools and 25.3
+        # see https://github.com/jazzband/pip-tools/issues/2252
+        python -m pip install pip==25.2
         pip install pip-tools
         pip-sync requirements.txt
     - name: Use pnpm

.github/workflows/pythontest.yml

@@ -82,7 +82,9 @@ jobs:
           ${{ runner.os }}-pytest-
     - name: Install pip-tools and python dependencies
       run: |
-        python -m pip install --upgrade pip
+        # Pin pip to 25.2 to avoid incompatibility with pip-tools and 25.3
+        # see https://github.com/jazzband/pip-tools/issues/2252
+        python -m pip install pip==25.2
         pip install pip-tools
         pip-sync requirements.txt requirements-dev.txt
     - name: Test pytest

contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue

@@ -52,44 +52,40 @@
           >
             <VIconWrapper small> check_circle </VIconWrapper>
             <span class="mx-1">{{ $tr('addedText') }}</span>
-            <VBtn
-              color="primary"
+            <KButton
+              primary
+              :text="$tr('removeButton')"
               @click="deselectNode(previewNode)"
-            >
-              {{ $tr('removeButton') }}
-            </VBtn>
+            />
           </VLayout>
         </VFadeTransition>
-        <VBtn
+        <KButton
           v-if="!previewIsSelected"
-          color="primary"
+          primary
+          :text="$tr('addButton')"
           @click="selectNode(previewNode)"
-        >
-          {{ $tr('addButton') }}
-        </VBtn>
+        />
       </template>
     </ResourceDrawer>
     <template #bottom>
       <div class="mx-2 subheading">
         {{ $tr('resourcesSelected', { count: selectedResourcesCount }) }}
       </div>
       <VSpacer />
-      <VBtn
+      <KButton
         v-if="isReview"
+        primary
         :disabled="selected.length === 0"
-        color="primary"
+        :text="$tr('importAction')"
         @click="handleClickImport"
-      >
-        {{ $tr('importAction') }}
-      </VBtn>
-      <VBtn
+      />
+      <KButton
         v-else
-        color="primary"
+        primary
         :disabled="selected.length === 0"
+        :text="$tr('reviewAction')"
         @click="handleClickReview"
-      >
-        {{ $tr('reviewAction') }}
-      </VBtn>
+      />
     </template>
   </FullscreenModal>
 

contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue

@@ -13,8 +13,9 @@
             v-if="!isBrowsing"
             class="my-2"
           >
-            <ActionLink
+            <KButton
               :text="$tr('backToBrowseAction')"
+              appearance="basic-link"
               @click="handleBackToBrowse"
             />
           </div>
@@ -44,25 +45,27 @@
                 <Icon icon="search" />
               </template>
               <template #append-outer>
-                <VBtn
+                <KButton
                   class="px-4 search-btn"
-                  color="primary"
+                  primary
                   type="submit"
+                  :text="$tr('searchAction')"
                   :disabled="!searchIsValid"
-                  depressed
-                  large
-                >
-                  {{ $tr('searchAction') }}
-                </VBtn>
+                  appearance="raised-button"
+                />
               </template>
             </VTextField>
           </VForm>
 
-          <div class="my-2">
-            <ActionLink
-              v-if="!isBrowsing"
+          <div
+            v-if="!isBrowsing"
+            class="my-2"
+          >
+            <KButton
+              class="mb-3"
               :text="$tr('savedSearchesLabel')"
               :disabled="!savedSearchesExist"
+              appearance="basic-link"
               @click="showSavedSearches = true"
             />
             <ActionLink

contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchResultsList.vue

@@ -40,10 +40,11 @@
                   })
                 }}
               </span>
-              <ActionLink
+              <KButton
                 class="mx-2"
                 :disabled="currentSearchSaved"
                 :text="currentSearchSaved ? $tr('searchSavedSnackbar') : $tr('saveSearchAction')"
+                appearance="basic-link"
                 @click="handleClickSaveSearch"
               />
             </VFlex>

contentcuration/contentcuration/frontend/channelEdit/views/files/ContentRenderer.vue

@@ -1,12 +1,12 @@
 <template>
 
-  <VLayout
-    :key="fileId"
-    :class="{ fullscreen }"
+  <div
+    class="renderer"
+    :aria-busy="isSupported && loading"
   >
-    <div
-      class="renderer"
-      :aria-busy="isSupported && loading"
+    <VLayout
+      :key="fileId"
+      :class="{ fullscreen }"
     >
       <div
         v-show="isSupported && loading"
@@ -139,8 +139,8 @@
           </VTooltip>
         </VLayout>
       </VCard>
-    </div>
-  </VLayout>
+    </VLayout>
+  </div>
 
 </template>
 

contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js

@@ -7,7 +7,7 @@ import messages from '../../translator';
 import { parseNode } from './utils';
 import { getNodeDetailsErrors, getNodeFilesErrors } from 'shared/utils/validation';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
-import { NEW_OBJECT } from 'shared/constants';
+import { NEW_OBJECT, ValidationErrors } from 'shared/constants';
 import { COPYING_STATUS, COPYING_STATUS_VALUES } from 'shared/data/constants';
 
 function sorted(nodes) {
@@ -158,14 +158,22 @@ export function getContentNodeIsValid(state, getters, rootState, rootGetters) {
 
 export function getContentNodeDetailsAreValid(state) {
   return function (contentNodeId) {
-    const contentNode = state.contentNodesMap[contentNodeId];
-    return contentNode && (contentNode[NEW_OBJECT] || !getNodeDetailsErrors(contentNode).length);
+    return !getNodeDetailsErrorsList(state)(contentNodeId).length;
   };
 }
 
 export function getNodeDetailsErrorsList(state) {
   return function (contentNodeId) {
     const contentNode = state.contentNodesMap[contentNodeId];
+
+    if (!contentNode) {
+      return [ValidationErrors.MISSING_NODE];
+    }
+
+    if (contentNode[NEW_OBJECT]) {
+      return [];
+    }
+
     return getNodeDetailsErrors(contentNode);
   };
 }

contentcuration/contentcuration/frontend/shared/constants.js

@@ -190,6 +190,7 @@ export const ValidationErrors = {
   ACTIVITY_DURATION_MAX_FOR_LONG_ACTIVITY: 'ACTIVITY_DURATION_MAX_FOR_LONG_ACTIVITY',
   ACTIVITY_DURATION_MIN_REQUIREMENT: 'ACTIVITY_DURATION_MIN_REQUIREMENT',
   ACTIVITY_DURATION_TOO_LONG: 'ACTIVITY_DURATION_TOO_LONG',
+  MISSING_NODE: 'MISSING_NODE',
   ...fileErrors,
 };
 

contentcuration/contentcuration/frontend/shared/feedbackApiUtils.js

@@ -12,9 +12,9 @@ export const FeedbackTypeOptions = {
   flagged: 'FLAGGED',
 };
 
-export const FLAG_FEEDBACK_EVENT_ENDPOINT = 'flagged';
-export const RECOMMENDATION_EVENT_ENDPOINT = 'recommendations';
-export const RECOMMENDATION_INTERACTION_EVENT_ENDPOINT = 'recommendations-interaction';
+export const FLAG_FEEDBACK_EVENT_ENDPOINT = 'flagged-events';
+export const RECOMMENDATION_EVENT_ENDPOINT = 'recommendations-events';
+export const RECOMMENDATION_INTERACTION_EVENT_ENDPOINT = 'recommendations-interaction-events';
 
 /**
  * @typedef {Object} BaseFeedbackParams

contentcuration/contentcuration/frontend/shared/styles/main.scss

@@ -48,9 +48,12 @@ body {
     text-align: center;
   }
 
-  .button:focus-visible,
   .v-btn:focus-visible {
-    outline: 2px solid var(--v-secondary-base) !important;
+    // ensures that until KDS migration is complete,
+    // Vuetify-based buttons have a visible focus style
+    // consistent with KDS buttons and links
+    outline: 3px solid #33acf5 !important;
+    outline-offset: 4px !important;
   }
 
   > .v-dialog__content,

contentcuration/contentcuration/frontend/shared/views/channel/ChannelSharing.vue

@@ -59,13 +59,13 @@
           </template>
         </DropdownWrapper>
       </VLayout>
-      <VBtn
-        color="primary"
+      <KButton
         type="submit"
         :disabled="sharing"
+        primary
       >
         {{ $tr('inviteButton') }}
-      </VBtn>
+      </KButton>
     </VForm>
 
     <ChannelSharingTable