Misc smaller patch release fixes for v2023.07.05

contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue

@@ -146,6 +146,9 @@
       channel() {
         return this.getChannel(this.channelId);
       },
+      name() {
+        return this.channel.name;
+      },
       searchChannelEditorsLink() {
         return {
           name: RouteNames.USERS,

contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue

@@ -19,7 +19,7 @@
     </template>
     <LoadingText v-if="loading" absolute />
     <VCardText v-else>
-      <Banner error :value="channel.deleted" class="mb-4">
+      <Banner error :value="isDeleted" class="mb-4">
         This channel has been deleted
       </Banner>
       <VTabsItems v-model="tab">
@@ -102,6 +102,9 @@
       channel() {
         return this.getChannel(this.channelId);
       },
+      isDeleted() {
+        return this.channel && Boolean(this.channel?.deleted);
+      },
       channelWithDetails() {
         if (!this.channel || !this.details) {
           return {};

contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue

@@ -15,7 +15,7 @@
             v-on="on"
             @click="clickItem(action)"
           >
-            <Icon :color="iconColor(action)">
+            <Icon v-if="config[action] && config[action].icon" :color="iconColor(action)">
               {{ config[action].icon }}
             </Icon>
           </VBtn>

contentcuration/contentcuration/frontend/channelEdit/utils.js

@@ -21,6 +21,7 @@ export const defaultCompletionCriteriaModels = {
   [ContentKindsNames.DOCUMENT]: CompletionCriteriaModels.PAGES,
   [ContentKindsNames.H5P]: CompletionCriteriaModels.DETERMINED_BY_RESOURCE,
   [ContentKindsNames.HTML5]: CompletionCriteriaModels.APPROX_TIME,
+  [ContentKindsNames.ZIM]: CompletionCriteriaModels.APPROX_TIME,
   [ContentKindsNames.EXERCISE]: CompletionCriteriaModels.MASTERY,
 };
 
@@ -53,6 +54,11 @@ export const CompletionOptionsDropdownMap = {
     CompletionDropdownMap.determinedByResource,
     CompletionDropdownMap.reference,
   ],
+  [ContentKindsNames.ZIM]: [
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.determinedByResource,
+    CompletionDropdownMap.reference,
+  ],
   [ContentKindsNames.H5P]: [
     CompletionDropdownMap.determinedByResource,
     CompletionDropdownMap.completeDuration,

contentcuration/contentcuration/frontend/settings/pages/Storage/index.vue

@@ -18,7 +18,7 @@
 
         <KFixedGridItem :key="`${kind}1`" span="3" class="row">
           <span class="mr-2 pa-2" :style="{ backgroundColor: theme[kind] }">
-            <KIcon :icon="kind" :color="$themeTokens.textInverted" />
+            <KIcon :icon="kindIcon(kind)" :color="$themeTokens.textInverted" />
           </span>
 
           <span>{{ translateConstant(kind) }}</span>
@@ -89,6 +89,15 @@
         const hiddenKinds = [ContentKindsNames.H5P, ContentKindsNames.TOPIC];
         return ContentKindsList.filter(k => !hiddenKinds.includes(k));
       },
+      kindIcon() {
+        return kind => {
+          // KIcon doesn't have an icon for ZIM, so we use the HTML5 icon instead
+          if (kind === ContentKindsNames.ZIM) {
+            return ContentKindsNames.HTML5;
+          }
+          return kind;
+        };
+      },
       storageUsagePercentage() {
         // Math.round to fix ParseInt issues for really small divisions to force the float to int
         return Math.round((this.usedSpace / this.totalSpace) * 100);

contentcuration/contentcuration/frontend/shared/constants.js

@@ -63,6 +63,7 @@ export const kindToIconMap = {
   slideshow: 'photo_library',
   topic: 'folder',
   video: 'theaters',
+  zim: 'widgets',
 };
 
 export const SharingPermissions = {

contentcuration/contentcuration/frontend/shared/views/__tests__/contentNodeIcon.spec.js

@@ -24,6 +24,7 @@ describe('ContentNodeIcon', () => {
     { value: 'exercise', icon: 'assignment' },
     { value: 'document', icon: 'class' },
     { value: 'html5', icon: 'widgets' },
+    { value: 'zim', icon: 'widgets' },
   ];
   it.each(testIcons)('should display the correct icon $value', kind => {
     const wrapper = makeWrapper(kind.value);