Replace TextTruncatorCss with KTextTruncator

Remove from apispecs only Remove KTextTruncator from components [pre-commit.ci lite] apply automatic fixes Linting fixup minor fixup
learningequality · Jun 17, 2024 · 5c68c69 · 5c68c69
1 parent b08ed71
commit 5c68c69
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 196 deletions.
diff --git a/kolibri/core/assets/src/core-app/apiSpec.js b/kolibri/core/assets/src/core-app/apiSpec.js
@@ -102,7 +102,6 @@ import * as contentNode from '../utils/contentNodeUtils';
 import InteractionList from '../views/InteractionList';
 import ExamReport from '../views/ExamReport';
 import SlotTruncator from '../views/SlotTruncator';
-import TextTruncatorCss from '../views/TextTruncatorCss';
 import TimeDuration from '../views/TimeDuration';
 import SuggestedTime from '../views/SuggestedTime';
 
@@ -163,7 +162,6 @@ export default {
       InteractionList,
       ExamReport,
       SlotTruncator,
-      TextTruncatorCss,
       TimeDuration,
       MultiPaneLayout,
       CoreFullscreen,

diff --git a/kolibri/core/assets/src/views/TextTruncatorCss.vue b/kolibri/core/assets/src/views/TextTruncatorCss.vue
diff --git a/kolibri/plugins/coach/assets/src/views/home/HomePage/ItemProgressDisplay.vue b/kolibri/plugins/coach/assets/src/views/home/HomePage/ItemProgressDisplay.vue
@@ -9,7 +9,7 @@
     <KFixedGrid numCols="4" class="wrapper">
       <KFixedGridItem span="3">
         <h3 class="title">
-          <TextTruncatorCss
+          <KTextTruncator
             :text="name"
           />
         </h3>
@@ -37,15 +37,13 @@
 <script>
 
   import { validateLinkObject } from 'kolibri.utils.validators';
-  import TextTruncatorCss from 'kolibri.coreVue.components.TextTruncatorCss';
   import commonCoach from '../../common';
   import ProgressSummaryBar from '../../common/status/ProgressSummaryBar';
 
   export default {
     name: 'ItemProgressDisplay',
     components: {
       ProgressSummaryBar,
-      TextTruncatorCss,
     },
     mixins: [commonCoach],
     props: {

diff --git a/...ugins/coach/assets/src/views/plan/LessonResourceSelectionPage/LessonContentCard/index.vue b/...ugins/coach/assets/src/views/plan/LessonResourceSelectionPage/LessonContentCard/index.vue
@@ -39,7 +39,7 @@
           {{ message }}
         </div>
       </div>
-      <TextTruncatorCss
+      <KTextTruncator
         v-if="!windowIsSmall"
         :text="description"
         :maxLines="3"
@@ -66,15 +66,13 @@
   import CoachContentLabel from 'kolibri.coreVue.components.CoachContentLabel';
   import ContentIcon from 'kolibri.coreVue.components.ContentIcon';
   import { validateLinkObject, validateContentNodeKind } from 'kolibri.utils.validators';
-  import TextTruncatorCss from 'kolibri.coreVue.components.TextTruncatorCss';
   import CardThumbnail from './CardThumbnail';
 
   export default {
     name: 'LessonContentCard',
     components: {
       CardThumbnail,
       ContentIcon,
-      TextTruncatorCss,
       CoachContentLabel,
     },
     setup() {

diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/ChannelContentsSummary.vue
@@ -20,7 +20,7 @@
                 icon="unlistedchannel"
               />
             </template>
-            <TextTruncatorCss :text="channel.name" />
+            <KTextTruncator :text="channel.name" />
           </KLabeledIcon>
         </h1>
       </div>
@@ -83,15 +83,12 @@
 
   import bytesForHumans from 'kolibri.utils.bytesForHumans';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
-  import TextTruncatorCss from 'kolibri.coreVue.components.TextTruncatorCss';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
   import plugin_data from 'plugin_data';
 
   export default {
     name: 'ChannelContentsSummary',
-    components: {
-      TextTruncatorCss,
-    },
+    components: {},
     mixins: [commonCoreStrings],
     setup() {
       const { windowIsSmall } = useKResponsiveWindow();

diff --git a/kolibri/plugins/learn/assets/src/views/AlsoInThis.vue b/kolibri/plugins/learn/assets/src/views/AlsoInThis.vue
@@ -34,7 +34,7 @@
 
         <div class="content-meta">
           <div class="text-and-time">
-            <TextTruncatorCss
+            <KTextTruncator
               class="content-title"
               :text="content.title"
               :maxLines="2"
@@ -95,7 +95,6 @@
 <script>
 
   import isBoolean from 'lodash/isBoolean';
-  import TextTruncatorCss from 'kolibri.coreVue.components.TextTruncatorCss';
   import TimeDuration from 'kolibri.coreVue.components.TimeDuration';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
   import MissingResourceAlert from 'kolibri-common/components/MissingResourceAlert';
@@ -109,7 +108,6 @@
     components: {
       LearningActivityIcon,
       ProgressBar,
-      TextTruncatorCss,
       TimeDuration,
       MissingResourceAlert,
     },

diff --git a/kolibri/plugins/learn/assets/src/views/AssessmentWrapper/LessonMasteryBar.vue b/kolibri/plugins/learn/assets/src/views/AssessmentWrapper/LessonMasteryBar.vue
@@ -3,7 +3,7 @@
   <!-- z-index 7 - one beneath top menu bar for nested elevations -->
   <BaseToolbar style="z-index: 7;">
     <div class="container" :style="{ flexWrap: windowBreakpoint > 0 ? 'nowrap' : 'wrap' }">
-      <TextTruncatorCss
+      <KTextTruncator
         class="requirements"
         :text="coreString('shortExerciseGoalDescription', { count: requiredCorrectAnswers })"
       />
@@ -20,14 +20,12 @@
 
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import BaseToolbar from 'kolibri.coreVue.components.BaseToolbar';
-  import TextTruncatorCss from 'kolibri.coreVue.components.TextTruncatorCss';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
 
   export default {
     name: 'LessonMasteryBar',
     components: {
       BaseToolbar,
-      TextTruncatorCss,
     },
     mixins: [commonCoreStrings],
     setup() {

diff --git a/kolibri/plugins/learn/assets/src/views/CardList.vue b/kolibri/plugins/learn/assets/src/views/CardList.vue
@@ -33,13 +33,13 @@
                 />
               </div>
               <h3 :style="{ marginTop: '4px', marginBottom: '4px' }">
-                <TextTruncatorCss :text="contentNode.title" :maxLines="1" />
+                <KTextTruncator :text="contentNode.title" :maxLines="1" />
               </h3>
               <p
                 v-if="contentNode.description"
                 style="font-size: 14px; margin-top: 4px; margin-bottom: 4px;"
               >
-                <TextTruncatorCss :text="contentNode.description" :maxLines="2" />
+                <KTextTruncator :text="contentNode.description" :maxLines="2" />
               </p>
               <div v-if="!isMobile" class="bottom-items">
                 <LearningActivityDuration
@@ -98,7 +98,6 @@
 <script>
 
   import { validateLinkObject } from 'kolibri.utils.validators';
-  import TextTruncatorCss from 'kolibri.coreVue.components.TextTruncatorCss';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import { now } from 'kolibri.utils.serverClock';
   import { ContentLevels, Categories } from 'kolibri.coreVue.vuex.constants';
@@ -114,7 +113,6 @@
     name: 'CardList',
     components: {
       CardThumbnail,
-      TextTruncatorCss,
       LearningActivityLabel,
       LearningActivityDuration,
     },

diff --git a/kolibri/plugins/learn/assets/src/views/ChannelCard.vue b/kolibri/plugins/learn/assets/src/views/ChannelCard.vue
@@ -21,7 +21,7 @@
         dir="auto"
         :style="{ borderBottom: `1px solid ${$themeTokens.fineLine}` }"
       >
-        <TextTruncatorCss
+        <KTextTruncator
           :text="title"
           :maxLines="2"
           :showTooltip="true"
@@ -43,7 +43,7 @@
           span="3"
           alignment="auto"
         >
-          <TextTruncatorCss
+          <KTextTruncator
             :text="tagline"
             :maxLines="4"
             :showTooltip="false"
@@ -84,15 +84,13 @@
   import { validateLinkObject } from 'kolibri.utils.validators';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
   import CoachContentLabel from 'kolibri.coreVue.components.CoachContentLabel';
-  import TextTruncatorCss from 'kolibri.coreVue.components.TextTruncatorCss';
   import ChannelThumbnail from './ChannelThumbnail';
 
   export default {
     name: 'ChannelCard',
     components: {
       ChannelThumbnail,
       CoachContentLabel,
-      TextTruncatorCss,
     },
     setup() {
       const { windowGutter } = useKResponsiveWindow();

diff --git a/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/index.vue b/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/index.vue
@@ -41,7 +41,7 @@
       />
       <div class="text" :style="{ color: $themeTokens.text }">
         <h3 class="title" dir="auto">
-          <TextTruncatorCss
+          <KTextTruncator
             :text="contentNode.title"
             :maxLines="1"
           />
@@ -64,7 +64,6 @@
 <script>
 
   import { validateLinkObject } from 'kolibri.utils.validators';
-  import TextTruncatorCss from 'kolibri.coreVue.components.TextTruncatorCss';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import useChannels from '../../composables/useChannels';
   import LearningActivityLabel from '../LearningActivityLabel';
@@ -75,7 +74,6 @@
     name: 'HybridLearningContentCard',
     components: {
       CardThumbnail,
-      TextTruncatorCss,
       LearningActivityLabel,
     },
     mixins: [commonLearnStrings, commonCoreStrings],

diff --git a/kolibri/plugins/learn/assets/src/views/HybridLearningLessonCard.vue b/kolibri/plugins/learn/assets/src/views/HybridLearningLessonCard.vue
@@ -18,7 +18,7 @@
         />
       </div>
       <h3 class="title">
-        <TextTruncatorCss
+        <KTextTruncator
           :text="content.title"
           :maxLines="1"
           :style="{ color: $themeTokens.text }"
@@ -41,7 +41,6 @@
 <script>
 
   import { validateLinkObject } from 'kolibri.utils.validators';
-  import TextTruncatorCss from 'kolibri.coreVue.components.TextTruncatorCss';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import ProgressBar from './ProgressBar';
   import LearningActivityLabel from './LearningActivityLabel';
@@ -52,7 +51,6 @@
     name: 'HybridLearningLessonCard',
     components: {
       CardThumbnail,
-      TextTruncatorCss,
       LearningActivityLabel,
       ProgressBar,
     },