Fix unit tests & refactor link sorting

owncloud · May 23, 2022 · cf652df · cf652df
1 parent a60dff0
commit cf652df
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 52 deletions.
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -22,7 +22,7 @@
           :is-modifiable="canEdit"
           :is-password-enforced="isPasswordEnforcedFor(quicklink)"
           :link="quicklink"
-          @updateLink="checkLinkToCreate"
+          @updateLink="checkLinkToUpdate"
           @removePublicLink="deleteLinkConfirmation"
         />
         <hr class="link-separator oc-my-m" />
@@ -80,7 +80,6 @@ import { shareViaLinkHelp } from '../../../helpers/contextualHelpers'
 import { getParentPaths } from '../../../helpers/path'
 import { ShareTypes, LinkShareRoles, SharePermissions } from '../../../helpers/share'
 import { cloneStateObject } from '../../../helpers/store'
-import { textUtils } from '../../../helpers/textUtils'
 import { showQuickLinkPasswordModal } from '../../../quickActions'
 import CreateQuickLink from './Links/CreateQuickLink.vue'
 import DetailsAndEdit from './Links/DetailsAndEdit.vue'
@@ -214,27 +213,24 @@ export default defineComponent({
     },
 
     links() {
-      const nonQuickLinkOutgoingLinks = this.currentFileOutgoingLinks.filter(
-        (link) => !link.quicklink
-      )
-
-      return [...nonQuickLinkOutgoingLinks, ...this.indirectLinks]
-        .sort(this.linksComparator)
+      const nonQuickLinkOutgoingLinks = this.currentFileOutgoingLinks
+        .filter((link) => !link.quicklink)
         .map((share) => {
           share.key = 'direct-link-' + share.id
           return share
         })
+        .sort((a, b) => {
+          return b.stime - a.stime
+        })
+
+      return [...nonQuickLinkOutgoingLinks, ...this.indirectLinks]
     },
 
     displayLinks() {
-      const linkShares = this.links
-      const sortedLinkShares = linkShares.sort((a, b) => {
-        return b.stime - a.stime
-      })
       if (this.links.length > 3 && this.linkListCollapsed) {
-        return sortedLinkShares.slice(0, 3)
+        return this.links.slice(0, 3)
       }
-      return sortedLinkShares
+      return this.links
     },
 
     indirectLinks() {
@@ -258,7 +254,9 @@ export default defineComponent({
           })
         }
       })
-      return allShares.sort(this.linksComparator)
+      return allShares.sort((a, b) => {
+        return b.stime - a.stime
+      })
     },
 
     resourceIsSpace() {
@@ -314,24 +312,6 @@ export default defineComponent({
       })
     },
 
-    linksComparator(l1, l2) {
-      // sorting priority 1: display name (lower case, ascending), 2: creation time (descending)
-      const name1 = l1.name.toLowerCase().trim()
-      const name2 = l2.name.toLowerCase().trim()
-      const l1Direct = !l1.indirect
-      const l2Direct = !l2.indirect
-
-      if (l1Direct === l2Direct) {
-        if (name1 === name2) {
-          return l1.stime - l2.stime
-        }
-
-        return textUtils.naturalSortCompare(name1, name2)
-      }
-
-      return l1Direct ? -1 : 1
-    },
-
     isPasswordEnforcedFor(link) {
       const currentRole = LinkShareRoles.getByBitmask(
         parseInt(link.permissions),

diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
@@ -195,10 +195,7 @@ export default {
     },
 
     currentLinkRoleLabel() {
-      return LinkShareRoles.getByBitmask(
-        parseInt(this.link.permissions),
-        this.isFolderShare
-      ).label()
+      return LinkShareRoles.getByBitmask(parseInt(this.link.permissions), this.isFolderShare).label
     },
 
     editButtonLabel() {

diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js
@@ -141,7 +141,8 @@ describe('FileLinks', () => {
         highlightedFile: {
           path: '/lorem.txt',
           type: 'file',
-          canShare: jest.fn(() => false)
+          canShare: jest.fn(() => false),
+          isFolder: false
         }
       })
 

diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.js
@@ -14,13 +14,7 @@ localVue.use(GetTextPlugin, {
   silent: true
 })
 
-const availableRoleOptions = LinkShareRoles.list(false, true).map((role) => {
-  return {
-    role,
-    name: role.name,
-    label: role.label
-  }
-})
+const availableRoleOptions = LinkShareRoles.list(false, true)
 
 const exampleLink = {
   name: 'Example link',
@@ -46,7 +40,7 @@ describe('DetailsAndEdit component', () => {
   })
 })
 
-function getShallowMountedWrapper(link, expireDateEnforced = false, modifiable = false) {
+function getShallowMountedWrapper(link, expireDateEnforced = false, isModifiable = false) {
   return shallowMount(DetailsAndEdit, {
     propsData: {
       availableRoleOptions,
@@ -58,12 +52,8 @@ function getShallowMountedWrapper(link, expireDateEnforced = false, modifiable =
         max: null
       },
       link,
-      modifiable,
-      passwordEnforced: {
-        read_only: false,
-        upload_only: false,
-        read_write: false
-      }
+      isModifiable,
+      isPasswordEnforced: false
     },
     store: createStore(),
     directives: {