From 25defa9e43ce10fea5051296840836f3809fa6bb Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 6 Feb 2024 10:49:04 +0100
Subject: [PATCH 01/12] Update tags modal [SCI-10105]

---
 .../shared_styles/elements/checkboxes.scss    |   8 +
 app/javascript/vue/my_modules/list.vue        |   4 +-
 app/javascript/vue/my_modules/modals/tags.vue | 250 +++++++++++-------
 app/views/my_modules/index.html.erb           |   1 +
 config/locales/en.yml                         |   9 +-
 5 files changed, 171 insertions(+), 101 deletions(-)

diff --git a/app/assets/stylesheets/shared_styles/elements/checkboxes.scss b/app/assets/stylesheets/shared_styles/elements/checkboxes.scss
index aeb6daaf9..abf80f66f 100644
--- a/app/assets/stylesheets/shared_styles/elements/checkboxes.scss
+++ b/app/assets/stylesheets/shared_styles/elements/checkboxes.scss
@@ -90,5 +90,13 @@ input[type="checkbox"].sci-checkbox {
         border: $border-tertiary;
       }
     }
+
+    &:checked + .sci-checkbox-label {
+      &::before {
+        background-color: var(--sn-sleepy-grey);
+        border: 1px solid var(--sn-sleepy-grey);
+
+      }
+    }
   }
 }
diff --git a/app/javascript/vue/my_modules/list.vue b/app/javascript/vue/my_modules/list.vue
index 835195161..64daed3b1 100644
--- a/app/javascript/vue/my_modules/list.vue
+++ b/app/javascript/vue/my_modules/list.vue
@@ -26,6 +26,7 @@
   <TagsModal v-if="tagsModalObject"
               :params="tagsModalObject"
               :tagsColors="tagsColors"
+              :projectName="projectName"
               :projectTagsUrl="projectTagsUrl"
               @close="updateTable" />
   <NewModal v-if="newModalOpen"
@@ -88,7 +89,8 @@ export default {
     projectTagsUrl: { type: String, required: true },
     assignedUsersUrl: { type: String, required: true },
     usersFilterUrl: { type: String, required: true },
-    statusesList: { type: Array, required: true }
+    statusesList: { type: Array, required: true },
+    projectName: { type: String }
   },
   data() {
     return {
diff --git a/app/javascript/vue/my_modules/modals/tags.vue b/app/javascript/vue/my_modules/modals/tags.vue
index ceb39647d..6d599ca60 100644
--- a/app/javascript/vue/my_modules/modals/tags.vue
+++ b/app/javascript/vue/my_modules/modals/tags.vue
@@ -6,89 +6,118 @@
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <i class="sn-icon sn-icon-close"></i>
           </button>
-          <h4 class="modal-title truncate !block" id="edit-project-modal-label">
+          <h4 v-if="canManage" class="modal-title truncate !block">
             {{ i18n.t("experiments.canvas.modal_manage_tags.head_title") }}
           </h4>
+          <h4 v-else class="modal-title truncate !block">
+            {{ i18n.t("experiments.canvas.modal_manage_tags.head_title_read") }}
+          </h4>
         </div>
         <div class="modal-body">
-          <div class="mb-4">
+          <div v-if="canManage" class="mb-4">
             {{ i18n.t("experiments.canvas.modal_manage_tags.explanatory_text") }}
           </div>
-          <div class="max-h-80 overflow-y-auto">
-            <div v-if="this.params.permissions.manage_tags" v-for="tag in tagsList" :key="tag.id"
-                 class="flex items-center gap-2 px-3 py-2.5 hover:bg-sn-super-light-grey group">
+          <div class="mb-4">
+            <h5>{{ i18n.t("experiments.canvas.modal_manage_tags.project_tags", { project: this.projectName }) }}</h5>
+          </div>
+          <div class="max-h-80 overflow-y-auto" v-click-outside="finishEditMode">
+            <template v-for="tag in allTags" :key="tag.id">
+              <div
+                  class="flex items-center gap-3 px-3 py-2.5 group"
+                  :class="{
+                    '!bg-sn-super-light-blue': tag.editing,
+                    'hover:bg-sn-super-light-grey': canManage
+                  }"
+              >
+                <div class="sci-checkbox-container">
+                  <input type="checkbox"
+                         :disabled="!canManage"
+                         class="sci-checkbox"
+                         :checked="tag.assigned" @change="toggleTag(tag)">
+                  <label class="sci-checkbox-label"></label>
+                </div>
+                <div v-if="!tag.editing" @click="startEditMode(tag)"
+                     class="flex grow"
+                     :class="{'cursor-pointer': canManage}"
+                >
+                  <div class="h-6 px-1.5 flex items-center truncate text-sn-white rounded" :style="{ backgroundColor: tag.attributes.color }">
+                    {{ tag.attributes.name }}
+                  </div>
+                </div>
+                <template v-else>
+                  <GeneralDropdown>
+                    <template v-slot:field>
+                      <div class="h-6 w-6 rounded relative flex items-center justify-center text-sn-white" :style="{ backgroundColor: tag.attributes.color }">
+                        a
+                      </div>
+                    </template>
+                    <template v-slot:flyout>
+                      <div class="grid grid-cols-4 gap-1">
+                        <div v-for="color in tagsColors" :key="color"
+                            class="h-6 w-6 rounded relative flex items-center justify-center text-sn-white cursor-pointer"
+                            @click.stop="updateTagColor(color, tag)"
+                            :style="{ backgroundColor: color }">
+                          <i v-if="color == tag.attributes.color" class="sn-icon sn-icon-check"></i>
+                          <span v-else>a</span>
+                        </div>
+                      </div>
+                    </template>
+                  </GeneralDropdown>
+                  <input type="text" :value="tag.attributes.name" class="border-0 focus:outline-none bg-transparent" @change="updateTagName($event.target.value, tag)"/>
+                  <i @click.stop="finishEditMode($event, tag)" class="sn-icon sn-icon-check cursor-pointer ml-auto"></i>
+                </template>
+                <i  v-if="canManage" @click.stop="deleteTag(tag)"
+                   class="tw-hidden sn-icon sn-icon-delete cursor-pointer group-hover:block"
+                   :class="{
+                     'ml-auto': !tag.editing,
+                     '!block': tag.editing
+                   }"
+                ></i>
+              </div>
+            </template>
+          </div>
+          <template v-if="canManage">
+            <div class="mb-4 mt-4">
+              {{ i18n.t('experiments.canvas.modal_manage_tags.create_new') }}
+            </div>
+            <div class="flex gap-2">
               <GeneralDropdown>
                 <template v-slot:field>
-                  <div class="h-8 w-8 rounded relative" :style="{ backgroundColor: tag.attributes.color }">
-                    <div class="absolute top-1 left-1 rounded-full w-1 h-1 bg-white"></div>
+                  <div
+                    class="h-6 w-6 border border-solid border-transparent rounded relative flex items-center justify-center text-sn-white"
+                    :style="{ backgroundColor: newTag.color }"
+                    :class="{'!border-sn-grey !text-sn-grey': !newTag.color}"
+                  >
+                    a
                   </div>
                 </template>
                 <template v-slot:flyout>
                   <div class="grid grid-cols-4 gap-1">
                     <div v-for="color in tagsColors" :key="color"
-                         class="h-8 w-8 cursor-pointer rounded relative flex items-center justify-center"
-                         @click="updateTagColor(color, tag)"
-                         :style="{ backgroundColor: color }">
-                      <div class="absolute top-1 left-1 rounded-full w-1 h-1 bg-white"></div>
-                      <i v-if="color == tag.attributes.color" class="sn-icon sn-icon-check text-white"></i>
+                        class="h-6 w-6 rounded relative flex items-center justify-center text-sn-white cursor-pointer"
+                        @click.stop="newTag.color = color"
+                        :style="{ backgroundColor: color }">
+                      <i v-if="color == newTag.color" class="sn-icon sn-icon-check"></i>
+                      <span v-else>a</span>
                     </div>
                   </div>
                 </template>
               </GeneralDropdown>
-              <div class="flex-grow truncate">
-                <InlineEdit
-                  :value="tag.attributes.name"
-                  :characterLimit="255"
-                  attributeName='Tag name'
-                  :allowBlank="false"
-                  :singleLine="true"
-                  @update="(value) => updateTagName(value, tag)"
-                />
-              </div>
-              <i class="tw-hidden group-hover:block sn-icon sn-icon-close cursor-pointer" @click="unassignTag(tag)"></i>
+              <input type="text" v-model="newTag.name"
+                     :placeholder="i18n.t('experiments.canvas.modal_manage_tags.new_tag_name')"
+                     class="border-0 focus:outline-none bg-transparent" />
+              <i v-if="validNewTag" @click.stop="createTag" class="sn-icon sn-icon-check cursor-pointer ml-auto"></i>
+              <i @click.stop="newTag = { name: null, color: null }"
+                   class="tw-hidden sn-icon sn-icon-delete cursor-pointer "
+                   :class="{
+                     'ml-auto': !validNewTag,
+                     '!block': newTag.name || newTag.color
+                   }"
+                ></i>
             </div>
-            <div v-else v-for="tag in tagsList" :key="tag.id" class="flex items-center gap-2 px-3 py-2.5">
-              <div class="h-8 w-8 rounded relative" :style="{ backgroundColor: tag.attributes.color }">
-                <div class="absolute top-1 left-1 rounded-full w-1 h-1 bg-white"></div>
-              </div>
-              <div class="flex-grow truncate">
-                {{ tag.attributes.name }}
-              </div>
-            </div>
-          </div>
-          <div v-if="this.params.permissions.manage_tags"
-               class="text-sn-grey flex items-center gap-2 px-3 cursor-pointer
-                       py-2.5 hover:bg-sn-super-light-grey"
-               @click="createTag()"
-          >
-            <div class="h-8 w-8 rounded relative border-sn-grey border-solid">
-              <div class="absolute top-1 left-1 rounded-full w-1 h-1 bg-white border-sn-grey  border-solid"></div>
-            </div>
-            <div>{{ i18n.t('experiments.canvas.modal_manage_tags.create_new') }}</div>
-          </div>
+          </template>
         </div>
         <div class="modal-footer">
-          <div v-if="(tagsToAssign.length > 0 || !this.loadingTags)
-                     && this.params.permissions.manage_tags" class="mr-auto">
-            <GeneralDropdown ref="assignDropdown">
-              <template v-slot:field>
-                <button class="btn btn-primary">{{ i18n.t('general.assign') }}</button>
-              </template>
-              <template v-slot:flyout>
-                <div class="max-h-80 overflow-y-auto">
-                  <div v-for="tag in tagsToAssign" :key="tag.id"
-                      @click="assignTag(tag)"
-                      class="px-3 py-2.5 hover:bg-sn-super-light-grey cursor-pointer flex items-center gap-2">
-                      <div class="h-6 w-6 rounded relative" :style="{ backgroundColor: tag.attributes.color }">
-                        <div class="absolute top-1 left-1 rounded-full w-1 h-1 bg-white"></div>
-                      </div>
-                    <div class="min-w-[10rem] truncate">{{ tag.attributes.name }}</div>
-                    <i @click.stop="deleteTag(tag)" class="sn-icon sn-icon-delete cursor-pointer ml-auto"></i>
-                  </div>
-                </div>
-              </template>
-            </GeneralDropdown>
-          </div>
           <button class="btn btn-secondary" data-dismiss="modal">{{ i18n.t('general.cancel') }}</button>
         </div>
       </div>
@@ -103,7 +132,7 @@
   ></ConfirmationModal>
 </template>
 <script>
-
+import { vOnClickOutside } from '@vueuse/components';
 import axios from '../../../packs/custom_axios.js';
 import modalMixin from '../../shared/modal_mixin';
 import InlineEdit from '../../shared/inline_edit.vue';
@@ -122,8 +151,14 @@ export default {
     },
     projectTagsUrl: {
       required: true
+    },
+    projectName: {
+      required: true
     }
   },
+  directives: {
+    'click-outside': vOnClickOutside
+  },
   components: {
     InlineEdit,
     GeneralDropdown,
@@ -134,34 +169,48 @@ export default {
     return {
       allTags: [],
       assignedTags: [],
+      newTag: {
+        name: null,
+        color: null
+      },
       loadingTags: false,
+      tagToUpdate: null,
       query: ''
     };
   },
   computed: {
-    tagsList() {
-      return this.assignedTags.map((tag) => {
-        const tagObject = this.allTags.find((t) => parseInt(t.id, 10) === tag.attributes.tag_id);
-        const modifiedTag = tag;
-        modifiedTag.attributes = {
-          ...tag.attributes,
-          name: tagObject.attributes.name,
-          color: tagObject.attributes.color
-        };
-        return modifiedTag;
-      });
+    validNewTag() {
+      return this.newTag.name && this.newTag.color;
     },
-    tagsToAssign() {
-      return this.allTags.filter((tag) => (
-        !this.assignedTags.find((t) => t.attributes.tag_id === parseInt(tag.id, 10))
-        && tag.attributes.name.toLowerCase().includes(this.query.toLowerCase())
-      ));
+    canManage() {
+      return this.params.permissions.manage_tags;
     }
   },
   created() {
     this.loadAlltags();
   },
   methods: {
+    startEditMode(tag) {
+      if (!this.canManage) return;
+
+      this.finishEditMode();
+
+      tag.editing = true;
+      this.tagToUpdate = tag;
+      this.$nextTick(() => {
+        this.$refs.modal.querySelector('input').focus();
+      });
+    },
+    finishEditMode(e, tag = null) {
+      if (e && e.target.closest('.sn-dropdown')) return;
+
+      const tagToFinish = tag || this.allTags.find((t) => t.editing);
+
+      if (tagToFinish) {
+        tagToFinish.editing = false;
+        this.updateTag(this.tagToUpdate);
+      }
+    },
     loadAlltags() {
       this.loadingTags = true;
       axios.get(this.projectTagsUrl).then((response) => {
@@ -173,16 +222,31 @@ export default {
     loadAssignedTags() {
       axios.get(this.params.urls.assigned_tags).then((response) => {
         this.assignedTags = response.data.data;
-        this.loadingTags = true;
+        this.allTags.forEach((tag) => {
+          const assignedTag = this.assignedTags.find((at) => at.attributes.tag_id === parseInt(tag.id, 10));
+          if (assignedTag) {
+            tag.assigned = true;
+            tag.attributes.urls.unassign = assignedTag.attributes.urls.update;
+          } else {
+            tag.assigned = false;
+          }
+        });
+        this.loadingTags = false;
       });
     },
+    toggleTag(tag) {
+      if (tag.assigned) {
+        this.unassignTag(tag);
+      } else {
+        this.assignTag(tag);
+      }
+    },
     unassignTag(tag) {
-      axios.delete(tag.attributes.urls.update).then(() => {
+      axios.delete(tag.attributes.urls.unassign).then(() => {
         this.loadAssignedTags();
       });
     },
     assignTag(tag) {
-      this.$refs.assignDropdown.closeMenu();
       axios.post(this.params.urls.assign_tags, {
         my_module_tag: {
           tag_id: tag.id
@@ -191,15 +255,11 @@ export default {
         this.loadAssignedTags();
       });
     },
-    updateTagName(value, tag) {
-      const tagToUpdate = this.allTags.find((t) => parseInt(t.id, 10) === tag.attributes.tag_id);
-      tagToUpdate.attributes.name = value;
-      this.updateTag(tagToUpdate);
+    updateTagName(value) {
+      this.tagToUpdate.attributes.name = value;
     },
-    updateTagColor(color, tag) {
-      const tagToUpdate = this.allTags.find((t) => parseInt(t.id, 10) === tag.attributes.tag_id);
-      tagToUpdate.attributes.color = color;
-      this.updateTag(tagToUpdate);
+    updateTagColor(color) {
+      this.tagToUpdate.attributes.color = color;
     },
     updateTag(tag) {
       axios.put(tag.attributes.urls.update, {
@@ -211,19 +271,15 @@ export default {
       });
     },
     createTag() {
-      const randmonColor = this.tagsColors[Math.floor(Math.random() * this.tagsColors.length)];
       axios.post(this.projectTagsUrl, {
-        tag: {
-          name: this.i18n.t('tags.create.new_name'),
-          color: randmonColor
-        },
+        tag: this.newTag,
         my_module_id: this.params.id
       }).then(() => {
+        this.newTag = { name: null, color: null };
         this.loadAlltags();
       });
     },
     async deleteTag(tag) {
-      this.$refs.assignDropdown.closeMenu();
       const ok = await this.$refs.deleteTagModal.show();
       if (ok) {
         axios.delete(tag.attributes.urls.update, {
diff --git a/app/views/my_modules/index.html.erb b/app/views/my_modules/index.html.erb
index 8eb3e4cd6..ede310840 100644
--- a/app/views/my_modules/index.html.erb
+++ b/app/views/my_modules/index.html.erb
@@ -15,6 +15,7 @@
       users-filter-url="<%= users_filter_projects_path %>"v
       user-roles-url="<%= user_roles_projects_path %>"
       :tags-colors="<%= Constants::TAG_COLORS.to_json %>"
+      project-name="<%= @experiment.project.name %>"
       :statuses-list="<%= MyModuleStatus.all.order(:id).map{ |i| [i.id, i.name] }.to_json %>"
       project-tags-url="<%= project_tags_path(@experiment.project) %>"
       canvas-url="<%= view_mode == 'active' ? canvas_experiment_path(@experiment) : module_archive_experiment_path(@experiment) %>"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 87bee5a39..834ee936b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1630,17 +1630,20 @@ en:
       reload_on_submit: "Save action is running. Reloading this page may cause unexpected behavior."
       modal_manage_tags:
         head_title: "Manage tags"
+        head_title_read: "Tags"
         subtitle: "Showing tags of task %{module}"
         no_tags: "No tags!"
         edit_tag: "Edit tag."
         remove_tag: "Remove tag from task %{module}."
         delete_tag: "Permanently delete tag from all tasks."
-        delete_tag_confirmation: "Deleting a tag will remove it from all tagged tasks. Are you sure you wish to continue?"
-        explanatory_text: "Add a set of tags to mark the tasks inside this project. Changing the tag applies to all tagged tasks. Deleting a tag removes it from all tagged tasks."
+        delete_tag_confirmation: "Deleting a tag will remove it from all tagged tasks. You wont be able to get it back.<br><br><b>Are you sure you wish to continue?</b>"
+        explanatory_text: "Add a set of tags to mark the tasks inside this project."
+        project_tags: "%{project} project tags"
         save_tag: "Save tag."
         cancel_tag: "Cancel changes to the tag."
         create: "Add"
-        create_new: "Create new tag"
+        create_new: "Create a new tag"
+        new_tag_name: "Tag name"
       edit:
         id: "ID:"
         new_module: "New task"

From 29fd71c76a196d9e786064764edb0b0ff14a905b Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 7 Feb 2024 12:23:21 +0100
Subject: [PATCH 02/12] Fix sanity checks issues [SCI-10095]

---
 app/javascript/vue/repositories/table.vue     |  3 ++-
 app/javascript/vue/shared/datatable/table.vue | 20 +++++++++++++++----
 .../vue/shared/filters/filter_dropdown.vue    |  4 ++--
 .../lists/repository_serializer.rb            |  2 +-
 app/services/lists/repositories_service.rb    | 15 ++++++++------
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/app/javascript/vue/repositories/table.vue b/app/javascript/vue/repositories/table.vue
index ebafb90a4..8b986cad9 100644
--- a/app/javascript/vue/repositories/table.vue
+++ b/app/javascript/vue/repositories/table.vue
@@ -130,7 +130,8 @@ export default {
       },
       {
         field: 'nr_of_rows',
-        headerName: this.i18n.t('libraries.index.table.number_of_items')
+        headerName: this.i18n.t('libraries.index.table.number_of_items'),
+        sortable: true
       },
       {
         field: 'shared_label',
diff --git a/app/javascript/vue/shared/datatable/table.vue b/app/javascript/vue/shared/datatable/table.vue
index 91280518a..8a4f1ccb5 100644
--- a/app/javascript/vue/shared/datatable/table.vue
+++ b/app/javascript/vue/shared/datatable/table.vue
@@ -50,6 +50,8 @@
         @columnResized="saveTableState"
         @columnMoved="saveTableState"
         @bodyScroll="handleScroll"
+        @columnPinned="handlePin"
+        @columnVisible="handleVisibility"
         @rowSelected="setSelectedRows"
         @cellClicked="clickCell"
         :CheckboxSelectionCallback="withCheckboxes"
@@ -300,6 +302,18 @@ export default {
         this.loadData();
       }
     },
+    handlePin(event) {
+      if (event.pinned === 'right') {
+        this.columnApi.setColumnPinned(event.column.colId, null);
+      }
+      this.saveTableState();
+    },
+    handleVisibility(event) {
+      if (!event.visible && event.source !== 'api') {
+        this.columnApi.setColumnVisible(event.column.colId, true);
+      }
+      this.saveTableState();
+    },
     fetchAndApplyTableState() {
       axios
         .get(this.userSettingsUrl, {
@@ -327,6 +341,8 @@ export default {
               state: this.tableState.columnsState,
               applyOrder: true
             });
+          } else {
+            this.saveTableState();
           }
           setTimeout(() => {
             this.initializing = false;
@@ -484,19 +500,15 @@ export default {
     },
     hideColumn(column) {
       this.columnApi.setColumnVisible(column.field, false);
-      this.saveTableState();
     },
     showColumn(column) {
       this.columnApi.setColumnVisible(column.field, true);
-      this.saveTableState();
     },
     pinColumn(column) {
       this.columnApi.setColumnPinned(column.field, 'left');
-      this.saveTableState();
     },
     unPinColumn(column) {
       this.columnApi.setColumnPinned(column.field, null);
-      this.saveTableState();
     },
     reorderColumns(columns) {
       this.columnApi.moveColumns(columns, 1);
diff --git a/app/javascript/vue/shared/filters/filter_dropdown.vue b/app/javascript/vue/shared/filters/filter_dropdown.vue
index 5a54a6fc4..ce164db57 100644
--- a/app/javascript/vue/shared/filters/filter_dropdown.vue
+++ b/app/javascript/vue/shared/filters/filter_dropdown.vue
@@ -19,7 +19,7 @@
             <i class="sn-icon sn-icon-close"></i>
           </button>
         </div>
-        <div class="max-h-[400px] p-3.5 pt-0">
+        <div class="max-h-[40vh] px-3.5 overflow-y-auto">
           <div v-for="filter in filters" :key="filter.key">
             <Component
               :is="`${filter.type}Filter`"
@@ -28,7 +28,7 @@
               @update="updateFilter" />
           </div>
         </div>
-        <div class="p-3.5 pt-0.5 flex items-center justify-end gap-4">
+        <div class="p-3.5 flex items-center justify-end gap-4">
           <div @click.prevent="clearFilters" class="btn btn-secondary">
             {{ i18n.t('filters_modal.clear_btn') }}
           </div>
diff --git a/app/serializers/lists/repository_serializer.rb b/app/serializers/lists/repository_serializer.rb
index 8f0d0bea4..8425d8e23 100644
--- a/app/serializers/lists/repository_serializer.rb
+++ b/app/serializers/lists/repository_serializer.rb
@@ -10,7 +10,7 @@ module Lists
                :urls, :shared_read, :shared_write, :shareable_write
 
     def nr_of_rows
-      object.repository_rows.count
+      object[:row_count]
     end
 
     def shared
diff --git a/app/services/lists/repositories_service.rb b/app/services/lists/repositories_service.rb
index 57bb91c60..6c08d256b 100644
--- a/app/services/lists/repositories_service.rb
+++ b/app/services/lists/repositories_service.rb
@@ -13,12 +13,14 @@ module Lists
                             'LEFT OUTER JOIN users AS archivers ' \
                             'ON repositories.archived_by_id = archivers.id'
                           )
-                          .includes(:repository_rows)
+                          .joins(:repository_rows)
                           .joins(:team)
-                          .select('repositories.* AS repositories')
-                          .select('teams.name AS team_name')
-                          .select('creators.full_name AS created_by_user')
-                          .select('archivers.full_name AS archived_by_user')
+                          .select('repositories.*')
+                          .select('MAX(teams.name) AS team_name')
+                          .select('COUNT(repository_rows.*) AS row_count')
+                          .select('MAX(creators.full_name) AS created_by_user')
+                          .select('MAX(archivers.full_name) AS archived_by_user')
+                          .group('repositories.id')
 
       view_mode = @params[:view_mode] || 'active'
 
@@ -47,7 +49,8 @@ module Lists
         created_by: 'creators.full_name',
         created_at: 'repositories.created_at',
         archived_on: 'repositories.archived_on',
-        archived_by: 'archivers.full_name'
+        archived_by: 'archivers.full_name',
+        nr_of_rows: 'row_count'
       }
     end
   end

From afc256ae15827733e768875f243c80987f12e521 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 12 Feb 2024 12:22:20 +0100
Subject: [PATCH 03/12] Replace legacy tags modal [SCI-10125]

---
 app/assets/javascripts/my_modules/tags.js     | 10 ++-
 app/assets/javascripts/projects/canvas.js.erb | 10 +--
 app/javascript/packs/vue/legacy/tags_modal.js | 68 +++++++++++++++++++
 app/javascript/vue/my_modules/modals/tags.vue |  3 +-
 .../canvas/full_zoom/_my_module.html.erb      | 26 +++++++
 app/views/my_modules/protocols.html.erb       | 28 +++++++-
 config/webpack/webpack.config.js              |  3 +-
 7 files changed, 130 insertions(+), 18 deletions(-)
 create mode 100644 app/javascript/packs/vue/legacy/tags_modal.js

diff --git a/app/assets/javascripts/my_modules/tags.js b/app/assets/javascripts/my_modules/tags.js
index a0a74adb6..2d51cc07e 100644
--- a/app/assets/javascripts/my_modules/tags.js
+++ b/app/assets/javascripts/my_modules/tags.js
@@ -146,13 +146,11 @@
     });
     // initialize my_module tab remote loading
     $('#experimentTable, .my-modules-protocols-index, #experiment-canvas')
-      .on('ajax:before', '.edit-tags-link', function() {
-        manageTagsModal.modal('show');
+      .on('click', '.edit-tags-link', function() {
+        if($('#tagsModalComponent').length) {
+          $('#tagsModalComponent').data('tagsModal').open()
+        }
       })
-      .on('ajax:success', '.edit-tags-link', function(e, data) {
-        $('#manage-module-tags-modal-module').text(data.my_module.name);
-        initTagsModalBody(data);
-      });
   }
 
   bindEditTagsAjax();
diff --git a/app/assets/javascripts/projects/canvas.js.erb b/app/assets/javascripts/projects/canvas.js.erb
index 5cbcfa281..3680214bc 100644
--- a/app/assets/javascripts/projects/canvas.js.erb
+++ b/app/assets/javascripts/projects/canvas.js.erb
@@ -933,17 +933,9 @@ function bindEditTagsAjax(elements) {
 
   // initialize my_module tab remote loading
   $(elements).find("a.edit-tags-link")
-  .on("ajax:before", function () {
-    var moduleId = $(this).closest(".panel-default").attr("data-module-id");
-    manageTagsModal.attr("data-module-id", moduleId);
-    manageTagsModal.modal('show');
-  })
-  .on("ajax:success", function (e, data) {
-    $("#manage-module-tags-modal-module").text(data.my_module.name);
-    initTagsModalBody(data);
-  })
   .on('click', function(){
     $(this).addClass('updated-module-tags');
+    var modal = $(this).closest(".panel-default").find('.tags-modal-component').data('tagsModal').open();
   });
 }
 
diff --git a/app/javascript/packs/vue/legacy/tags_modal.js b/app/javascript/packs/vue/legacy/tags_modal.js
new file mode 100644
index 000000000..19dd02e51
--- /dev/null
+++ b/app/javascript/packs/vue/legacy/tags_modal.js
@@ -0,0 +1,68 @@
+/* global I18n dropdownSelector */
+
+import { createApp } from 'vue/dist/vue.esm-bundler.js';
+import TagsModal from '../../../vue/my_modules/modals/tags.vue';
+import { mountWithTurbolinks } from '../helpers/turbolinks.js';
+
+window.initTagsModalComponent = (id) => {
+  const app = createApp({
+    data() {
+      return {
+        tagsModalOpen: false
+      };
+    },
+    mounted() {
+      $(this.$refs.tagsModal).data('tagsModal', this);
+    },
+    methods: {
+      open() {
+        this.tagsModalOpen = true;
+      },
+      close() {
+        this.tagsModalOpen = false;
+      },
+      syncTags(tags) {
+        // My module page
+        if ($('#module-tags-selector').length) {
+          const assignedTags = tags.filter((i) => i.assigned).map((i) => (
+            {
+              value: i.id,
+              label: i.attributes.name,
+              params: {
+                color: i.attributes.color
+              }
+            }
+          ));
+          dropdownSelector.setData('#module-tags-selector', assignedTags);
+        }
+
+        // Canvas
+        if ($('#canvas-container').length) {
+          $.ajax({
+            url: $('#canvas-container').attr('data-module-tags-url'),
+            type: 'GET',
+            dataType: 'json',
+            success(data) {
+              $.each(data.my_modules, (index, myModule) => {
+                $(`div.panel[data-module-id='${myModule.id}']`)
+                  .find('.edit-tags-link')
+                  .html(myModule.tags_html);
+              });
+            }
+          });
+        }
+      }
+    }
+  });
+  app.component('tags-modal', TagsModal);
+  app.config.globalProperties.i18n = window.I18n;
+  mountWithTurbolinks(app, id);
+};
+
+document.addEventListener('turbolinks:load', () => {
+  const tagsModalContainers = document.querySelectorAll('.vue-tags-modal:not(.initialized)');
+  tagsModalContainers.forEach((container) => {
+    $(container).addClass('initialized')
+    window.initTagsModalComponent(`#${container.id}`);
+  });
+});
diff --git a/app/javascript/vue/my_modules/modals/tags.vue b/app/javascript/vue/my_modules/modals/tags.vue
index 6d599ca60..08e44fd98 100644
--- a/app/javascript/vue/my_modules/modals/tags.vue
+++ b/app/javascript/vue/my_modules/modals/tags.vue
@@ -141,7 +141,7 @@ import ConfirmationModal from '../../shared/confirmation_modal.vue';
 
 export default {
   name: 'TagsModal',
-  emits: ['close'],
+  emits: ['close', 'tagsLoaded'],
   props: {
     params: {
       required: true
@@ -231,6 +231,7 @@ export default {
             tag.assigned = false;
           }
         });
+        this.$emit('tagsLoaded', this.allTags);
         this.loadingTags = false;
       });
     },
diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb
index 79799d2f9..3806e8d31 100644
--- a/app/views/canvas/full_zoom/_my_module.html.erb
+++ b/app/views/canvas/full_zoom/_my_module.html.erb
@@ -114,5 +114,31 @@
       <div role="tabpanel" class="tab-pane" id="<%= my_module.id %>_comments" data-contents="comments"></div>
     </div>
   </div>
+
+  <div id="tagsModalContainer-<%= my_module.id %>" class="vue-tags-modal">
+    <div ref="tagsModal" class="tags-modal-component" id="tagsModalComponent-<%= my_module.id %>"></div>
+    <teleport to="body">
+      <tags-modal v-if="tagsModalOpen"
+        :params="<%=
+          {
+            id: my_module.id,
+            permissions: {
+              manage_tags: can_manage_my_module_tags?(my_module)
+            },
+            urls: {
+              assigned_tags: assigned_tags_my_module_my_module_tags_path(my_module),
+              assign_tags: my_module_my_module_tags_path(my_module)
+            }
+          }.to_json
+        %>"
+        :tags-colors="<%= Constants::TAG_COLORS.to_json %>"
+        project-name="<%= my_module.experiment.project.name  %>"
+        project-tags-url="<%= project_tags_path(my_module.experiment.project) %>"
+        @close="close"
+        @tags-loaded="syncTags"
+      />
+    </teleport>
+  </div>
+  <%= javascript_include_tag 'vue_legacy_tags_modal' %>
 </div>
 
diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb
index 1b0ca7af5..bab019835 100644
--- a/app/views/my_modules/protocols.html.erb
+++ b/app/views/my_modules/protocols.html.erb
@@ -155,6 +155,32 @@
 <!-- Consume Stock Modal -->
 <%= render partial: 'my_modules/repositories/consume_stock_modal'%>
 
+<!-- Tags modal -->
+<div id="tagsModalContainer" class="vue-tags-modal">
+  <div ref="tagsModal" id="tagsModalComponent"></div>
+  <teleport to="body">
+    <tags-modal v-if="tagsModalOpen"
+      :params="<%=
+        {
+          id: @my_module.id,
+          permissions: {
+            manage_tags: can_manage_my_module_tags?(@my_module)
+          },
+          urls: {
+            assigned_tags: assigned_tags_my_module_my_module_tags_path(@my_module),
+            assign_tags: my_module_my_module_tags_path(@my_module)
+          }
+        }.to_json
+      %>"
+      :tags-colors="<%= Constants::TAG_COLORS.to_json %>"
+      project-name="<%= @experiment.project.name  %>"
+      project-tags-url="<%= project_tags_path(@experiment.project) %>"
+      @close="close"
+      @tags-loaded="syncTags"
+    />
+  </teleport>
+</div>
+
 <%= javascript_include_tag 'inputmask' %>
 <%= stylesheet_link_tag 'datatables' %>
 <%= javascript_include_tag "handsontable.full" %>
@@ -169,4 +195,4 @@
 <%= javascript_include_tag "protocols/new_protocol" %>
 
 <%= javascript_include_tag 'vue_protocol' %>
-
+<%= javascript_include_tag 'vue_legacy_tags_modal' %>
diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js
index 0e14bdc21..fd4a0f0be 100644
--- a/config/webpack/webpack.config.js
+++ b/config/webpack/webpack.config.js
@@ -58,7 +58,8 @@ const entryList = {
   vue_reports_table: './app/javascript/packs/vue/reports_table.js',
   vue_open_locally_menu: './app/javascript/packs/vue/open_locally_menu.js',
   vue_scinote_edit_download: './app/javascript/packs/vue/scinote_edit_download.js',
-  vue_design_system_modals: './app/javascript/packs/vue/design_system/modals.js'
+  vue_design_system_modals: './app/javascript/packs/vue/design_system/modals.js',
+  vue_legacy_tags_modal: './app/javascript/packs/vue/legacy/tags_modal.js'
 };
 
 // Engine pack loading based on https://github.com/rails/webpacker/issues/348#issuecomment-635480949

From d57b05683188434aafc03dec58e55aeb2e38226d Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 12 Feb 2024 12:29:50 +0100
Subject: [PATCH 04/12] Small fixes for table [SCI-8328]

---
 app/javascript/vue/shared/datatable/table.vue | 1 +
 app/serializers/user_assignment_serializer.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/vue/shared/datatable/table.vue b/app/javascript/vue/shared/datatable/table.vue
index 8a4f1ccb5..3a30ea567 100644
--- a/app/javascript/vue/shared/datatable/table.vue
+++ b/app/javascript/vue/shared/datatable/table.vue
@@ -213,6 +213,7 @@ export default {
         cellRendererParams: {
           dtComponent: this
         },
+        pinned: (column.field === 'name' ? 'left' : null),
         comparator: () => false
       }));
 
diff --git a/app/serializers/user_assignment_serializer.rb b/app/serializers/user_assignment_serializer.rb
index e5feed91a..d714611e3 100644
--- a/app/serializers/user_assignment_serializer.rb
+++ b/app/serializers/user_assignment_serializer.rb
@@ -18,7 +18,7 @@ class UserAssignmentSerializer < ActiveModel::Serializer
     {
       id: object.user.id,
       name: object.user.name,
-      avatar_url: avatar_path(object, :icon_small)
+      avatar_url: avatar_path(object.user, :icon_small)
     }
   end
 

From b5f08d254274a2e2165dc411b10b9869881f3670 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 15 Feb 2024 10:10:15 +0100
Subject: [PATCH 05/12] Add new render for task tags [SCI-10106]

---
 app/javascript/vue/my_modules/modals/tags.vue | 14 +++---
 .../vue/my_modules/renderers/tags.vue         | 50 +++++++++++++++----
 app/serializers/lists/my_module_serializer.rb |  8 ++-
 config/locales/en.yml                         |  1 +
 4 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/app/javascript/vue/my_modules/modals/tags.vue b/app/javascript/vue/my_modules/modals/tags.vue
index 08e44fd98..029281f55 100644
--- a/app/javascript/vue/my_modules/modals/tags.vue
+++ b/app/javascript/vue/my_modules/modals/tags.vue
@@ -37,12 +37,12 @@
                   <label class="sci-checkbox-label"></label>
                 </div>
                 <div v-if="!tag.editing" @click="startEditMode(tag)"
-                     class="flex grow"
-                     :class="{'cursor-pointer': canManage}"
-                >
-                  <div class="h-6 px-1.5 flex items-center truncate text-sn-white rounded" :style="{ backgroundColor: tag.attributes.color }">
-                    {{ tag.attributes.name }}
-                  </div>
+                     class="h-6 px-1.5 flex items-center max-w-80 truncate text-sn-white rounded"
+                     :class="{
+                       'cursor-pointer': canManage
+                     }"
+                     :style="{ backgroundColor: tag.attributes.color }">
+                  {{ tag.attributes.name }}
                 </div>
                 <template v-else>
                   <GeneralDropdown>
@@ -63,7 +63,7 @@
                       </div>
                     </template>
                   </GeneralDropdown>
-                  <input type="text" :value="tag.attributes.name" class="border-0 focus:outline-none bg-transparent" @change="updateTagName($event.target.value, tag)"/>
+                  <input type="text" :value="tag.attributes.name" class="border-0 grow focus:outline-none bg-transparent" @change="updateTagName($event.target.value, tag)"/>
                   <i @click.stop="finishEditMode($event, tag)" class="sn-icon sn-icon-check cursor-pointer ml-auto"></i>
                 </template>
                 <i  v-if="canManage" @click.stop="deleteTag(tag)"
diff --git a/app/javascript/vue/my_modules/renderers/tags.vue b/app/javascript/vue/my_modules/renderers/tags.vue
index 1dcf6a569..9a0fb86f9 100644
--- a/app/javascript/vue/my_modules/renderers/tags.vue
+++ b/app/javascript/vue/my_modules/renderers/tags.vue
@@ -1,16 +1,45 @@
 <template>
-
-  <span v-if="params.data.tags > 0" @click.stop="openModal" class="text-sn-blue cursor-pointer">
-    {{ params.data.tags }}
-  </span>
-  <span v-else-if="params.data.permissions.manage_tags" @click.stop="openModal" class="text-sn-blue cursor-pointer">
-    {{ i18n.t('experiments.table.add_tag') }}
-  </span>
-  <span v-else>{{ i18n.t('experiments.table.not_set') }}</span>
+  <div class="flex items-center gap-1.5 h-9 mt-0.5">
+    <template v-if="params.data.tags.length > 0 || params.data.permissions.manage_tags">
+      <div v-if="params.data.tags.length > 0"
+           class="h-6 px-1.5 flex items-center rounded text-white max-w-[150px]"
+           :style="{'background': params.data.tags[0].color}">
+        <div class="truncate">{{ params.data.tags[0].name }}</div>
+      </div>
+      <GeneralDropdown v-if="params.data.tags.length > 1" >
+        <template v-slot:field>
+          <div class="h-6 min-w-[24px] text-sn-dark-grey flex items-center justify-center rounded-full text-[.625rem]
+                    bg-sn-light-grey border !border-sn-sleepy-grey cursor-pointer">
+            <span>+{{ params.data.tags.length - 1 }}</span>
+          </div>
+        </template>
+        <template v-slot:flyout>
+          <div>
+            {{ i18n.t('experiments.table.used_tags') }}
+          </div>
+          <hr class="my-2" />
+          <div class="max-h-[200px] overflow-y-auto flex flex-wrap gap-1.5 max-w-[240px]">
+            <div v-for="tag in params.data.tags" :key="tag.id"
+                class="h-6 px-1.5 flex items-center rounded text-white max-w-[150px]"
+                :style="{'background': tag.color}">
+              <div class="truncate">{{ tag.name }}</div>
+            </div>
+          </div>
+        </template>
+      </GeneralDropdown>
+      <div v-if="params.data.permissions.manage_tags" @click.stop="openModal"
+        class="cursor-pointer text-sn-sleep-grey border !border-dashed h-6 w-6 flex items-center
+               justify-center !border-sn-sleep-grey rounded-full ">
+        <i class="sn-icon sn-icon-new-task"></i>
+    </div>
+    </template>
+    <span v-else>{{ i18n.t('experiments.table.not_set') }}</span>
+  </div>
 </template>
-
 <script>
 
+import GeneralDropdown from '../../shared/general_dropdown.vue';
+
 export default {
   name: 'TagsRenderer',
   props: {
@@ -18,6 +47,9 @@ export default {
       required: true
     }
   },
+  components: {
+    GeneralDropdown
+  },
   methods: {
     openModal() {
       this.params.dtComponent.$emit('editTags', null, [this.params.data]);
diff --git a/app/serializers/lists/my_module_serializer.rb b/app/serializers/lists/my_module_serializer.rb
index f9dbe3ecb..5fd369274 100644
--- a/app/serializers/lists/my_module_serializer.rb
+++ b/app/serializers/lists/my_module_serializer.rb
@@ -132,7 +132,13 @@ module Lists
     end
 
     def tags
-      object.tags.length
+      object.tags.map do |tag|
+        {
+          id: tag.id,
+          name: tag.name,
+          color: tag.color
+        }
+      end
     end
 
     def comments
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 834ee936b..b9c2fe99c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1601,6 +1601,7 @@ en:
         archived_tasks: 'Go to Archived tasks'
         active_tasks: 'Go to Active tasks'
       add_tag: '+ Add tag'
+      used_tags: 'Used tags'
       search: 'Manage assignees'
       not_set: 'not set'
       archive_group:

From d1251f744065e7a00012ed1a1ae4d23423005717 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 15 Feb 2024 13:59:55 +0100
Subject: [PATCH 06/12] Save selection between pages [SCI-10095]

---
 app/javascript/vue/shared/datatable/table.vue | 75 +++++++++++--------
 1 file changed, 45 insertions(+), 30 deletions(-)

diff --git a/app/javascript/vue/shared/datatable/table.vue b/app/javascript/vue/shared/datatable/table.vue
index 3a30ea567..16a155b50 100644
--- a/app/javascript/vue/shared/datatable/table.vue
+++ b/app/javascript/vue/shared/datatable/table.vue
@@ -168,6 +168,7 @@ export default {
       order: null,
       totalPage: 0,
       selectedRows: [],
+      keepSelection: false,
       searchValue: '',
       initializing: true,
       activeFilters: {},
@@ -375,13 +376,13 @@ export default {
         this.reloadTable();
       }
     },
-    reloadTable() {
+    reloadTable(clearSelection = true) {
       if (this.dataLoading) return;
 
       this.dataLoading = true;
-      this.selectedRows = [];
+      if (clearSelection) this.selectedRows = [];
       this.page = 1;
-      this.loadData(true);
+      this.loadData();
     },
     loadData(reload = false) {
       axios
@@ -397,41 +398,40 @@ export default {
         })
         .then((response) => {
           if (reload) {
-            if (this.gridApi) {
-              this.gridApi.setRowData([]);
-            }
+            if (this.gridApi) this.gridApi.setRowData([]);
             this.rowData = [];
           }
 
           if (this.scrollMode === 'pages') {
-            this.selectedRows = [];
-            if (this.gridApi) {
-              this.gridApi.setRowData(this.formatData(response.data.data));
-            }
+            if (this.gridApi) this.gridApi.setRowData(this.formatData(response.data.data));
             this.rowData = this.formatData(response.data.data);
           } else {
-            const newRows = this.rowData.slice();
-            this.formatData(response.data.data).forEach((row) => {
-              newRows.push(row);
-            });
-            this.rowData = newRows;
-            if (this.gridApi) {
-              const viewport = document.querySelector('.ag-body-viewport');
-              const { scrollTop } = viewport;
-              this.gridApi.setRowData(this.rowData);
-              this.$nextTick(() => {
-                viewport.scrollTop = scrollTop;
-              });
-            }
-            this.lastPage = !response.data.meta.next_page;
+            this.handleInfiniteScroll(response);
           }
           this.totalPage = response.data.meta.total_pages;
           this.$emit('tableReloaded');
           this.dataLoading = false;
+          this.restoreSelection();
 
           this.handleScroll();
         });
     },
+    handleInfiniteScroll(response) {
+      const newRows = this.rowData.slice();
+      this.formatData(response.data.data).forEach((row) => {
+        newRows.push(row);
+      });
+      this.rowData = newRows;
+      if (this.gridApi) {
+        const viewport = document.querySelector('.ag-body-viewport');
+        const { scrollTop } = viewport;
+        this.gridApi.setRowData(this.rowData);
+        this.$nextTick(() => {
+          viewport.scrollTop = scrollTop;
+        });
+      }
+      this.lastPage = !response.data.meta.next_page;
+    },
     onGridReady(params) {
       this.gridApi = params.api;
       this.columnApi = params.columnApi;
@@ -445,18 +445,18 @@ export default {
       this.perPage = value;
       this.page = 1;
       this.lastPage = false;
-      this.reloadTable();
+      this.reloadTable(false);
     },
     setPage(page) {
       this.page = page;
-      this.loadData();
+      this.loadData(false);
     },
     setOrder() {
       const orderState = this.getOrder(this.columnApi.getColumnState());
       const [order] = orderState;
       this.order = order;
       this.saveTableState();
-      this.reloadTable();
+      this.reloadTable(false);
     },
     saveTableState() {
       const columnsState = this.columnApi ? this.columnApi.getColumnState() : this.tableState?.columnsState || [];
@@ -473,8 +473,23 @@ export default {
       axios.put(this.userSettingsUrl, { settings: [settings] });
       this.tableState = tableState;
     },
-    setSelectedRows() {
-      this.selectedRows = this.gridApi.getSelectedRows();
+    restoreSelection() {
+      if (this.gridApi) {
+        this.gridApi.forEachNode((node) => {
+          if (this.selectedRows.find((row) => row.id === node.data.id)) {
+            node.setSelected(true);
+          }
+        });
+      }
+    },
+    setSelectedRows(e) {
+      if (!this.rowData.find((row) => row.id === e.data.id)) return;
+
+      if (e.node.isSelected()) {
+        this.selectedRows.push(e.data);
+      } else {
+        this.selectedRows = this.selectedRows.filter((row) => row.id !== e.data.id);
+      }
     },
     emitAction(action) {
       this.$emit(action.name, action, this.selectedRows);
@@ -535,7 +550,7 @@ export default {
         dir
       };
       this.saveTableState();
-      this.reloadTable();
+      this.reloadTable(false);
     }
   }
 };

From 54428ff4f179b17cd926d27d7650189e5c9a7e90 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Fri, 16 Feb 2024 12:01:20 +0100
Subject: [PATCH 07/12] Fix routes for experiments my modules [SCI-10207]

---
 app/controllers/experiments_controller.rb | 8 ++++++++
 app/controllers/my_modules_controller.rb  | 7 +++++++
 config/routes.rb                          | 8 ++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 6c94aa622..9a2630d47 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -74,6 +74,8 @@ class ExperimentsController < ApplicationController
                                    .select('COUNT(DISTINCT comments.id) as task_comments_count')
                                    .select('my_modules.*').group(:id)
                       end
+
+    save_view_type('canvas')
   end
 
   def my_modules
@@ -456,6 +458,12 @@ class ExperimentsController < ApplicationController
     params.require(:experiment).require(:view_type)
   end
 
+  def save_view_type(view_type)
+    view_state = @experiment.current_view_state(current_user)
+    view_state.state['my_modules']['view_type'] = view_type
+    view_state.save!
+  end
+
   def check_read_permissions
     current_team_switch(@experiment.project.team) if current_team != @experiment.project.team
     render_403 unless can_read_experiment?(@experiment) ||
diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb
index 2dab50511..771cbfabd 100644
--- a/app/controllers/my_modules_controller.rb
+++ b/app/controllers/my_modules_controller.rb
@@ -38,6 +38,7 @@ class MyModulesController < ApplicationController
                meta: pagination_dict(my_modules)
       end
       format.html do
+        save_view_type('table')
         render 'my_modules/index'
       end
     end
@@ -573,6 +574,12 @@ class MyModulesController < ApplicationController
     end
   end
 
+  def save_view_type(view_type)
+    view_state = @experiment.current_view_state(current_user)
+    view_state.state['my_modules']['view_type'] = view_type
+    view_state.save!
+  end
+
   def log_activity(type_of, my_module = nil, message_items = {})
     my_module ||= @my_module
     message_items = { my_module: my_module.id }.merge(message_items)
diff --git a/config/routes.rb b/config/routes.rb
index cefe812ee..fe224074b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -376,7 +376,9 @@ Rails.application.routes.draw do
     end
     get 'project_folders/:project_folder_id', to: 'projects#index', as: :project_folder_projects
 
-    resources :experiments, only: %i(index update) do
+    get 'projects/:project_id', to: 'experiments#index'
+    get 'projects/:project_id/experiments', to: 'experiments#index', as: :experiments
+    resources :experiments, only: %i(update) do
       collection do
         get 'inventory_assigning_experiment_filter'
         get 'clone_modal', action: :clone_modal
@@ -421,7 +423,9 @@ Rails.application.routes.draw do
 
     # Show action is a popup (JSON) for individual module in full-zoom canvas,
     # as well as 'module info' page for single module (HTML)
-    resources :my_modules, path: '/modules', only: [:show, :update, :index] do
+    get 'experiments/:experiment_id/table', to: 'my_modules#index'
+    get 'experiments/:experiment_id/modules', to: 'my_modules#index', as: :my_modules
+    resources :my_modules, path: '/modules', only: [:show, :update] do
       post 'save_table_state', on: :collection, defaults: { format: 'json' }
 
       collection do

From c893ee19f986293792714d763c12aaed5e563974 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 19 Feb 2024 13:01:37 +0100
Subject: [PATCH 08/12] Small table fixes [SCI-10211]

---
 app/assets/stylesheets/shared/ag_table.scss   |   5 ++-
 app/javascript/vue/experiments/list.vue       |   3 +-
 app/javascript/vue/projects/list.vue          |  37 +++++++++---------
 .../vue/shared/datatable/action_toolbar.vue   |   2 +-
 app/javascript/vue/shared/datatable/table.vue |   2 +-
 .../vue/shared/datatable/tableHeader.js       |   3 +-
 .../vue/shared/datatable/toolbar.vue          |   3 +-
 .../assets/stylesheets/fonts/SN-icon-font.eot | Bin 30766 -> 31442 bytes
 .../assets/stylesheets/fonts/SN-icon-font.svg |   2 +
 .../assets/stylesheets/fonts/SN-icon-font.ttf | Bin 30580 -> 31256 bytes
 .../stylesheets/fonts/SN-icon-font.woff       | Bin 30656 -> 31332 bytes
 .../stylesheets/fonts/SN-icon-font.woff2      | Bin 12964 -> 13284 bytes
 vendor/assets/stylesheets/sn-icon-font.css    |  18 ++++++---
 13 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/app/assets/stylesheets/shared/ag_table.scss b/app/assets/stylesheets/shared/ag_table.scss
index 9282f8783..c4cf3c1a0 100644
--- a/app/assets/stylesheets/shared/ag_table.scss
+++ b/app/assets/stylesheets/shared/ag_table.scss
@@ -15,7 +15,6 @@
   --ag-icon-font-code-checkbox-indeterminate: asset-url("checkbox/indeterminate.svg");
   --ag-input-focus-box-shadow: none;
   --ag-cell-horizontal-padding: .75rem;
-
   border: 0;
 
   .ag-cell {
@@ -31,6 +30,10 @@
     cursor: pointer;
   }
 
+  .ag-header-cell-resize {
+    width: 1rem;
+  }
+
   .ag-input-field-input:focus {
     outline: none !important;
     outline-offset: 0 !important;
diff --git a/app/javascript/vue/experiments/list.vue b/app/javascript/vue/experiments/list.vue
index 2a12a44a8..e90658f57 100644
--- a/app/javascript/vue/experiments/list.vue
+++ b/app/javascript/vue/experiments/list.vue
@@ -122,7 +122,8 @@ export default {
         {
           field: 'created_at',
           headerName: this.i18n.t('experiments.card.start_date'),
-          sortable: true
+          sortable: true,
+          minWidth: 130
         },
         {
           field: 'updated_at',
diff --git a/app/javascript/vue/projects/list.vue b/app/javascript/vue/projects/list.vue
index a6d767423..e46e19907 100644
--- a/app/javascript/vue/projects/list.vue
+++ b/app/javascript/vue/projects/list.vue
@@ -88,7 +88,7 @@ export default {
     NewProjectModal,
     NewFolderModal,
     MoveModal,
-    AccessModal,
+    AccessModal
   },
   props: {
     dataSource: { type: String, required: true },
@@ -102,7 +102,7 @@ export default {
     userRolesUrl: { type: String },
     currentFolderId: { type: String },
     foldersTreeUrl: { type: String },
-    moveToUrl: { type: String },
+    moveToUrl: { type: String }
   },
   data() {
     return {
@@ -121,17 +121,18 @@ export default {
           flex: 1,
           headerName: this.i18n.t('projects.index.card.name'),
           sortable: true,
-          cellRenderer: this.nameRenderer,
+          cellRenderer: this.nameRenderer
         },
         {
           field: 'code',
           headerName: this.i18n.t('projects.index.card.id'),
-          sortable: true,
+          sortable: true
         },
         {
           field: 'created_at',
           headerName: this.i18n.t('projects.index.card.start_date'),
           sortable: true,
+          minWidth: 130
         },
         {
           field: 'users',
@@ -140,15 +141,15 @@ export default {
           sortable: false,
           minWidth: 210,
           notSelectable: true
-        },
-      ],
+        }
+      ]
     };
   },
   computed: {
     viewRenders() {
       return [
         { type: 'table' },
-        { type: 'cards' },
+        { type: 'cards' }
       ];
     },
     toolbarActions() {
@@ -160,7 +161,7 @@ export default {
           label: this.i18n.t('projects.index.new'),
           type: 'emit',
           path: this.createUrl,
-          buttonStyle: 'btn btn-primary',
+          buttonStyle: 'btn btn-primary'
         });
       }
       if (this.createFolderUrl) {
@@ -170,32 +171,32 @@ export default {
           label: this.i18n.t('projects.index.new_folder'),
           type: 'emit',
           path: this.createFolderUrl,
-          buttonStyle: 'btn btn-light',
+          buttonStyle: 'btn btn-light'
         });
       }
       return {
         left,
-        right: [],
+        right: []
       };
     },
     filters() {
       const filters = [
         {
           key: 'query',
-          type: 'Text',
+          type: 'Text'
         },
         {
           key: 'created_at',
           type: 'DateRange',
-          label: this.i18n.t('filters_modal.created_on.label'),
-        },
+          label: this.i18n.t('filters_modal.created_on.label')
+        }
       ];
 
       if (this.currentViewMode === 'archived') {
         filters.push({
           key: 'archived_at',
           type: 'DateRange',
-          label: this.i18n.t('filters_modal.archived_on.label'),
+          label: this.i18n.t('filters_modal.archived_on.label')
         });
       }
 
@@ -206,13 +207,13 @@ export default {
         optionRenderer: this.usersFilterRenderer,
         labelRenderer: this.usersFilterRenderer,
         label: this.i18n.t('projects.index.filters_modal.members.label'),
-        placeholder: this.i18n.t('projects.index.filters_modal.members.placeholder'),
+        placeholder: this.i18n.t('projects.index.filters_modal.members.placeholder')
       });
 
       filters.push({
         key: 'folder_search',
         type: 'Checkbox',
-        label: this.i18n.t('projects.index.filters_modal.folders.label'),
+        label: this.i18n.t('projects.index.filters_modal.folders.label')
       });
 
       return filters;
@@ -241,7 +242,7 @@ export default {
     access(event, rows) {
       this.accessModalParams = {
         object: rows[0],
-        roles_path: this.userRolesUrl,
+        roles_path: this.userRolesUrl
       };
     },
     async archive(event, rows) {
@@ -302,7 +303,7 @@ export default {
       if (ok) {
         axios.post(event.path, {
           project_ids: rows.filter((row) => !row.folder).map((row) => row.id),
-          project_folder_ids: rows.filter((row) => row.folder).map((row) => row.id),
+          project_folder_ids: rows.filter((row) => row.folder).map((row) => row.id)
         }).then((response) => {
           this.reloadingTable = true;
           HelperModule.flashAlertMsg(response.data.message, 'success');
diff --git a/app/javascript/vue/shared/datatable/action_toolbar.vue b/app/javascript/vue/shared/datatable/action_toolbar.vue
index e0a428815..3d44e8bd0 100644
--- a/app/javascript/vue/shared/datatable/action_toolbar.vue
+++ b/app/javascript/vue/shared/datatable/action_toolbar.vue
@@ -8,7 +8,7 @@
         {{ i18n.t('action_toolbar.no_actions') }}
       </div>
       <div v-for="action in actions" :key="action.name" class="sn-action-toolbar__action shrink-0">
-        <a :class="`rounded flex gap-2 items-center py-1.5 px-2.5
+        <a :class="`rounded flex gap-2 items-center py-1.5 px-2.5 hover:text-sn-white hover:bg-sn-blue
                   bg-sn-white color-sn-blue hover:no-underline focus:no-underline ${action.button_class}`"
           :href="(['link', 'remote-modal']).includes(action.type) ? action.path : '#'"
           :id="action.button_id"
diff --git a/app/javascript/vue/shared/datatable/table.vue b/app/javascript/vue/shared/datatable/table.vue
index 16a155b50..88a4fdcb6 100644
--- a/app/javascript/vue/shared/datatable/table.vue
+++ b/app/javascript/vue/shared/datatable/table.vue
@@ -382,7 +382,7 @@ export default {
       this.dataLoading = true;
       if (clearSelection) this.selectedRows = [];
       this.page = 1;
-      this.loadData();
+      this.loadData(true);
     },
     loadData(reload = false) {
       axios
diff --git a/app/javascript/vue/shared/datatable/tableHeader.js b/app/javascript/vue/shared/datatable/tableHeader.js
index 795ce69b7..3734ca526 100644
--- a/app/javascript/vue/shared/datatable/tableHeader.js
+++ b/app/javascript/vue/shared/datatable/tableHeader.js
@@ -1,6 +1,7 @@
 export default {
   template: `
-    <div class="w-full grid items-center gap-2 grid-cols-[auto_1.5rem] cursor-pointer"
+    <div class="w-full grid items-center gap-2 grid-cols-[auto_1.5rem]"
+         :class="{'cursor-pointer': params.enableSorting}"
          :data-e2e="'e2e-CO-TableHeader-' + params.column.colId "
          @click="onSortRequested((activeSort == 'asc' ? 'desc' : 'asc'), $event)">
       <div v-if="params.html" class="customHeaderLabel truncate" v-html="params.html"></div>
diff --git a/app/javascript/vue/shared/datatable/toolbar.vue b/app/javascript/vue/shared/datatable/toolbar.vue
index 5be899798..6d8acc814 100644
--- a/app/javascript/vue/shared/datatable/toolbar.vue
+++ b/app/javascript/vue/shared/datatable/toolbar.vue
@@ -75,7 +75,7 @@
         :title="i18n.t('experiments.table.column_display_modal.title')"
         class="btn btn-light icon-btn btn-black"
       >
-        <i class="sn-icon sn-icon-manage-table"></i>
+        <i class="sn-icon sn-icon-manage-columns"></i>
       </button>
       <GeneralDropdown v-if="currentViewRender === 'cards'" ref="dropdown" position="right">
         <template v-slot:field>
@@ -252,6 +252,7 @@ export default {
       if (ok) {
         this.$emit('resetColumnsToDefault');
       }
+      this.showColumnsModal = true;
     }
   }
 };
diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.eot b/vendor/assets/stylesheets/fonts/SN-icon-font.eot
index 9da9bc0e0e284d0f58bbd6bda0bac05f14851315..afa6ac079662c6bbe765d23a0b31249d58a1bea7 100644
GIT binary patch
delta 976
zcmYLIO=uHA6n?Wmvwzu5caz<;n8vo-ZncX+H^1T!;=vx$Lk}86K@D1s(Aw52wq6oM
zQ3MYXR452uJeUP9K@b(uiw94l=tVE0Ad09Uf|n+~NfmeAn>X*x``&!RyuJH_y!=Jz
z%d-HzXRp${F!}NO<*Pfc)b0VmBh*8OXDV}v@~b2OL51DNDhqRHd(dZAJ~q8{v~T3b
z1p12r^S7!~l_TEU`YC{gUfj=DF(BO#_M<<E{&02X)Z)H0u3!Okxa#!m;mW7`&%Xei
zeup*kGnK_T2t7gp&crcm;6!C+>W+5hA^KSaJe`|GAkPXc{cfBj<K$Z70omdgF`$AB
z91a2lpRaXRIvtjUYv`^?=R-n3Bx$YVK1|nSfX)-X&Od<^<X{5!!W5i`+wcroq{(Pk
zHYGMXi4<9te&X7hT-F<vx{-b|n9Jr1+esl`$Oj20F=7zOAl<OX;NGY=BvC0AICh-6
zLmtZ>qITTL1bHmux#TY%OKc~Z+z>_hs`R7lA}~>CEG3hTiJg&}YX|Hwc7B?;n43Th
zKTo5oz23HWkYdalu|%2Y`FbeHk7ZpDg?1SyT^>!R52n-W+86b>EGrx+vJ{VO$OOlO
zO!}D{1TNEDsgz^d4zYwRVzJmr%pP;%>*HFFDA%O0-c${`R!>=0DxybFQkD{>?2`<I
zlodnjI#K2SzLnC~(x^i2$hwGNQS=!hg_n3y5iNgP#8Gbw8l{GmOiBi&nh;YJMU8oq
zscLJC@o{5~rkd2zw5qB(WOFdgs165XrChdD%H~S#Hx^bBBu-)X^+i#PDpZ$MC$h~a
zW0WFOJ));fBofhm##H^w6FDnUWbCtj%j!piH=?wq&TisrVz)W=U~}|99C{%M1K1Y$
zk|sXoAikxU&1VK}He55q|5M-W>oZrHZ05=<O|Be<Z<@{5VaVJ6<7VGj-EZ$9;i_V{
zVrl=v<?kOS4@S5C0!?6l7r^_Ump1>ijRW%qvfR2pe~4>+TgVctaIWyRxU0Bae8JGD
K%dL&4+uR>L7rwdx

delta 335
zcmccgm2uq%MmD_)28NRIiEL&p`&3IyCpz@jZ((3y*aO4~$+?LIFE6~h#K6EP1LVh~
zCl(g~X#pS~sEL6iJ*P5l^3yJmd;<eRK0`)oVv5>wi691s0wABkECVROKAj~J$ln3v
zt7PPsR0Qb(Squet7#Nrma`KZC*A`8jz`#&!12n@ZH?g9CVWk=)8_-1{ixlz_b5mDx
z_wEMrfr^+87UUO~FffA*C=Z!j#OTgAW%4dYYhwqX01pEP0}}%a10#dN%Ly;1{Qvv^
zKS&*r$MA9zn8*14u{eu3Gf+Px1H)zorpGy(%?k~flz}`3M(x(pQq_I&{5D@1xLLp&
uAKnbn05L%H<Zs31j59Xtl_W52o>r#A$Y*xRT*tftC=1d&WAl~re@p=V5n$B-

diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.svg b/vendor/assets/stylesheets/fonts/SN-icon-font.svg
index 2fb090344..972a61e1b 100644
--- a/vendor/assets/stylesheets/fonts/SN-icon-font.svg
+++ b/vendor/assets/stylesheets/fonts/SN-icon-font.svg
@@ -171,7 +171,9 @@
 <glyph unicode="&#xe98e;" glyph-name="history-search" data-tags="history seaerch" d="M512 789.333c-128.853 0-240.64-71.68-298.667-176.64v91.307h-42.667v-170.667h170.667v42.667h-98.987c48.213 100.693 150.613 170.667 269.653 170.667 164.693 0 298.667-133.973 298.667-298.667s-133.973-298.667-298.667-298.667c-134.827 0-249.173 90.027-286.293 213.333h-43.947c37.973-147.2 171.093-256 330.24-256 188.587 0 341.333 152.747 341.333 341.333s-152.747 341.333-341.333 341.333zM676.267 292.267l-29.867-29.867-177.067 177.067v221.867h42.667v-204.8l164.267-164.267z" />
 <glyph unicode="&#xe98f;" glyph-name="item" data-tags="item" d="M682.667 661.333c0-94.257-76.412-170.667-170.667-170.667-94.257 0-170.667 76.41-170.667 170.667s76.41 170.667 170.667 170.667c94.255 0 170.667-76.41 170.667-170.667zM725.333 106.667c-70.694 0-128 57.306-128 128s57.306 128 128 128c70.694 0 128-57.306 128-128s-57.306-128-128-128zM725.333 64c94.255 0 170.667 76.412 170.667 170.667s-76.412 170.667-170.667 170.667c-94.255 0-170.667-76.412-170.667-170.667s76.412-170.667 170.667-170.667zM298.667 106.667c-70.692 0-128 57.306-128 128s57.308 128 128 128c70.692 0 128-57.306 128-128s-57.308-128-128-128zM298.667 64c94.257 0 170.667 76.412 170.667 170.667s-76.41 170.667-170.667 170.667c-94.257 0-170.667-76.412-170.667-170.667s76.41-170.667 170.667-170.667z" />
 <glyph unicode="&#xe990;" glyph-name="move-arrows" data-tags="move-arrows" d="M330.988 564.239l-81.66-81.675h134.673v-42.667h-134.69l81.677-81.694-30.165-30.165-133.184 133.184 133.184 133.182 30.165-30.165zM693.013 564.239l30.165 30.165 133.184-133.182-133.184-133.184-30.165 30.165 81.677 81.694h-134.69v42.667h134.673l-81.66 81.675zM512.597 520.956l60.352-60.331-60.352-60.352-60.331 60.352 60.331 60.331zM408.982 280.209l81.684-81.668v134.69h42.667v-134.694l81.685 81.673 30.165-30.165-133.184-133.184-133.183 133.184 30.165 30.165zM408.982 642.234l-30.165 30.165 133.183 133.184 133.184-133.184-30.165-30.165-81.685 81.669v-134.674h-42.667v134.673l-81.684-81.668z" />
+<glyph unicode="&#xe991;" glyph-name="teams-small" data-tags="teams-small" d="M881.493 424.747c-8.107 10.658-18.347 19.614-31.147 26.010-28.16 13.641-55.467 23.023-83.2 29.841-28.16 6.822-84.907 10.231-84.907 10.231l0.427-42.633c0 0 50.347-2.982 75.093-8.951s49.067-14.498 72.96-26.010c7.253-3.836 12.8-8.525 16.64-13.641 3.84-5.542 5.973-11.511 5.973-18.334v-18.33h-128v-42.637h170.667v60.966c0 15.774-5.12 30.699-14.507 43.486zM691.2 268.284c10.667-5.542 19.2-12.791 25.173-20.894 5.973-8.098 8.96-17.476 8.96-27.285v-27.712h-426.667v27.712c0 9.809 2.987 19.187 8.96 27.285 5.973 8.102 14.507 14.925 25.173 20.894 104.030 50.095 252.523 50.987 358.4 0zM314.453 306.227c-17.92-9.378-31.147-20.463-40.96-34.108-11.52-15.347-17.493-33.681-17.493-52.442v-70.345h512v70.345c0 18.761-5.973 37.094-17.067 52.442-9.813 13.218-23.040 24.303-39.253 33.254-119.223 57.647-276.817 58.982-397.227 0.853zM512 618.7c46.933 0 85.333-38.371 85.333-85.268 0-46.895-38.4-85.27-85.333-85.27s-85.333 38.374-85.333 85.27c0 46.897 38.4 85.268 85.333 85.268zM512 661.333c-70.4 0-128-57.556-128-127.901s57.6-127.902 128-127.902c70.4 0 128 57.557 128 127.902s-57.6 127.901-128 127.901zM170.667 362.931v18.33c0 6.822 2.133 12.791 5.973 18.334s9.387 10.231 16.64 13.641c23.893 11.511 48.213 20.041 72.96 26.010s49.92 8.951 75.093 8.951v42.633c-28.16 0-56.747-3.409-84.907-10.231-27.733-6.396-55.040-16.201-81.493-28.988-14.507-7.676-24.747-16.205-32.427-26.863-9.387-12.787-14.507-27.712-14.507-43.486v-60.966h170.667v42.637h-128zM341.333 661.366c12.373 0 21.333-3.837 29.867-12.364l30.72 29.844c-16.64 16.627-36.693 25.154-60.587 25.154s-43.947-8.527-60.587-25.154c-16.64-16.627-24.747-36.665-24.747-60.113s8.107-43.913 24.747-60.54c16.64-16.627 36.693-24.728 60.587-24.728v42.634c-12.373 0-21.76 3.837-30.293 12.364s-12.373 17.906-12.373 30.27c0 12.364 3.84 21.317 12.8 30.27 8.533 8.527 17.92 12.364 29.867 12.364zM682.667 661.366c12.373 0 21.333-3.837 29.867-12.364 8.533-8.953 12.8-18.333 12.8-30.27s-3.84-21.743-12.373-30.27c-8.533-8.527-17.92-12.364-30.293-12.364v-42.634c23.893 0 43.947 8.101 60.587 24.728s24.747 36.665 24.747 60.54c0 23.875-8.107 43.060-24.747 60.113-16.64 16.627-36.693 25.154-60.587 25.154s-43.947-8.527-60.587-25.154l30.72-29.844c8.533 8.527 17.92 12.364 29.867 12.364z" />
 <glyph unicode="&#xe992;" glyph-name="refresh" data-tags="refresh" d="M810.667 283.307c-58.027-104.96-169.813-176.64-298.667-176.64-188.587 0-341.333 152.747-341.333 341.333h42.667c0-164.693 133.973-298.667 298.667-298.667 119.040 0 221.44 69.973 269.653 170.667h-98.987v42.667h170.667v-170.667h-42.667v91.307zM213.333 612.693c58.027 104.96 169.813 176.64 298.667 176.64 188.587 0 341.333-152.747 341.333-341.333h-42.667c0 164.693-133.973 298.667-298.667 298.667-119.040 0-221.44-69.973-269.653-170.667h98.987v-42.667h-170.667v170.667h42.667v-91.307z" />
 <glyph unicode="&#xe993;" glyph-name="pin" data-tags="pin" d="M411.605 357.077l-99.584 99.541c0 0 0.683 21.333 14.293 39.893 29.141 39.68 86.443 41.813 129.195 33.536l67.371 66.304c-14.933 49.963 71.509 107.648 71.509 107.648 65.152-65.195 130.347-130.389 195.541-195.584-4.736-6.357-9.515-12.715-14.293-19.072-22.912-30.421-54.144-56.107-91.136-49.877l-70.827-68.651c0.981-7.339 0.896-0.64 2.517-24.576 3.072-45.44-13.653-92.245-56.149-113.92l-15.915-7.765-102.357 102.357-155.563-155.605-30.208 30.208 155.605 155.563zM587.392 648.747c-14.677-12.117-30.208-30.933-21.845-44.203l10.453-15.403-106.368-106.411c-42.411 10.795-92.715 13.568-109.995-13.099l192.427-192.683c2.005 1.408 3.925 2.901 5.803 4.48 26.155 23.040 16.299 64.853 10.624 104.533l102.187 102.187c0 0 31.36-20.011 62.635 16.555l-144.853 144.853c-0.384-0.256-0.725-0.555-1.067-0.811z" />
 <glyph unicode="&#xe994;" glyph-name="pinned" data-tags="pinned" d="M483.341 312.717l-140.803-0.030c0 0-14.602 15.569-18.102 38.319-7.452 48.661 31.558 90.688 67.641 115.068l0.754 94.52c-45.888 24.77-25.554 126.683-25.554 126.683 92.17-0.030 184.369-0.030 276.567-0.030 1.148-7.844 2.261-15.719 3.379-23.593 5.312-37.712 1.387-77.959-29.175-99.712l-1.536-98.624c5.884-4.497 1.084 0.179 19.157-15.599 34.304-29.961 55.573-74.88 40.849-120.256l-5.76-16.747h-144.755l0.030-220.028h-42.722l0.030 220.028zM401.399 643.26c-1.81-18.947 0.513-43.234 15.809-46.703l18.281-3.5 0.030-150.458c-37.62-22.353-75.151-55.966-68.514-87.040l272.311-0.179c0.422 2.415 0.725 4.826 0.939 7.27 2.202 34.786-34.334 57.382-66.406 81.429v144.513c0 0 36.326 8.025 32.585 55.995h-204.854c-0.090-0.453-0.12-0.905-0.181-1.327z" />
+<glyph unicode="&#xe995;" glyph-name="manage-columns" data-tags="manage-columns" d="M810.667 789.333c23.467 0 42.667-19.2 42.667-42.667v-597.333c0-23.467-19.2-42.667-42.667-42.667h-597.333c-23.467 0-42.667 19.2-42.667 42.667v597.333c0 23.467 19.2 42.667 42.667 42.667h597.333zM810.667 746.667h-597.333v-128h597.333v128zM810.667 576h-170.667v-426.667h170.667v426.667zM597.333 576h-170.667v-426.667h170.667v426.667zM384 576h-170.667v-426.667h170.667v426.667z" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.ttf b/vendor/assets/stylesheets/fonts/SN-icon-font.ttf
index 9fda5b64bd4bd57a8f78c1569f81ce84c61ba7a2..1dc6f355962ae6e3c0659e675158b451353f3267 100644
GIT binary patch
delta 990
zcmYLIO=uHQ5T3W2efyW)bT`?Jp=oTpZK_?3y2&Of{@}@i5fs!QdeETN3T;hk#d=B*
zMG-t`5Tzh^(1Y1y5Cp}aiw94F=tVE0Ad2Wg1uspUmsZ_3^JczzGqc}=c|X6An?Fen
z2mq*12Oc)=-n+qznDjnI9-$sNI$f#8%de6E1Qqt3sLWN-_8?|fIx%(jcw+d*F2oA}
zv$rQFD#y}q>+=9}tMEKOi2?CO=n&#Ph=(Sp=NArU(1SV5;U=d}9UZHDdhp^4!0C6`
zBtKnQs6s#}z?m3k_0LqMC+?|N9wN?R!L#ZqEaX{(v%jxC7$?`Sk<D%qp#l<cxCr!r
zzTR2tbXX4h(Dg~@Lp+3aq%}i6Or4YfI#2mJ{}fW-!!9@g6L22x!gHjMAtPPc6yIpa
zQ)F5Ch+}2_TzW+8M*7HrpUW4vkwU(Z_u_VZSSO-Ry5Te{PmiPrMJh%c^_>Z4B^9%`
zk*q&RF>_h^5IRxMju#qFdXu#Q^isr%u>{BRSbz4*3~{g~j<x(OjVRVy%i2zgQFGW7
zB%bH%fhawew2%;LmvPgikxb@rCbOn}QHx2E%z-S4vGDq=chbvdo;#lBF!f6%pJ_Y5
z7LtI?qP5|uHEPG!#?&4`5`%hE(dlX}Wtyq57Dh>#a)h!^)MZkZb+HQ~^8a%)rLCqB
zncR~!0gDB}WrSp2<ONwU-K}9;xfN0=)x~5|)G1X%QAL)OXj(KBwYR2^kL$gvVo+OE
z71btV-VmcY<c*g6T&a}vOYJu%b_$7{%<k(7f)J6ZCMkA!t4l^HMW$L<OBqNcthtP-
zvceNN%MoPkvUAhyLxVS>6eos_!hRfu)}fg+R}=o>9*DszNJ2jjg=bqvj5-5@Y2V1@
zvjY}ej*;d6s%s<?#!{2*TzRR<m4o0-v-vs*c<X=MNQ~Cq_I?s9Yxm(1_rm4xANL%N
zZ21Lhh`lU;_dhO;{k4rd)dE>;y{jJKuFXoVEpzKgvT&~OwYa0WSbT|D?DZ~^l}g|m
Ml{3*+WBxt&2P*fyuK)l5

delta 334
zcmbR7h4ITf#(D-u1_lOhh6V;^1_S?KeItG$wk<%BJwTk0oSRti^1`c23=E7iKz>Ym
zVsQbG769@qfHX&XPG#EUr(GcV1_p+FhK$t26t(3NK@1E9Kt6+622g-~I!h#wzXQlu
z$;d6K2+{+x7z*w%Ffb+L<R@Dut}U84fq|je255*;Zem3N!%9Xr28I%lMGAR|xv49;
zdv^o*Ks8JU3-XIgfDQ$M@{ox;+!?1#Vzf4P0CIU4I2f21Sb&~Ucsb$al>dMK{|Bi8
z@)%xD0`nOEKNe>ZX9ns9dU$gh<KvvowFL%D${_DEYPXh_s_u*DxB1Gz%>vf=@Meex
phykJ}+Z3BK&e&X1oWQjCPN@zfpV=jI9rFgDEJ*W=%~Iw6m;eP~TyFpX

diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.woff b/vendor/assets/stylesheets/fonts/SN-icon-font.woff
index 7eb3091ea56add9ba8e5f2feb7597abdf254d762..86665b1c468cc98bd01bf386605e2e5010db7e44 100644
GIT binary patch
delta 1003
zcmYLHO=uHA6rS15&i-XL-OcXCU>e(QoBk{Y-DH!9T0BS#rl1E6q6ZCaZG_ggv{?0$
zAc`V*D5VHR!HY<<#~_G`RFNLUgCKhGBo(A0R8Vg=@l9HFX1<wu-@Nzcd+=5^@aLb{
zm^(T!fG~n_WdzC1bH}{llphUG6sHivC7_N|L<;X>W5pTDJp)_VM$6dv<#WKjLTLIv
zMYQYAP-(O{g3t^AWhfFKE3+jafx8QKCk1~eaJn=xdkMG|gc$gTDV<6pG(I^De*G7F
zASndn%$LWnzfKe{!N+rFA+W6pACn8kiBaGx5cq;(S-$;rYI0^4Dmgs=`zT&q7{dFV
z9JouMmVt>;+xlW-v(W$!60M`=9XHk@0mLF)dxF=-&qHC26}G~zpg8i-5ITuQ(KYk{
zt%8;$?ryHVkv&!<j<;4Tw#}56PIU84rWLn)=}fjCXEWK18?ho?D&|$(q!Tne(Vghv
z2_If~b0lhSyMlK=PI(;!JhxUWn0DB;BH0Bw7Av>IEsjltI@qR5^V2Vr*oK%0#In;Q
zB$>UYc?jpidY8@#EX!7WUU)7j0WMH4z@`Y@$>f=2vZsDSF$6(mkSOp*aCgc*@1~Ng
zw(HsyUOw+p)O|=HaF8rq?h2cImeFg-Eu6snm8ztYT}oWn<3S||E3S(nLI<ykxFD*0
z(+G+G-}Sh%i-bhHEGQfVbDTp3i7d}@BBwhCgO+qJAQPhUu^6usA_u~fC`#c3uSxRG
zvN|}Z?vy2sSh6h17T)J}QmLJ8U*1dS^Jy<%|DZ#r0MCfDUWenjkVq6kvVsR4+(!r~
zRf0-f10g}hp-QD~ouF9^fntZg>v}63P!S=}F|-v<Kr7T9UPv%y?w{R)473BqXftBh
zGBtzP?HvhEOJ`E;CY`pHV*kR?qET(LN_VEPS!D{o|Djra@B6IzpVy*&6{mgz`&)os
zh1AaVTN|H`oe3TIh2#Kgp<Vmw$IX3z&xP+(S-e#1nLf+ZDl=)UXRl_z<py#~xwkYL
LuvB|FTW9_Nd$Pd|

delta 386
zcmaFzh4H|9Mu~ENH#Y`G1|TRuz`zZrOMraA$$?eE6SYO^w<PB#7BDa{W&ovPK=|c_
zSC`Tgi$P*XfP4-p7D&&jOaqFYVPMDy3gt6Qe%f^@BQ-IFfuR5>#$X1*YRe^pGJt{%
z423K}z6uDlPiKkD$StV=ifJ$~FeQL+kRAg=PJS{_on3JU&`=`~URyMALT+LO(BhIk
zK#dAuypoYEFEKY2D0T;^@gNAV<nG;FkY8K^^wENefBYGzO!i^4Hg*6i=K;EwiGhWI
zkwM|*gqKtP|NZ|TC<-*{CBw@}U>@WD$KovF%nZyxH4K|KF+R@Oe6qlRNg2pvVAO6c
zEmhqY&u{aUfg9v}28M?>Lx66E(33lg%^7EGK2V&%v{|D}hf%`plDUp~15g&Ec?Kg3
Sg8+~QIuI1Ho14oYG64Wu-ev;;

diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.woff2 b/vendor/assets/stylesheets/fonts/SN-icon-font.woff2
index 1d2fc1315ff8fc2027b8fda5dab091c72b275ff8..e8c16463fce7abe103e41c3e01eef16bbe956e98 100644
GIT binary patch
literal 13284
zcmV<AGaJlzPew8T0RR9105jwO3jhEB0D24n05g>U0V{<700000000000000000000
z00006U;tDR2nvDY6oIc{0X7081B7S`f;IpIAO(d%2Ot|?UPYu?v==^#Qms0gQIu>_
zIQ##Q+!zCDP;EGsLL0##)Ldu7McpG7s|F#D<?`cVv)R&TeP{7|*k@sjmR%gm-duk;
zRzF@uU}c!=M$Sh_GTZ*Z>*oK-xFKQWCV>Pb$VgbZ7Z4K07RUlb3z&Ps1!aV#qU?bB
zlFAC|Z&g4EKKmSt8|`$1v&vHm?f+_U5xPFMwGT(1(rv6w_1YIf$TkLw+O2cxzhxsO
zGrFM4lubbbO#R=R^Q$T=UZ|3+1pvoh#D?nv3X=Fk$Ik!m>Fi85=imkFDqRDM#P2@;
zJ6FxvC82ijo<|S{*@!cywaGh|q=V3Q2<Ru@-{Mk}U?nP9nZx#Vjd{tBdHFe504*R7
z*%REFs7pH8i6XzPM>+7s1)6d0-tJwtPJ1WUw6Xu2Yu!KrfZI(MlTQ(h7~8((5(Y}J
zvEJ?P%~_@WF>{T^p|zeWl&#Cpn<%>Q|JP=|>1Mhcn4%lBGNYPn(3nQjYyr|5G!C(x
zv%X<WA+2LMYkYjU4==wUGB(Vw@(a_0ul_`kdw4207x_q`*pFo<Qz~dhx0^t*pin}u
z|E(qFeKyGoe32N$1;yMty=}Kn2Y=4~0;WpGa!?O(ql77#gd}7_`}Ws+BY?q}$4&x=
zZpj+J2VolRXA0UjzuzkwPuGm&C(h{KhYS&%z6FQ|nhY@R2TOST3K%W?Wmg!Wr)VAX
z)6V&~)5#!5VHY|d%`dty(a5IIz8K!RNG#~V2+3i6XKZ6mCsaPRdg%tPVMVh7!lGqU
zcnx0(2#*^)MG;J7*408Wgwep5elUqz=!D>!c~`WT2|@xih%gn35Kau#R(r=Az{2i>
z)tN>QyIRiRw<f8mwR#O3py&w@+vx*QB$>g8GTgcT_eLgZ*^Y$X)V}G$4V$oowXGFJ
zK%JAnY4g~x1h?C^b3j<^+}fEW!bA0aj5+qGsP;)y$t7v40Q2i(cOxV~u<DY3E!%s}
zpOZna7bjd^W`LxxI_tW@a!v-Fyu~-;1&uX14*1|Qt~pI61o6JoNNua3gexa8*u_}Q
z_kM|#?7bR&*YK!nE}T0vgwonJNFs79c+w8JedtNJkUC!9+mm?@8NO6-ABN0l=&Po#
zdm(ES6m43LbmOB_Cm7x#2j*RP$V!+ccb`|p^R)p_9s)Q|B*CX@!5sXkm2*|83i$BA
zblCqnk@6W<d{--NZtbz_s+M!SRQw%~68^!omC3VGQdH`0#$&c>na}vBxbkWebU1YG
zq@6_TtK}(i!W}}0$i3OKU@#c^Li@#JLNplGHTr$zD%|m#6AFg11oLcx$KY(SSg#l6
zxn7&OeE)j?`yWPoJ6}~qV79#WX20YEP?r6JU~T47)l_oAh50VwqiPv3sQw;Yqq;sS
zTELqVx+QsakRZH02SOj2C=BGPa!!Wn1_t3Y@yt(+hQgMvss~rv0<@X>y1E_Hz#Ytn
zP01cSa5`Z)_9?FXqhh3vn`IjAunv<$x%4O9Agc4Nl8^CXcS+dUM#c=_bPd(htu8`1
zSoxo;aj{K$SFaBdzY43UbXz73YpNWCr*qvDH|0VbilwBiVV3L3SX8Y{4+n>P;ab&B
zz#BE?mPI$LU9*KsyGdMKXeE7sfTizo(KK0Ex1fc_O%M#T>b7SS*>S5eZz-lIE<nTK
zHQTk8oz|34qyxC8c*JmGj1BK_YUb=6O^16!9f~(mMMn<sSSpt8+Wa`Dr0HH{57Wfg
zvqk?AYGZT*DkBH5mb78B3M=aefsy*yj4X>Gm+%&+MxYrm?MZ!r!E1V|h9*~DvXGly
zd`KcLv=@m<thFgXD-~>z;fr4P`WL_OwXbo`d2g+`8WX$NQt^&$k64Nd+Aj|yBN%7n
zH*nUzgHTWUe&OlrE4^YqYCX07<A0Z{UjT;lW~Wy^08L=O>Ljvdfg%a6pu<@+c)xb(
z)MT3Ie*IK#hR=Z0A*=9tEvl6_{c!opxYC-cI+z!BPLh?)#yamLxkgD>MxmkL+Jc74
z?TILw+TJN60LBstSmY?P?}e#x!!^zl+`@ic57812qNIj|MxaoYFy_h0kkAm&P`Kvh
z0m2W_EsqC2XG<3I9p{8S<2o@unDqYQoTkY26(+0xTxMt2m_{oxlO2CXAYSn{46mXI
z9WB-=g?X^QYAEoSkdfQXL)v}OFhAQyHmsB`ZK#$<3EwTuQ8dg=H-QeyMGTTlh3g>e
z*$Je7K5skCE<pCT#Q%|$>8Y;77~dIWQ>(~x7_yyQlVUwb(qJZ-4YnNe2+{{lQOp)<
zJXhrq&n)YUxQqc7FnJritKaCSrb!lbG^vO-<{`xx_vN_<*6H+ha-?E_gN{MqD|Q;l
zU~_wqyWF|;!r@-H%^lYrw@<jGU0e^24oTbJ#$?&!!LaQulP!Pn+WFQcR}bJ;13Bz_
z9fN_dvOBll>^<((;`M-rS+G^uyQg4#@Ky{00L*}$p?uvv^*|fmA4I_M(;}g#B+9ss
zZ~q9<1BZ`>@@R3MUd%D!53(TV)MZqUzrrSTjQ)>D>Ueo}yk(Llq7aH#s+M@G?#UQW
zR_B>j%YL%hu~!L)@!<dt=Sf4-yFba8q2u0*eT)jsY2t7Vt^pjgP~eJ6IZ<xMae3wm
zCpJ62IW^(j?ki*m^lVAtrUsA>WQr>fRyaNL*1bwEbHGiB%FQ1wAs6S?0YV$}C%Ey*
zDaq$CrxX*ZGG0<b!h)5cx=p<+ug9v>0tjO5`1YQU(ROXn^cttQs^OHxUZ4)7%A_Ck
z9h1rmE1HS!IM5=oh1en4a7)QfUb3{#2CQy>_U1Cj`knwfzZX)}3Ssl}3^O4T>tSm|
zsWWQj!CAOE%@asXs&Ql~0HO-7EcJnYRV$4AQ=LG4b8dL6%-DY+DFpT)?+#x6LS11P
zPV7l!5L>3q3@i48yvc*sQ?MUzqam)9qn{16ku;DPtpq-jrK8pl_=D~=qJb1<x|uUP
zRXxB`YdE(gPs`nJNG$G=h57?kRTF4GG%K2?RksCJSJ$0y>#ata;@`dH`o-?PoROAP
z*(OXlUPdBIc(PCiDtW`qsH#;Uao#gG;eL;~;Yx9tS1pXI1#-D_3*_lkN;GzJJ%&3X
zDH5fmV$3sgXlMcwg)>y34vZYGEbzM03C?JKp+*KB708EE(9(KGytjTXo6)3bV@Pqb
zzQm^!7$tW>?{v9u+~K$|XB|3QIn48!8t>f_K6S6l&vt+K3o6Fks@JBpg|CdQou<1(
zniieEog)e5;i3tQ7IR7=2Af>604nZ*wgeB2?m@=45(={!qvOSqo;U~z5^179t(nke
z!$3LjYyaH!mgx&umZR}RqLEB~c|lAGopll>PY#HPSwd#e?*A%lsA$+NVT8>-WIO+Y
z$`Q_FXS&F(fn0Tg3ZMs%57mr_?>1SG(R`mNal=%2KoUxFN7>$X0|YiL)DG#9<tvpr
zEG$FeRjzL6a#p)Wg4QMLp@zXGLJ1U22!lcvH<Z#c5NcQ*u2CR+S6e?_$2Pzix-Ueh
zo41{Bjb#$lgg_&a+=4FYaO#G6I3@F!Q3Gk@nH*T2gT#&<59&^@oF~*3sMn<>&hK_J
zHMVrVtNiczLp1|MSnT|)z*suU-tXF)4M;>Bj4N~1bSBu>{<>_YntJ!sXNO?9FG=ry
z`NsPI3=7m7aunN;vBNs`P=s#35NvrM42l$9psM*W9_AJkR>^5e`R$c5fF0WuyZC@B
z*#q3wdb)8>bO@qaR@Myu&DBI|8MPLQiR)twrG&3IEdnh7f=6$)4Bn+?0yA<WI`JaX
zda9OQHZmm>`6>nip76Qnz^L1_9Hv<nYV$=QYi2jwf6@+A7^>fjdbd)|cqGBUiUAG_
zJ40305*0FUDRkP4y{LK&4PDm=c_vjhipDXUI-0uvx#Ielb{CBTnw;?*T~R2ni|{ta
zTy4_Ax5;Z7O9qV;xIy>^&AJlB0)l)2I*C!7XW(m8bC`hyW}YHTGSbbzWZzXY60rqO
zk<G`LYxnQGE^O`0)MxAoIgto72@nTRsm8-%`k<OK&bsWVv1#F-HqiGcF82VwPeo@R
zF--3zx)=8xIoEmArWKh+7v|?<;(~)EcJjky%cd-8fz*XNT~$+LtOvDrXjxFVAgCO1
z+G*7+S;$3>ix%^`b%EfNPTmY37s?rPT8%Mb;$_R|{h<0(@lb%yxV({|Y(hpfeSw$B
z`Ryd+^n$TrNE!4F<y(xjWHdon_@EEBxiHlf4J2~nOfSCWVjI74dZf*4p)MBDrKwEk
zu898Np}stxh_F$rc#trz;xL@zl%t91W@X-4Vm0rlv6XozG)gUjmc#8bhBPOKo1z?d
z%tJgdqj0OFkmjWEx&Sz37N-wUR>rwfrs2z#VnjfKjl+p`%R^NS&pTGTxu`2mv$3RN
zSi)BQ=tA0LerjB81<$(<?`81BUJD33UZGrPvy{zuZua%gqFxBfW`hL2gOn+x4Y2Us
zUs%CycM*TJj+}IsE5ElJ0xz+IHrbJ{Ot>~=w5`1EPKoCa;sP0X8j-!Q3)u--T$l9f
zlTP^1U-IjuUgo@1Veslw8*3`>YHI9b8|-lEwYaXx9D|Ti0Rv578>zx%^DA;cQNrIX
z$7@<q5$)Wx5+Olr2e~aHjPZYhGuidpA;Fv{z96^tfog209t*>|oh?ynEyRAYZiy?)
zuDx>q?y~^v(GzPdmlek2`mGR|+fwdLK`AIx&1%|LH$Y`9q|Ll*K4F`*%B{<@TGrTF
zP!m<B(VXiN6lRaDtsrlmn7oSAx!U&ARezqjop93@Br$qy>EAOvha(#3r046M+#R}K
zW=U_CY1J1(0x8;&t;{^OqwNwpyM?s=P*QMO=og%p>P&huGlvN>?#uT%PnbopLD)_%
zw$eiPXE)ghi;fA+j<Wbep$I2VhkP}n&1KpWzTM7Mx)dW@Qk;8|uTK>M?Lc?V6PoHJ
zymZ3!5~eEiJdo#LH#J;uI;OpdC;EbX!wb}`n{ehUg9NU$ohxl!SN+xHYBj;h?yLDl
zE7zH+uh?KMZnwF^KoIxq_gKy!)?}>WJaZrbofU(@uT#yzuq6AQ4O>8koU~2S;`nF0
zxzn}U`;eX^oIRV@u9CAJw!-RI{p{l;sQPj4F^{p2eXK#A_U?9N)q{pC`etew+*P~k
z^!04A<QA_LzBj+q$Cb}JJCA?L2mRp=kF2^R0&#P>Jv2t5-WyE@iunM@N^iLR>OT^R
zt*O7<x)5YC1e#paj2eI8?2%$|R0t2Q%G_$U@5d4DmzE7aB!uuaRP^`0M|gehDn&c&
zoc$g4CqQuivC0XrY-Z$(*`p%^c8v-sBS9TCJf{WCJOf#H1WJ)DJOH)BKy7hL0KrZI
zVoJEq9Wjl{@YZk>&P0j4Mb4OqK?1xLopo0fjD7ecBi<(o#`7(j^i#q%J0FHS#54|$
zyMDd5&XY4_jq#2Pi;ay9u>buqEVC=E=$7r3Y}tv{zQDcM0O8WS$iHy?6I_su#yRG9
zVet({I{?2NGq)YrBcKHn{nLtdw&mv{#e6W7d);=edlwr1`i*wZ$det;f8(&XaziCc
zD$@WGsLas?E-aA&d``O-%!^$)g{wu+cl%iBaJPmQ!7FYR&F7aLEr#wKx@gNhGt2cp
z<4)j51x4Q6vgWSm_Db@DKy|G7*_wK(_bvBsy^AZK;^hb%njpkGqmhcV&t^i?=m3J;
z2s%(}l0*?}`g{rivT_!HL)bAi4AumDHFzLLAa`2EVWKv#l5>}v%G=USXeb7<HdaHU
zU2VG+*h^6J0yHu^&#j$;+d6=2K2mD$Jj%J0asS0U^nKF{POJV-7mCJRwVDSopuX39
zr*FNOo{<chXtNE?@U(2gGAg!qnvpMtN=<ec!k4S)A<q&Lj4^^&l)M(+aH>gAmtZ?s
z|G-FPc9C2YA5u%aQ7nxxy7dj@<1fO<g=<YXvCaOC@2t;Ddv^VU^)znb0t~bj7awWm
zcnfcYF*tg5yxUp5E^Y1HKQ-4-^>cmWm#&$be-r23|LAVFUG+0<^^2^d+rOyi@%@+e
zgws&fi|yrK3Y%e%S$;|LM8(_k@*~==FT56`y?iUSHGYaP!aaWqW%1*ffSVr!KaEi6
zFR&t@#{zDD$al9%+<<bc2<8c-_QSy}5yv~PHix+^Ko7j}!6Gr$1xV0V{ZOg18tm(L
zC*OI2r9+0z_;KqCcd<CN6brH%ck=d-!)psRP=r|0LIWYU?|jF*Oy8i;ju4#&WNQ7#
zBF|=uPYsiAiI{NHlsw~A`g}2`bJJJx?}pslkJrB^cfWlZXx*4RFs-a$ZSngW&#FmW
zcShnmLqoS6$YgA*dimk2cL~f+l&Us7w5zttBi;JOgLW{-tyb<-j@%ts@_QG&_WHAG
z4u2f+U$THPA@vR%dA^wUR%a^TY)!S9&qEF!4C9dk4wXb2b?Pa23Z+qke~g$Y@3@+w
z7Ti&#g_4zkaItmkn*CxsA3Nyyk!}Q`RS`x4--!C8h64CZ%6QQVvp%nS)};sk8UOx|
z@4rcxC2$J)quaQDeBi$6`6aeL_<x6a7!{FX)VzO?%jXB*zf4y03^7_Q(s=x6gEkur
zH7@gca<<k@e1`dOFC)?~SA?@z;R;1(lsc6tT;2(eTX*j|E?ruLFS@entM34L(Cw}`
zb7^cFIqGJB?Uhzkl+GK|(rcU%j);hvh)7A^A-d$+04Fz_7#tuAeVap)lWPLF&K#nv
z8`fJCVaa%wA*7NhsQmaNSVSePEF~<R9@a-6!_w<8JUk<=)ratvd$S4(9Qg&o2_@-K
z-Pv_-ooE2<`#h&^Fe)u>g;!D099g8lUCCb`{Mmchdq8123Um}DH;yTFs<Xx^&M1d7
z#+ed$EG==GHlwD|HM%Kc)zx<lq&AEc{neGTU!@)piU!mXyo^Av<({6)y`-r=Sv^u|
zI3h6NRGPcKcD%-~W&BwA$)?-!>QuHL__0&f@wb~!RvbOseKBBs>gmx-Q_;2CwsEzj
zmb<N^J@Dq2ryo2W4**QcmwrAY9+#UN2gC1R9J`)e&*79*5wqqEo+YZ*xN_E1>Fpd`
zFg-DLi7&V`HZd)TFxVLGxBSFM9McI{;ZkW&rcbK0VqdR}OkO0YjtGTERI2yGkN#Cu
zt9MVMa1%Ihh_3|+a9>|>kmR~pd|eQP`!0x(@UN*Cskv<(b(uFEH>Re>{r$(MrfxWH
zX4ZAIan<Aqh}o&?xI0bO@?$q!{rp<S&lXyn?!>86*<$A+!IRO6O9K9wZL~y0B=~{>
zo<Jh)S?cM}Q&T@b-M`&mnHk`5RHvc0|3v#nEVukE{<kcbuiwM{5qLzn;okQFT)rwa
zHLTKXD3c{8m&*)>aD7TBU&Rgh?ta*WM?>!I+vEQ7AVMH1l*GgoN(6!+Lhe6)`*toE
z2U5}Y+K!AfmnzR4%XA3~&2%|?yz<h`=#KVUG?l<G@pTD5LM#?bB-h2h*Cmn&U*E{;
zyGC)uwctx<_}W0)$-hfW3j_kYwA5oikHMoc>F2$_<BY&}NsEoU)3sT$=jd69^z6|+
zg3W`s<AT#%_)d)f#5Ou95KNBRp6~@v#wMbV?!?#=L7B_4re$2i+PbU<560|Mx4xfF
zD=TaEg1e9I-k&^kdezEFL&v#~P_xBiMqANdi=_|EzjEbIbg09#iY-NEP3gXsL{<wc
zk(#p;NGyDo0{LgTL{)`eKoG%ua-p71J)AQ^@D#tlQIYkT=~Y#HJ;5WZE7V}bbXAq-
z1*R`7h?<O$(x^1C$X6})$y{7T>|a`4siHwl{wMQAC>%ihhLV{(UoLR~@DEFHdOvc2
zm7Pb*qsCT4<}nnvT5%KQoWiH9>`_M3n@#Ct_Wu3IGwMvC2U+nr{l0xew6#ezo}NBP
z3};Oh@stz8Y>0_&mbA4I8#tU&U3ARf^62*Vm>5GlSJ-G1B^x+OZ=_kNR4RE=vtXn;
z+EGFNIgos_fDoAZ;bav?Qocaxtde1N%zYzerLer+xKjit#%$5~$S+cO;oDz!6fNhO
zG#noN?psu#AlldGaAxjt;a!_8vcRgjwsK{FGk)G1GZxw={*R@$MxHfW)?Tw~^dIvv
zy#%(84;y`H@`;cOf-akGyB{?Vt-N+3xBacL-D7D+yqiYU*H)U%$NbdP{HLR%I8Zt(
z?lY!<S>^SAp;anp$W5CZ7R%@kzL^izq=0ljF6B!hn38EU7^Gi}5SKYjL)=&_SEPaI
ziXa?jBX29#l@pU)7QQ;O0SwQ3_v;<ik8AS>vUlIy8rI1OZ#tYX!07khdb2ST+TPYY
zA{{NK@@sOMl2<2{CB$@}Oe?`^Ofor0qEog(TfXT<PfFW=vomxfb6}IR`kXG=YFWd3
zNqjDBr{~VF1EK?fp9pjHat(7AxdAwx+Q*MquR8UiM!Wyi>eYF%Hgex^PWXSO%lpvx
z!Mb>$LFhUmjZO<m5z)OEUKo?fW-wTY3ve_a?O(mB`O}!z{_eGW8Ur?>>~yj!zd+xT
zp5Cg@&#x*<#~)7c<^0$YrMyM1JhnV*pfGbF>u}W}8Vw+>z?vWApSJqcey!$1v`R0}
zM+v?{C0nDBE=6%s0+vuzr0C4ZXq3vsn9M}Qmd%g_JSLsa1YQtt%N9i<lMybbmBvYh
zoY5I8KC3GOX^^%gX}stYqk%3n!>XWLEp5zDQc)C_qGg3-1j)XToX!hm&;xl0X!gcx
z-g5Z;u@$o#2^_<X#MljvppwQ6q)Sm$^tE0@3>jgv&5(JJWH5LNpa=pIc>J*yN0P#E
zMvWG{YAt57ayifEIKs#HsG-j?gyy0{7E3#qkMogE1z1j%m94;5l$A~H8Q3%UB{;oA
zrEg!n5i!{eB%G0R&ER*mU*|3=aXx<|61{oxwp8S<8#uDikaOMBhsj_wy<fj@mWcMI
zU%d7fMF7xYbWLIc3MuT|>xP9#1^}%J!i7eUTJunkhewaaToc_Ivn5O2k68PQ46g7v
z!*XIq^u^?%zN<eB3a2o%V|UHj@wC>KsDeIyE>nykZmfW<<;M~O7W6hp?Ol58Sj}$U
zrlZ_VU#uMHN;}?qsM=hUCls@U`fX+{^sdS&*w!3<B5m+U&ga~YqxqiR^-kw&Z_%5#
z&U)|czkMU}ejRUkgE!8t8S2~P;jza&RLk{fFWP@Gg9j!g(I&=|@u?$|>mqS&iN+_I
z<-%pNxh&RVpLeymwmx$B@Nd8U=dMRnv3t`m&!!$6ajcKPwWX@CbQd;o*r<!kV%8cB
zu3Z;lJ2Ex?C&Qx&VzPc>Zj70_&=<P-5K(9jAr7s~b#q^xci}<zVc`WDc?jsVWy=Tw
zK?=xaOMwT6h^Y$~rv6xLXe0R~As`HfBMUN@>-qZ8Z8{;3@WH83y+BX$t41%|4$)ap
zGng7KSiin35PUNI=oJkAyKv~jgA;8QIC2>kt?DQ-Uq43NL{Mxb7|g#E3GqE%3Y~;6
z3DU*LgWlK{<Z_)ESRm2Kg&j>5S(lj1>3_bFsr@F#{M0gxt+5G8lgTuGqc#hZ!Lp5(
zLt~($@G0Chg-sb{IEG_R8HtlljL<*EM%<3u;rIKZVH9}7qSqpd2k5Z(>;Gb*nNkQY
z2zecv84S|Q(APgc((}o~Hc2yrY?T-{ZL*O3md7dEPkMHyHOl|7Y2ZSCJv_s_OJ2O4
z72%>;=krqU;<R_(KA%s%buPm$oV#Mk+~a|J^q4I*9@toHsUNEK@G_D(Npd}ICrH46
zB<>G4z|#v`Y&6<+M&11_*omRQHw(fDU+@6|r!(3%mKXW*MbT=^O5qh=S1zj}c5IJK
zC#&=G^{r{?Eme&2=d1YY>)gb%#~cw;&!3aZLS-sT><0E)$M)^!9XlLXobA~0LEHaB
zE?-W6T!-O`^`yYeH*rEh$tJ$7Bi=4f;@yF_U+&0&W&maav5#yrI^#K`EHtr6&Zs*U
zvxnP3{^`#cZUPfd;4I-BqJopMyT`<2pYluaaT3e+i;BwdvVMUgk--d8u;t#Hw}6yJ
zV=(9p8co21`*vk8-;=^uh#j}<bSB(HWb6mdhzvp9(qRkMmGc9(!COD%puc5!?b2T&
z%T}plRnq2+JI)eVcQRn9Vi%KVF9S}@WYevH1H|QPQo;rhbddpoOs1`<&~QYHG#pc)
z{Mg(jadBX=`GH!DCm`XnhK*B-A#0j@P7G!}DIHFvpnENrcC<x}eDCZ<QwW?gVpIx}
z7^~=HwIH2JMG}&--<^2M=FAi18V<W8N^ksGQeVQ(Jt6)xp};I4tW#DZ-GNQi6lDU;
zIAxlmoCIMv*$H9_!%VIQoY?(uE}#EG0kH+dDzVTcj01dy`O18=FYkX-{WR+rLq_n2
zmkVtB6PO7jaFcJCIP>B~rEhpR<Mj53vqJy#KZAq^SKr<J0msDo7c9U~gT*q0wwAus
z$1RY^&$XDjw&YtxPCzDDbyh-$lQ?1QJ&M8wr}J!p%h)m}`7pT8anHSyyN*{cU%i6b
zjrUq?oo)H@on;|iUEymIlR{S!#G23qy-XjqED(JexGX9va4FZH2$Ub_G2PkK*`1@a
zf)&@fRo;^X%$gq%GeQpYB@1^D^&Cz;p*^a8gnXDHti7}F?RLF=H?!f?h+Y3U-GCt8
zG{h7P-ilR>*jGm5E3w+wBvy$t*aF}D`MWs7G-WhC1No=#E}4wa%Zq;}oD5sTBX}D}
zBft7IC@wcAPK1)^?7+qn5zX7@m8j(6*8vv;{4WNiqbD~Zp;cj%gFFoyf}x?yLvBsZ
z3quhR#4HC4hX`q5b&8Py0x-PIumIz>k64Ddt=zrCBkkN2B6x?n?N)H``CjvmU?QcG
z7~Y#0vN$&EE<b=gNfVR$S$MIxOs?ohW(U=cJJB<=q;WA2;)o!DncXcyOhC}`49tY#
zJZ6N#O*j@l;7ke;F3HU*NJ=iqO5?(ir1*y9q>yb{CoCk{*O#RvOogEnSri!>QD$|q
zoXB*F)xKhtI9$?KEyg0|A|jqw=0N`0Rl`8G3pC%Y!c2}+iwIsOttKljWlDzi_X<?k
zwZ>;PMHTK#Xm`mH_loM`XN}kPL;@?lsO;isL-gCq3S{k;DiT?vq#k2+T2IExZIV(a
ztF^gskxWv^y_O4hUbO17KX}_H>oAWuY^C<0=)M7GGJ8J^qtr#5ovw+$P~qd}$@CQP
zgBgqncEyEwZ5kUVDC8;yiaw>2_h)d#iv)qMZg^5%v)p}&$r@|9_9gDiYpNeN9>(PT
zNGq#fqR2iem-b(+Fph1yAQeh|6*XU0n#E@msR&Q~xu~WhwpVILLunPo)z2CaDU~wi
zAff0yzF#33kxmXe^ByrQX+)56d38`2f`m#a=iFR;0@st^<@IRAikTf9ok?MjFsIXm
zw=xOjDkYdA`6}YH;^Gb24a_@4#%XK2d+>?*d_%PR5Yax3PF!LPTNNKT^ledbp*weI
zc-u1}|M-yk`&FgyZvOMHwcesr{{B9`Xl-3x_H$coHF=%KZqh&Hu;-0&G#l0T0{Tm2
zw?ZL9Sm9Ozl{zd$7C$F;yEg~9OX7n6S^YLUCtK$#ygT{jLJ{xBhYz#s|6cQ5S68qb
zYHl<4c(@f*6}{-CUMD9daJfGRSVu3?lqwjtUJMM7HmEXIRzM)oC_`(7z`%=i4ycs0
zi~R!qlFPz-4dG?UN#W&fy@b<bd6=OMR#Ng3)9U5nNf1{^P#6UiPJwQ~*iK40&XIVQ
zy5BbzaZJWY=VLe!MjU+4gky)R32MqdWxU^Kh_Ayy{N1e<Gnzcir;rEc9wL=sD>`JM
ziH<!zsiOZ0ZiRmk30Fu8&pDEZg;ciY!{7J+PWDUxx<h)L+ZMc*rDR-@8M=PkIS;u1
zjLWaX7Gqd2Uuu=|gTrpYyx^a%SSW5ePE`9&;oos73jS;KVI5H_mawj;=Ef>cXHP3)
zi6x3EZ_Ed!hTEM5Tu(-QtdU_NE3#$ePkcpR)9CtE{>o-OBtlb#pt!Y#MPm>ow^*kG
zMH-e0mCgL(mKGX~Ua997S5`u5I;H@9CAv~i(z6W_y<KSg`|o*Q{$}@U-}0#+<~<i1
z<htg}6KY;hYuga&Ck)V<QvXe{ePlJI8&O5BO-NzTLQ{gH*DfYc6kC<Ct)AhYG)9<b
ze47%y7SrZ!jSXbiaZ{J93hjG?p(#j(L=whihQ-5_BY{Y{L>kIOHmnr1)~7FY)sj@M
z4%a#3{R#gbY*kkT{M-2W?=Tz-KdfMXZ_y`bUwm?IQQCv`>m|c|T(oa^Okd*aT0*Fu
zPrhHj;mLRF>Y;7~Cy37@>+aie`>zs362ilIN{YJ++odO=Z48l<v7M{~lbtGg5)$OT
zE6J$0_=$pMEC%$Ttn<bhM@Ed5sZVE9!D!^nl0-d+T~CVfQL>)>m{i$+J@g;VcAh;2
z^S8crvg3>5jp?c1^oGRnfW2c%rzKt$jtQOCSX4W}`OKH_4Imch>U=?^<Mvf|DIdqI
zIN(;Skro=z)(><Pk3x->26A|qipWf%F9yyP0<&Pybyth?>~X*2W~ybE>)?W!*aHgI
z+i?@{jgbH!OoPtP{ZFhx=zckQ`0yk?gSYbRbQ(X#pw+|xkJjQFHQKile*clr;%~4Q
z=CG`sQ8s&&)0-c4inTKHl`+OOrmxLf!8%pH_^9vEdO79CjEk91976-@9&O<xK@Yc>
z9nE+FW-zAp^ZNJV5PAo121gUNc4F0Pbq=dvAx&i6VI@fwyIC!)t+FwRg<~5joU(Gu
zviwsk2C^&erW1?je8rA39bTs6_)D?a_jwt3`yJ0+Vfy);!j=%3)<W(UN3VJ2*bH%p
z)IRy`rSsSQs+VAapGq}Hbac#FEWC1Da+9BXim5cRuP#Se2BMV5HzNY}+`4!7`RUU=
z-E&8eKrH=gcZ`{~jbZ9dUS?b~D<f>92}f9~^<^&Tbet(YNp>?t)hycxff1O>Q<o8r
zeeY?U^`yQ;RIM4BnOrl%eyV6m^Km7563>B9@d0m&Jp!c?X$|a!!5jct`+>xOei=Xj
z0KhV!ILneb00?u!wtIDu$8@UxUMA8+P{hU_f&{A0{jG&IMz)%ST^JFQIwN2{c^@N~
z$vPt#_hBZuMkD5!31u)+fH(Lg<mX=vWTd!Hl0Yz%RSynI08j(eqD4!I!R$i^m2Pgz
zgNL#QiPBkgRRP6z>Z-sj2%kg>qkO8c0gb!6W&o@5x#~|SRMi0i)hY$ye>J!?89B7C
zUvuzKrkh*V!GoIq;loIBX)uMs3!{?x&fP&cOwTZBiK00(b0_i*vNI#2B{p5E^<;98
z+tOQOAP0-hd6wfkYFv)#M*>-$iqKIKGw*nRdPVUq>{d^wKZ8Q}ucuGX-McsAaMaeK
z+~-{MjKkdf`Fwygr@uUQ3{o!5%<LI-I99G$vd1xpS)={c%QnNz;2_F%fYXR88t8Ao
zpMth`)MkvIY(9Q2lNB1OhCO$@`Q&&;ZAUwrLSi!Ub%7+pSBy(!|E-^mH|_1~bb_)|
zhmz9w+>}Ue?m0H5>v2eIDtlTmJ!%`_8<`m6W8-S*(o(oWxf~bfzuM=H7}m-<CrtiC
zy;Wq{=yFz6>Du6Ofj!6>+dpKdU_EQ(U6*lDrMtF|HR3`8=d<)8H_Nt`ba%_L@e-ze
z1XRbj^k_M6n01AYb!%s~ZJQ%WCdMoxVZq}5W942A8P)`wFbeJi00j*8)av@GiitCc
zxyah*&sD0bxs@y7O${!j4W>&Rmo7!&QGMg&-Mcd{U%?-L4pt)!Ile03PUhFj&si=v
zh@rZ?4IvD-U~LSkdht@F<f7$;Ixp`$#=f70V)@(7e>_+(CL6{$uG72sUirtr*LD8$
z8!y*4>TQ8xVHwr2hc^}w%G^BFlIz3v0*~x_mn&m5T818UM$GDEEB>2j6`=^n?Cb1=
z?*7V)V3lGlifS|_>h2T81To^otvFow;qm5Py=pf&_U=u6I8wjwQT%-$uEDkK(KKFk
z`yI2zqvdwmxDU;B+eZ8tQMRlr6Z4W;oxHe&BuNJLJxLPMW8pmMRf^gDI5_D?l|72D
zdxd{s48O-98XxzAXD|5eqmKrL!osYTSv@t&YI>mWscz`gGRvpBrebDTL?4-5JPXej
zyB^1SW8SlGUz9Y*C=S1PsIQwloYLJlRNU+h;59Rm=Pqq(9*x&VyShee<41L0g`2`Z
z%H>c@OqHkS0)*ugX%z<g%q8el$Zx6%4LW%A=*v|rSMqo(F&G>@Hpp`ZxO!GpP+<vj
zcXxS0s1<J&!!>Zn(SV7q{%aC-{<<QFPzdj#eSJeiXdrsUPpsA0+V^(t8p7~8&KL(c
zHcp*0Nhj5GRTeJnaD{MqreQO1D$a>97_Q0Ct~WI);7|T9J59i!o*0|tlVkD$cu|M;
z4S8Thhhcanc$P@JGBS7l8qMqqmc1DE9ds8!nk+W=SuSTJNwERx7liiFx7WKOuRJe!
z%bLuVP-B>}CE*<UPJPysQ=1>DzgK<#2pGZ7dLa4`{gE-$Q|t2{11E#v{{_eIKxUu|
z4Mw`gtU0GW*FZJsw={ZUQ~8}ug*(>IWAj^onEVf3aA$Klq&h;D`D|s6xv(kMyG4H0
zH5pk&HQvRGJcKKXg9i~tCa<D2K_PfYh6$G`6x&0<zndP-Yb;F|G<maUZrl*0=DpZx
zI_bi`v+-Kv`ycfE_#@lTkGkk}451y8Rs2^IA6;?lhnF-O4ILkE%7{;R-PEOWb&KzU
zG&L}2F6UkFBWA<OPaF38xcs<L@X9uU%DwkD&;$cP1q^1F^stCbbGgmgc#<6~$X=u2
zRnjiTAC#0-(lwgE%7Zt5L3SeIRog2{LlfRKb*$KR{P{6eR=aS3MbF?hWyF7+x8%2`
z*YOGOG|{gAZaV1_AY9$vuFgDibPf7?wkTv-C1?m9vAbNRIgsy$7YZtVU7B<GBcGZO
z7s{0e-;ly(Gta*ld5OM%KC@IP6fT9*vejflk8HEK+r!JF+uWP&af$az=Fh{QL=3k8
zkuXQ0Xe|uV1xeI&PZksL76^#wpaz855E!GAdWIu1w@j_(aZ{(Ko13(=>5fL5!EwR8
zyjCa_Jy}^T5=nw5!<EGd^VA|+htN4<NimS<^^GAC2oym<`OG2?<Yk-e3@A-34k%81
zHz0U2<f9b<H|7HdmTaSM519-q*-qa9febW@Bu9IC9UV=6mJFth<s>oM+d~+La1}A1
zSEUJj6BA(S@RKa!u-wxVA-XwVHpm)m{^_#xNj{?g#sFD>{~=k&CfTOR6GFtjmd)w#
z4_OIL({s+VniTT4Vl|Sekan^V8G_bW%zL?OxO>eO1NS`Fa1HO}QZkALizf*pD3GTJ
zePEy(B?5yek^AY#xBC40)@k(dF*@J=>T`)Xhj9M-;J>UyiDE0VhSe#NhqEpi+;2-K
zYkO{iUG{WIK|5MI)YrqkfcEqa)u3y*HIMflN+)GB60m>co7!dVv<?})V~cDHI3s0~
zGS8ovu3ekAQ?@f@`SMg|DIb=%psszTZs`ZI51v>mlMh?Ec$=VWEjEf{qgbh|bYY=X
z5$_)muaFilES1@Q+@QEkQ_Iu~mrLXT|AJ)s!f9iNZC*AH{@(|u<2^6~;<aLRu^n?v
z)uM>@hD8}6VF%r-=AT~gX<qcQh)xI1t;8^A`|}T5UY=G1sk8rg)CV8M+RcZM-WWfY
zHg@RxcY_PCQLMv!xES>UsbEa}ep{O@jDb)6Z98{%e>6%Ak@`xTUT<l$ghHi$y1?^*
zJ~V`|=uC4U>FWr9s9zj}BP6r3Y<*&5{rprqmD)|LR4A3RfD#PkG+Dc{4yIq)UMgZg
znS7qbqBaz~>rS4sojL_ST^ec|+Os$L^V5WdPzm4t61Ss;Gr+6p<Y!ZsHjBA8>Bten
zqUL*(n=l}AWs@?v@ovZ*ZJL-Sh~&nGEM+Cp+m*>=gnwoWodXBqIJmVjJBxv!@%sXy
zObF2ju9I15E6cTWW!(_xeZe7f&=LDAJzO_#?@*tC>q>%n?H!rv*lz3S_(V4UM)pa^
zCJ1B*qiv&kQO<A3RYO@x;pHpx_8nW~sAh1=OvHn^q^dA$IdH7QFCCwJGK1TI8W>bD
zv|(Ph5$N+w?#PRwIpaZAU`O>MI)bi{t0>6t#d`}199=HkyKqGvQ?d*qA){k9?DSrt
z2kYq-AUo=4w+Fzm_BR+3_#;LC8OZq`wdysvLQ}A3o=;Y*B=|dW$m+FU`scU4=BBy$
zQGPCIKL=a8{L#bGhmRT!A>+~Q9ox8C_+eaVZS<L&m~ZU@%ziUb#e%(Hz6``-QSAFG
zPA3x};la|@OrJc@V5KK69MHwSpLp~yZM)t*&5D~wWUh8%F3==m5Xc<23BWhv5Xnis
z40JJx%yRH^@&dun(Cmr1Wi7}*6_ejM^P)EEJ^C)}*nRpLkvq1lBCcE(R^XHsTSerY
zb;7>N+n)hR`&Z|3kgUw31!{n@GEme83%@?BQL=!>|M2C!UcYbO%)a4|q$fBv|EjJ1
zH3Po5a+SyD1tl)6(nH<aojYkjgYOb|!0SNOlY>wa#9j;P?P|moN!_yn%H^~tJs%$|
z-8GF*7vy-XIp_(4SHIMtKx5JuoNm|!QmKtbqk;T$A>Yg==TD3@k+;>o+9}FP-KWOy
zV041VRe<0<BTR;=%HUt@fxr&VRZJBw)}Bhb2|}5`62dW+S*`U{iU)BAo_A-^!BKSZ
zSetZvl`)0BF#89?8h7xdTa!EaD4oGNI)hDz=?;0*lX3-5N(KcE(KK6K)z6`m(d3vq
zMm*x)h;CPDBm<#<R4Y4O1az!{f1o@3WRR6fZ1<9W>dKw2p<F!_jnxBs(}<y{vST>u
zN7%$~oW(hxgIO47-cgVc#g!>UNk1w>#4t1fpyA!ZegAu`6it1@c4NZ(6MXw$b5f}D
zr!-&#9RRMt0B)xy#5=Il{QiK$%tu83M<#QA_h3Be_(phuc{)HNv>h}i@Mg=u@A86q
zphYLT0i<Z)4wq7NaG~u^F~FUci<t4_2#JRxR=hsN0T0-da)mGm3c7(ed<zVdU~<Mq
z;097O@PXSYI&f*06a#!{Bx1%tM@U?bSaI;18c}dKMb2e6uyMbY)&6T|^?7+pSgt~C
zwSI$UdV%u1r)=3ji30y=Yo@VH|JV)9*@piS8*<WJCeWY?Ru54X?rP?0e~OpMYI?%O
zMrG-<N^;A!N0D<4Tgvb(qW(?1`uxVSj{4fQpgMYdt6GtNq1&OpoL<|q$Z|y@mCSDz
zxh}HlFSPfXDr*00w^qHrV>N_L^+rvSE%MPe7FEIxh}W~IQPOMwM9jRHsF(yGOF!PE
iww7*;D88=~3Ua`wwg0N-uP_wStJY$jGL8OYj^Q2RIpJRb

literal 12964
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
at^7wNe}+L3tr{(sDYx2x#8JEf0000@0v{>>

diff --git a/vendor/assets/stylesheets/sn-icon-font.css b/vendor/assets/stylesheets/sn-icon-font.css
index 0b7cb56e7..a1bd5434b 100644
--- a/vendor/assets/stylesheets/sn-icon-font.css
+++ b/vendor/assets/stylesheets/sn-icon-font.css
@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'SN-icon-font';
-  src:  url('fonts/SN-icon-font.eot?h4j5vh');
-  src:  url('fonts/SN-icon-font.eot?h4j5vh#iefix') format('embedded-opentype'),
-    url('fonts/SN-icon-font.woff2?h4j5vh') format('woff2'),
-    url('fonts/SN-icon-font.ttf?h4j5vh') format('truetype'),
-    url('fonts/SN-icon-font.woff?h4j5vh') format('woff'),
-    url('fonts/SN-icon-font.svg?h4j5vh#SN-icon-font') format('svg');
+  src:  url('fonts/SN-icon-font.eot?5l6t28');
+  src:  url('fonts/SN-icon-font.eot?5l6t28#iefix') format('embedded-opentype'),
+    url('fonts/SN-icon-font.woff2?5l6t28') format('woff2'),
+    url('fonts/SN-icon-font.ttf?5l6t28') format('truetype'),
+    url('fonts/SN-icon-font.woff?5l6t28') format('woff'),
+    url('fonts/SN-icon-font.svg?5l6t28#SN-icon-font') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -470,3 +470,9 @@
 .sn-icon-pinned:before {
   content: "\e994";
 }
+.sn-icon-teams-small:before {
+  content: "\e991";
+}
+.sn-icon-manage-columns:before {
+  content: "\e995";
+}

From 2827dd3de345e90c2b15d5d58d881951acc083ad Mon Sep 17 00:00:00 2001
From: Ivan Kljun <ivan@scinote.net>
Date: Mon, 19 Feb 2024 15:12:37 +0100
Subject: [PATCH 09/12] Refactor fetching/applying table state [SCI-10163]

---
 app/javascript/vue/shared/datatable/table.vue | 88 ++++++++++++-------
 app/javascript/vue/shared/select_dropdown.vue |  3 +
 app/services/lists/repositories_service.rb    |  6 +-
 3 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/app/javascript/vue/shared/datatable/table.vue b/app/javascript/vue/shared/datatable/table.vue
index 16a155b50..7bbb6a2c2 100644
--- a/app/javascript/vue/shared/datatable/table.vue
+++ b/app/javascript/vue/shared/datatable/table.vue
@@ -48,7 +48,7 @@
         @first-data-rendered="onFirstDataRendered"
         @sortChanged="setOrder"
         @columnResized="saveTableState"
-        @columnMoved="saveTableState"
+        @columnMoved="onColumnMoved"
         @bodyScroll="handleScroll"
         @columnPinned="handlePin"
         @columnVisible="handleVisibility"
@@ -66,7 +66,7 @@
         :params="actionsParams"
         @toolbar:action="emitAction" />
     </div>
-    <div v-if="scrollMode == 'pages'" class="flex items-center py-4">
+    <div v-if="scrollMode == 'pages'" class="flex items-center py-4" :class="{'opacity-0': initializing }">
       <div class="mr-auto">
         <Pagination
           :totalPage="totalPage"
@@ -177,7 +177,9 @@ export default {
       dataLoading: true,
       lastPage: false,
       tableState: null,
-      userSettingsUrl: null
+      userSettingsUrl: null,
+      fetchedTableState: null,
+      gridReady: false
     };
   },
   components: {
@@ -276,10 +278,18 @@ export default {
     },
     perPage() {
       this.saveTableState();
+    },
+    fetchedTableState(newValue) {
+      if (newValue !== null && this.gridReady) {
+        this.applyTableState(newValue);
+      }
     }
   },
-  mounted() {
+  created() {
     this.userSettingsUrl = document.querySelector('meta[name="user-settings-url"]').getAttribute('content');
+    this.fetchTableState();
+  },
+  mounted() {
     this.loadData();
     window.addEventListener('resize', this.resize);
   },
@@ -316,41 +326,43 @@ export default {
       }
       this.saveTableState();
     },
-    fetchAndApplyTableState() {
-      axios
-        .get(this.userSettingsUrl, {
-          params: {
-            key: this.stateKey
-          }
-        })
+    fetchTableState() {
+      axios.get(this.userSettingsUrl, { params: { key: this.stateKey } })
         .then((response) => {
           if (response.data.data) {
-            const { currentViewRender, columnsState, perPage, order } = response.data.data;
-            this.tableState = response.data.data;
-            this.currentViewRender = currentViewRender;
-            this.columnsState = columnsState;
-            this.perPage = perPage;
-            this.order = order;
-
-            if (this.order) {
-              this.tableState.columnsState.forEach((column) => {
-                const updatedColumn = column;
-                updatedColumn.sort = this.order.column === column.colId ? this.order.dir : null;
-                return updatedColumn;
-              });
+            this.fetchedTableState = response.data.data;
+            if (this.gridReady && this.fetchedTableState) {
+              this.applyTableState(this.fetchedTableState);
             }
-            this.columnApi.applyColumnState({
-              state: this.tableState.columnsState,
-              applyOrder: true
-            });
           } else {
+            this.initializing = false;
             this.saveTableState();
           }
-          setTimeout(() => {
-            this.initializing = false;
-          }, 200);
         });
     },
+    applyTableState(state) {
+      const { currentViewRender, columnsState, perPage, order } = state;
+      this.tableState = state;
+      this.currentViewRender = currentViewRender;
+      this.columnsState = columnsState;
+      this.perPage = perPage;
+      this.order = order;
+
+      if (this.order) {
+        this.tableState.columnsState.forEach((column) => {
+          const updatedColumn = column;
+          updatedColumn.sort = this.order.column === column.colId ? this.order.dir : null;
+          return updatedColumn;
+        });
+      }
+      this.columnApi.applyColumnState({
+        state: this.tableState.columnsState,
+        applyOrder: true
+      });
+      setTimeout(() => {
+        this.initializing = false;
+      }, 200);
+    },
     getRowClass() {
       if (this.currentViewMode === 'archived') {
         return '!bg-sn-super-light-grey';
@@ -435,8 +447,10 @@ export default {
     onGridReady(params) {
       this.gridApi = params.api;
       this.columnApi = params.columnApi;
-
-      this.fetchAndApplyTableState();
+      this.gridReady = true;
+      if (this.fetchedTableState) {
+        this.applyTableState(this.fetchedTableState);
+      }
     },
     onFirstDataRendered() {
       this.resize();
@@ -459,6 +473,9 @@ export default {
       this.reloadTable(false);
     },
     saveTableState() {
+      if (this.initializing) {
+        return;
+      }
       const columnsState = this.columnApi ? this.columnApi.getColumnState() : this.tableState?.columnsState || [];
       const tableState = {
         columnsState,
@@ -551,6 +568,11 @@ export default {
       };
       this.saveTableState();
       this.reloadTable(false);
+    },
+    onColumnMoved(event) {
+      if (event.finished) {
+        this.saveTableState();
+      }
     }
   }
 };
diff --git a/app/javascript/vue/shared/select_dropdown.vue b/app/javascript/vue/shared/select_dropdown.vue
index 6fe3bebf6..b056e1c97 100644
--- a/app/javascript/vue/shared/select_dropdown.vue
+++ b/app/javascript/vue/shared/select_dropdown.vue
@@ -228,6 +228,9 @@ export default {
     this.fetchOptions();
   },
   watch: {
+    value(newValue) {
+      this.newValue = newValue;
+    },
     isOpen() {
       if (this.isOpen) {
         this.$nextTick(() => {
diff --git a/app/services/lists/repositories_service.rb b/app/services/lists/repositories_service.rb
index 6c08d256b..69eecf495 100644
--- a/app/services/lists/repositories_service.rb
+++ b/app/services/lists/repositories_service.rb
@@ -45,11 +45,11 @@ module Lists
     def sortable_columns
       @sortable_columns ||= {
         name: 'repositories.name',
-        team: 'teams.name',
-        created_by: 'creators.full_name',
+        team: 'team_name',
+        created_by: 'created_by_user',
         created_at: 'repositories.created_at',
         archived_on: 'repositories.archived_on',
-        archived_by: 'archivers.full_name',
+        archived_by: 'archived_by_user',
         nr_of_rows: 'row_count'
       }
     end

From 3f5b0dd30c59379a6182f491b50a7658469a761d Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Tue, 20 Feb 2024 03:35:38 +0400
Subject: [PATCH 10/12] To add "Archived on"column to Projects table (archived
 state) & rename column titles of "archived on" [SCI-10189]

---
 app/javascript/vue/projects/list.vue | 67 ++++++++++++++++------------
 config/locales/en.yml                |  8 ++--
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/app/javascript/vue/projects/list.vue b/app/javascript/vue/projects/list.vue
index a6d767423..494748305 100644
--- a/app/javascript/vue/projects/list.vue
+++ b/app/javascript/vue/projects/list.vue
@@ -114,37 +114,48 @@ export default {
       objectsToMove: null,
       reloadingTable: false,
       folderDeleteDescription: '',
-      exportDescription: '',
-      columnDefs: [
-        {
-          field: 'name',
-          flex: 1,
-          headerName: this.i18n.t('projects.index.card.name'),
-          sortable: true,
-          cellRenderer: this.nameRenderer,
-        },
-        {
-          field: 'code',
-          headerName: this.i18n.t('projects.index.card.id'),
-          sortable: true,
-        },
-        {
-          field: 'created_at',
-          headerName: this.i18n.t('projects.index.card.start_date'),
-          sortable: true,
-        },
-        {
-          field: 'users',
-          headerName: this.i18n.t('projects.index.card.users'),
-          cellRenderer: 'UsersRenderer',
-          sortable: false,
-          minWidth: 210,
-          notSelectable: true
-        },
-      ],
+      exportDescription: ''
     };
   },
   computed: {
+    columnDefs() {
+      const columns = [{
+        field: 'name',
+        flex: 1,
+        headerName: this.i18n.t('projects.index.card.name'),
+        sortable: true,
+        cellRenderer: this.nameRenderer,
+      },
+      {
+        field: 'code',
+        headerName: this.i18n.t('projects.index.card.id'),
+        sortable: true,
+      },
+      {
+        field: 'created_at',
+        headerName: this.i18n.t('projects.index.card.start_date'),
+        sortable: true,
+      },
+      {
+        field: 'users',
+        headerName: this.i18n.t('projects.index.card.users'),
+        cellRenderer: 'UsersRenderer',
+        sortable: false,
+        minWidth: 210,
+        notSelectable: true
+      },
+      ];
+
+      if (this.currentViewMode === 'archived') {
+        columns.push({
+          field: 'archived_on',
+          headerName: this.i18n.t('projects.index.card.archived_date'),
+          sortable: true
+        });
+      }
+
+      return columns;
+    },
     viewRenders() {
       return [
         { type: 'table' },
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b9c2fe99c..3bef345bd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -570,7 +570,7 @@ en:
         visibility: "Visible to"
         users: "Members"
         name: "Project name"
-        archived_date: "Archived"
+        archived_date: "Archived on"
       end_of_list_placeholder: 'You’ve reached the end of the list'
       folder:
         description: "%{projects_count} projects | %{folders_count} folders"
@@ -1462,7 +1462,7 @@ en:
       id: "ID"
       start_date: "Start date"
       modified_date: "Modified date"
-      archived_date: "Archived date"
+      archived_date: "Archived on"
       completed_task: "Completed"
       completed_value: "%{completed}/%{all} tasks"
       description: "Description"
@@ -1537,7 +1537,7 @@ en:
         id_html: 'ID'
         task_name_html: 'Task name'
         due_date_html: 'Due date'
-        archived_html: 'Archived'
+        archived_html: 'Archived on'
         age_html: 'Age'
         results_html: 'Results'
         status_html: 'Status'
@@ -4100,7 +4100,7 @@ en:
     updated_on:
       label: "Modified date"
     archived_on:
-      label: "Archived date"
+      label: "Archived on"
     recent_searches_label: "Recent searches"
     show_btn:
      one: "Show results"

From d4661fc2c758195cdb032bc09c993e2bd0646a5f Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Tue, 20 Feb 2024 13:37:17 +0400
Subject: [PATCH 11/12] fix hound [SCI-10189]

---
 app/javascript/vue/projects/list.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/javascript/vue/projects/list.vue b/app/javascript/vue/projects/list.vue
index 494748305..c6f984321 100644
--- a/app/javascript/vue/projects/list.vue
+++ b/app/javascript/vue/projects/list.vue
@@ -124,17 +124,17 @@ export default {
         flex: 1,
         headerName: this.i18n.t('projects.index.card.name'),
         sortable: true,
-        cellRenderer: this.nameRenderer,
+        cellRenderer: this.nameRenderer
       },
       {
         field: 'code',
         headerName: this.i18n.t('projects.index.card.id'),
-        sortable: true,
+        sortable: true
       },
       {
         field: 'created_at',
         headerName: this.i18n.t('projects.index.card.start_date'),
-        sortable: true,
+        sortable: true
       },
       {
         field: 'users',
@@ -143,8 +143,7 @@ export default {
         sortable: false,
         minWidth: 210,
         notSelectable: true
-      },
-      ];
+      }];
 
       if (this.currentViewMode === 'archived') {
         columns.push({

From bcad0145a3aa01a0352d7199c2e068e2aea91cf7 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 20 Feb 2024 10:55:03 +0100
Subject: [PATCH 12/12] Fix flyouts in main navigation [SCI-10208]

---
 .../vue/shared/general_dropdown.vue           | 27 +++---
 app/javascript/vue/shared/menu_dropdown.vue   | 91 ++++++++++---------
 app/javascript/vue/shared/select_dropdown.vue | 72 ++++++++-------
 3 files changed, 97 insertions(+), 93 deletions(-)

diff --git a/app/javascript/vue/shared/general_dropdown.vue b/app/javascript/vue/shared/general_dropdown.vue
index 94ae02706..e6f167bd6 100644
--- a/app/javascript/vue/shared/general_dropdown.vue
+++ b/app/javascript/vue/shared/general_dropdown.vue
@@ -3,19 +3,20 @@
     <div ref="field" class="cursor-pointer" @click.stop="isOpen = (!isOpen || fieldOnlyOpen)">
       <slot name="field"></slot>
     </div>
-    <teleport to="body">
-      <div ref="flyout"
-          class="sn-dropdown fixed z-[3000] bg-sn-white inline-block
-                 rounded p-2.5 sn-shadow-menu-sm"
-          :class="{
-              'right-0': position === 'right',
-              'left-0': position === 'left',
-          }"
-          v-if="isOpen"
-      >
-        <slot name="flyout"></slot>
-      </div>
-    </teleport>
+    <template v-if="isOpen">
+      <teleport to="body">
+        <div ref="flyout"
+            class="sn-dropdown fixed z-[3000] bg-sn-white inline-block
+                  rounded p-2.5 sn-shadow-menu-sm"
+            :class="{
+                'right-0': position === 'right',
+                'left-0': position === 'left',
+            }"
+        >
+          <slot name="flyout"></slot>
+        </div>
+      </teleport>
+    </template>
   </div>
 </template>
 
diff --git a/app/javascript/vue/shared/menu_dropdown.vue b/app/javascript/vue/shared/menu_dropdown.vue
index e53b8cdfd..60b3a2ca6 100644
--- a/app/javascript/vue/shared/menu_dropdown.vue
+++ b/app/javascript/vue/shared/menu_dropdown.vue
@@ -6,57 +6,58 @@
       <i v-if="caret && isOpen" class="sn-icon sn-icon-up"></i>
       <i v-else-if="caret" class="sn-icon sn-icon-down"></i>
     </button>
-    <teleport to="body">
-      <div ref="flyout"
-          v-if="isOpen"
-          class="fixed z-[3000] sn-menu-dropdown bg-sn-white inline-block rounded p-2.5 sn-shadow-menu-sm flex flex-col gap-[1px]"
-          :class="{
-              'right-0': position === 'right',
-              'left-0': position === 'left',
-          }"
-      >
-        <span v-for="(item, i) in listItems" :key="i" class="contents">
-          <div v-if="item.dividerBefore" class="border-0 border-t border-solid border-sn-light-grey"></div>
-          <a :href="item.url" v-if="!item.submenu"
-            :target="item.url_target || '_self'"
-            :class="{ 'bg-sn-super-light-blue': item.active }"
-            :data-toggle="item.modalTarget && 'modal'"
-            :data-target="item.modalTarget"
-            class="block whitespace-nowrap rounded px-3 py-2.5 hover:!text-sn-blue hover:no-underline cursor-pointer hover:bg-sn-super-light-grey leading-5"
-            @click="handleClick($event, item)"
-          >
-            {{ item.text }}
-          </a>
-          <div v-else class="-mx-2.5 px-2.5 group relative">
-            <span
+    <template v-if="isOpen">
+      <teleport to="body">
+        <div ref="flyout"
+            class="fixed z-[3000] sn-menu-dropdown bg-sn-white inline-block rounded p-2.5 sn-shadow-menu-sm flex flex-col gap-[1px]"
+            :class="{
+                'right-0': position === 'right',
+                'left-0': position === 'left',
+            }"
+        >
+          <span v-for="(item, i) in listItems" :key="i" class="contents">
+            <div v-if="item.dividerBefore" class="border-0 border-t border-solid border-sn-light-grey"></div>
+            <a :href="item.url" v-if="!item.submenu"
+              :target="item.url_target || '_self'"
               :class="{ 'bg-sn-super-light-blue': item.active }"
-              class="flex group items-center rounded relative text-sn-blue whitespace-nowrap px-3 py-2.5 hover:no-underline cursor-pointer
-                     group-hover:bg-sn-super-light-blue hover:!bg-sn-super-light-grey"
+              :data-toggle="item.modalTarget && 'modal'"
+              :data-target="item.modalTarget"
+              class="block whitespace-nowrap rounded px-3 py-2.5 hover:!text-sn-blue hover:no-underline cursor-pointer hover:bg-sn-super-light-grey leading-5"
+              @click="handleClick($event, item)"
             >
               {{ item.text }}
-              <i class="sn-icon sn-icon-right ml-auto"></i>
-            </span>
-            <div
-                class="absolute bg-sn-white top-0 rounded p-2.5 sn-shadow-menu-sm  flex flex-col gap-[1px] tw-hidden group-hover:block"
-                :class="{
-                  'left-0 ml-[100%]': item.position === 'right',
-                  'right-0 mr-[100%]': item.position === 'left'
-                }"
-            >
-              <a v-for="(sub_item, si) in item.submenu" :key="si"
-                :href="sub_item.url"
-                :traget="sub_item.url_target || '_self'"
+            </a>
+            <div v-else class="-mx-2.5 px-2.5 group relative">
+              <span
                 :class="{ 'bg-sn-super-light-blue': item.active }"
-                class="block whitespace-nowrap rounded px-3 py-2.5 hover:!text-sn-blue hover:no-underline cursor-pointer hover:bg-sn-super-light-grey leading-5"
-                @click="handleClick($event, sub_item)"
+                class="flex group items-center rounded relative text-sn-blue whitespace-nowrap px-3 py-2.5 hover:no-underline cursor-pointer
+                      group-hover:bg-sn-super-light-blue hover:!bg-sn-super-light-grey"
               >
-                {{ sub_item.text }}
-              </a>
+                {{ item.text }}
+                <i class="sn-icon sn-icon-right ml-auto"></i>
+              </span>
+              <div
+                  class="absolute bg-sn-white top-0 rounded p-2.5 sn-shadow-menu-sm  flex flex-col gap-[1px] tw-hidden group-hover:block"
+                  :class="{
+                    'left-0 ml-[100%]': item.position === 'right',
+                    'right-0 mr-[100%]': item.position === 'left'
+                  }"
+              >
+                <a v-for="(sub_item, si) in item.submenu" :key="si"
+                  :href="sub_item.url"
+                  :traget="sub_item.url_target || '_self'"
+                  :class="{ 'bg-sn-super-light-blue': item.active }"
+                  class="block whitespace-nowrap rounded px-3 py-2.5 hover:!text-sn-blue hover:no-underline cursor-pointer hover:bg-sn-super-light-grey leading-5"
+                  @click="handleClick($event, sub_item)"
+                >
+                  {{ sub_item.text }}
+                </a>
+              </div>
             </div>
-          </div>
-        </span>
-      </div>
-    </teleport>
+          </span>
+        </div>
+      </teleport>
+    </template>
   </div>
 </template>
 
diff --git a/app/javascript/vue/shared/select_dropdown.vue b/app/javascript/vue/shared/select_dropdown.vue
index 6fe3bebf6..449f61d73 100644
--- a/app/javascript/vue/shared/select_dropdown.vue
+++ b/app/javascript/vue/shared/select_dropdown.vue
@@ -46,44 +46,46 @@
       <i v-else class="sn-icon ml-auto"
                 :class="{ 'sn-icon-down': !isOpen, 'sn-icon-up': isOpen, 'text-sn-grey': disabled}"></i>
     </div>
-    <teleport to="body">
-      <div v-if="isOpen" ref="flyout"
-           class="sn-select-dropdown bg-white inline-block sn-shadow-menu-sm rounded w-full
-                  fixed z-[3000]">
-        <div v-if="multiple && withCheckboxes" class="p-2.5 pb-0">
-          <div @click="selectAll" :class="sizeClass"
-               class="border-x-0 border-transparent border-solid border-b-sn-light-grey
-                      py-1.5 px-3  cursor-pointer flex items-center gap-2 shrink-0">
-            <div class="sn-checkbox-icon"
-                :class="selectAllState"
-            ></div>
-            {{ i18n.t('general.select_all') }}
-          </div>
-        </div>
-        <perfect-scrollbar class="p-2.5 flex flex-col max-h-80 relative" :class="{ 'pt-0': withCheckboxes }">
-          <template v-for="option in filteredOptions" :key="option[0]">
-            <div
-              @click.stop="setValue(option[0])"
-              class="py-1.5 px-3 rounded cursor-pointer flex items-center gap-2 shrink-0"
-              :class="[sizeClass, {'!bg-sn-super-light-blue': valueSelected(option[0])}]"
-            >
-              <div v-if="withCheckboxes"
-                  class="sn-checkbox-icon"
-                  :class="{
-                    'checked': valueSelected(option[0]),
-                    'unchecked': !valueSelected(option[0]),
-                  }"
+    <template v-if="isOpen">
+      <teleport to="body">
+        <div ref="flyout"
+            class="sn-select-dropdown bg-white inline-block sn-shadow-menu-sm rounded w-full
+                    fixed z-[3000]">
+          <div v-if="multiple && withCheckboxes" class="p-2.5 pb-0">
+            <div @click="selectAll" :class="sizeClass"
+                class="border-x-0 border-transparent border-solid border-b-sn-light-grey
+                        py-1.5 px-3  cursor-pointer flex items-center gap-2 shrink-0">
+              <div class="sn-checkbox-icon"
+                  :class="selectAllState"
               ></div>
-              <div v-if="optionRenderer" v-html="optionRenderer(option)"></div>
-              <div v-else >{{ option[1] }}</div>
+              {{ i18n.t('general.select_all') }}
             </div>
-          </template>
-          <div v-if="filteredOptions.length === 0" class="text-sn-grey text-center py-2.5">
-            {{ noOptionsPlaceholder || this.i18n.t('general.select_dropdown.no_options_placeholder') }}
           </div>
-        </perfect-scrollbar>
-      </div>
-    </teleport>
+          <perfect-scrollbar class="p-2.5 flex flex-col max-h-80 relative" :class="{ 'pt-0': withCheckboxes }">
+            <template v-for="option in filteredOptions" :key="option[0]">
+              <div
+                @click.stop="setValue(option[0])"
+                class="py-1.5 px-3 rounded cursor-pointer flex items-center gap-2 shrink-0"
+                :class="[sizeClass, {'!bg-sn-super-light-blue': valueSelected(option[0])}]"
+              >
+                <div v-if="withCheckboxes"
+                    class="sn-checkbox-icon"
+                    :class="{
+                      'checked': valueSelected(option[0]),
+                      'unchecked': !valueSelected(option[0]),
+                    }"
+                ></div>
+                <div v-if="optionRenderer" v-html="optionRenderer(option)"></div>
+                <div v-else >{{ option[1] }}</div>
+              </div>
+            </template>
+            <div v-if="filteredOptions.length === 0" class="text-sn-grey text-center py-2.5">
+              {{ noOptionsPlaceholder || this.i18n.t('general.select_dropdown.no_options_placeholder') }}
+            </div>
+          </perfect-scrollbar>
+        </div>
+      </teleport>
+    </template>
   </div>
 
 </template>