From 4ec85b969fa5c3f9f075f35c478282e8c2cba95b Mon Sep 17 00:00:00 2001
From: Shivansh Bhatnagar <shivansh.bhatnagar.mat22@itbhu.ac.in>
Date: Sat, 20 Apr 2024 13:50:34 +0530
Subject: [PATCH 1/7] Fixed the missing checkbox labels

---
 .../views/Channel/components/LanguageFilter.vue  | 16 +---------------
 .../frontend/shared/views/form/MultiSelect.vue   |  9 ---------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue
index f62e872887..4aaf42b160 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue
@@ -28,20 +28,6 @@
         <span>{{ item.name }}</span>
       </VTooltip>
     </template>
-    <template #item="{ item }">
-      <Checkbox :key="item.id" :input-value="value" :value="item.id" class="mt-0">
-        <template #label>
-          <VTooltip bottom lazy>
-            <template #activator="{ on }">
-              <div class="text-truncate" style="width: 250px;" v-on="on">
-                {{ item.name }}
-              </div>
-            </template>
-            <span>{{ item.name }}</span>
-          </VTooltip>
-        </template>
-      </Checkbox>
-    </template>
   </VAutocomplete>
 
 </template>
@@ -95,7 +81,7 @@
     },
     methods: {
       languageSearchValue(item) {
-        return item.name + (item.related_names || []).join('') + item.id;
+        return item.name;
       },
     },
     $trs: {
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
index 74ddb24152..5fece40fc2 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
@@ -20,15 +20,6 @@
             {{ getText(item) }}
           </VChip>
         </template>
-        <template #item="{ item, tile }">
-          <Checkbox v-bind="tile.props" class="ma-0">
-            <template #label>
-              <span :class="{ notranslate }" :style="getEllipsisStyle()" dir="auto">
-                {{ getText(item) }}
-              </span>
-            </template>
-          </Checkbox>
-        </template>
       </VSelect>
     </template>
   </DropdownWrapper>

From 9fc93ded1d3adf2e7f14364abf7187e351637fb0 Mon Sep 17 00:00:00 2001
From: Shivansh Bhatnagar <shivansh.bhatnagar.mat22@itbhu.ac.in>
Date: Fri, 3 May 2024 02:47:34 +0530
Subject: [PATCH 2/7] Added the missing checkbox labels

---
 .../channelList/views/Channel/components/LanguageFilter.vue     | 2 --
 .../contentcuration/frontend/shared/views/form/MultiSelect.vue  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue
index f62e872887..b62865c789 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue
@@ -30,7 +30,6 @@
     </template>
     <template #item="{ item }">
       <Checkbox :key="item.id" :input-value="value" :value="item.id" class="mt-0">
-        <template #label>
           <VTooltip bottom lazy>
             <template #activator="{ on }">
               <div class="text-truncate" style="width: 250px;" v-on="on">
@@ -39,7 +38,6 @@
             </template>
             <span>{{ item.name }}</span>
           </VTooltip>
-        </template>
       </Checkbox>
     </template>
   </VAutocomplete>
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
index 74ddb24152..b07a8b7f4c 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
@@ -22,11 +22,9 @@
         </template>
         <template #item="{ item, tile }">
           <Checkbox v-bind="tile.props" class="ma-0">
-            <template #label>
               <span :class="{ notranslate }" :style="getEllipsisStyle()" dir="auto">
                 {{ getText(item) }}
               </span>
-            </template>
           </Checkbox>
         </template>
       </VSelect>

From da9e79047e0c843c5775a32389338a663e78d981 Mon Sep 17 00:00:00 2001
From: Shivansh Bhatnagar <shivansh.bhatnagar.mat22@itbhu.ac.in>
Date: Sun, 5 May 2024 01:45:52 +0530
Subject: [PATCH 3/7] Added the KCheckBox for the MultiSelect Component

---
 .../frontend/shared/views/form/MultiSelect.vue       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
index b07a8b7f4c..31b1913616 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
@@ -21,11 +21,13 @@
           </VChip>
         </template>
         <template #item="{ item, tile }">
-          <Checkbox v-bind="tile.props" class="ma-0">
-              <span :class="{ notranslate }" :style="getEllipsisStyle()" dir="auto">
-                {{ getText(item) }}
-              </span>
-          </Checkbox>
+          <KCheckbox
+            :checked="selections.includes(item)"
+            :label="getText(item)"
+            :value="item"
+            :style="getEllipsisStyle()"
+            :ripple="false"
+          />
         </template>
       </VSelect>
     </template>

From f3ad4e34ac77c8e2bba3ebb36df6c0e854244874 Mon Sep 17 00:00:00 2001
From: Shivansh Bhatnagar <shivansh.bhatnagar.mat22@itbhu.ac.in>
Date: Sun, 5 May 2024 02:03:14 +0530
Subject: [PATCH 4/7] fixed some minor linting errors

---
 .../channelList/views/Channel/components/LanguageFilter.vue   | 2 +-
 .../frontend/shared/views/form/MultiSelect.vue                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue
index 783b72d8ca..b62865c789 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue
@@ -93,7 +93,7 @@
     },
     methods: {
       languageSearchValue(item) {
-        return item.name;
+        return item.name + (item.related_names || []).join('') + item.id;
       },
     },
     $trs: {
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
index 31b1913616..1c933faafa 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
@@ -20,7 +20,7 @@
             {{ getText(item) }}
           </VChip>
         </template>
-        <template #item="{ item, tile }">
+        <template #item="{ item }">
           <KCheckbox
             :checked="selections.includes(item)"
             :label="getText(item)"
@@ -43,7 +43,7 @@
 
   export default {
     name: 'MultiSelect',
-    components: { Checkbox, DropdownWrapper },
+    components: { DropdownWrapper },
     // $attrs are rebound to a descendent component
     inheritAttrs: false,
     props: {

From cd5459a2db83ad09da6d3e99a81e26e93232f7d3 Mon Sep 17 00:00:00 2001
From: Shivansh Bhatnagar <shivansh.bhatnagar.mat22@itbhu.ac.in>
Date: Sun, 5 May 2024 02:05:35 +0530
Subject: [PATCH 5/7] Minor Linting Errors

---
 .../contentcuration/frontend/shared/views/form/MultiSelect.vue   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
index 1c933faafa..b3b9e9bd57 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
@@ -38,7 +38,6 @@
 
 <script>
 
-  import Checkbox from './Checkbox';
   import DropdownWrapper from './DropdownWrapper';
 
   export default {

From 6a51b8d1219adbc55bdec442ac200f8fd23406e0 Mon Sep 17 00:00:00 2001
From: Shivansh Bhatnagar <shivansh.bhatnagar.mat22@itbhu.ac.in>
Date: Tue, 21 May 2024 00:34:36 +0530
Subject: [PATCH 6/7] Fixed the linting issue with the LanguageFilter.vue

---
 .../channelEdit/components/Clipboard/Channel.vue |  1 +
 .../views/Channel/components/LanguageFilter.vue  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue
index 1f95da625c..c9d9e2fc51 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue
@@ -83,6 +83,7 @@
         return this.getChannel(this.channelId);
       },
       channelColor() {
+        console.log(this.getChannelColor(this.channelId));
         return this.getChannelColor(this.channelId) || this.$vuetify.theme.channelHighlightDefault;
       },
       thumbnailSrc() {
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue
index b62865c789..b0cdf111bd 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/components/LanguageFilter.vue
@@ -30,14 +30,14 @@
     </template>
     <template #item="{ item }">
       <Checkbox :key="item.id" :input-value="value" :value="item.id" class="mt-0">
-          <VTooltip bottom lazy>
-            <template #activator="{ on }">
-              <div class="text-truncate" style="width: 250px;" v-on="on">
-                {{ item.name }}
-              </div>
-            </template>
-            <span>{{ item.name }}</span>
-          </VTooltip>
+        <VTooltip bottom lazy>
+          <template #activator="{ on }">
+            <div class="text-truncate" style="width: 250px;" v-on="on">
+              {{ item.name }}
+            </div>
+          </template>
+          <span>{{ item.name }}</span>
+        </VTooltip>
       </Checkbox>
     </template>
   </VAutocomplete>

From 00f0fece53c665213f3751dfa91c2d350e4bfcb5 Mon Sep 17 00:00:00 2001
From: Shivansh Bhatnagar <shivansh.bhatnagar.mat22@itbhu.ac.in>
Date: Tue, 21 May 2024 01:31:55 +0530
Subject: [PATCH 7/7] Made some minor changes in the KCheckbox Elements

---
 .../frontend/channelEdit/components/Clipboard/Channel.vue        | 1 -
 .../contentcuration/frontend/shared/views/form/MultiSelect.vue   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue
index c9d9e2fc51..1f95da625c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue
@@ -83,7 +83,6 @@
         return this.getChannel(this.channelId);
       },
       channelColor() {
-        console.log(this.getChannelColor(this.channelId));
         return this.getChannelColor(this.channelId) || this.$vuetify.theme.channelHighlightDefault;
       },
       thumbnailSrc() {
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
index b3b9e9bd57..e18123848e 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
@@ -27,6 +27,7 @@
             :value="item"
             :style="getEllipsisStyle()"
             :ripple="false"
+            :class="{ notranslate }"
           />
         </template>
       </VSelect>