From 866ea607a38938608641491f052f4258625d9d4f Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 18 Mar 2022 16:36:56 +0100
Subject: [PATCH] Fix share avatar colors

---
 .../enhancement-move-share-indicators           |  4 ++--
 .../enhancement-remove-links-shared-with-others |  6 +++---
 .../src/components/FilesList/ResourceTable.vue  | 17 ++++++++++++-----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/changelog/unreleased/enhancement-move-share-indicators b/changelog/unreleased/enhancement-move-share-indicators
index d900081aa63..70793a0f95d 100644
--- a/changelog/unreleased/enhancement-move-share-indicators
+++ b/changelog/unreleased/enhancement-move-share-indicators
@@ -1,9 +1,9 @@
 Enhancement: Move share indicators
 
 We've moved the share/status indicators into a separate column
-and adjusted the design in ODS. 
+and adjusted the design in ODS.
 
 https://github.com/owncloud/web/issues/5976
 https://github.com/owncloud/web/pull/6552
 https://github.com/owncloud/owncloud-design-system/pull/2014
-https://github.com/owncloud/web/pull/6583
\ No newline at end of file
+https://github.com/owncloud/web/pull/6583
diff --git a/changelog/unreleased/enhancement-remove-links-shared-with-others b/changelog/unreleased/enhancement-remove-links-shared-with-others
index 5f229dec4a2..999c07a3b5b 100644
--- a/changelog/unreleased/enhancement-remove-links-shared-with-others
+++ b/changelog/unreleased/enhancement-remove-links-shared-with-others
@@ -1,6 +1,6 @@
-Enhancement: Remove links from SharedWithOthers
+Enhancement: Remove public links from SharedWithOthers page
 
-We've removed links fromshared-with-others page.
+We've removed links from the shared-with-others page as those belong in the `Shared via link` page (and already exist there).
 
 https://github.com/owncloud/web/issues/5976
-https://github.com/owncloud/web/pull/6612
\ No newline at end of file
+https://github.com/owncloud/web/pull/6612
diff --git a/packages/web-app-files/src/components/FilesList/ResourceTable.vue b/packages/web-app-files/src/components/FilesList/ResourceTable.vue
index b7770ed85a0..3e211326409 100644
--- a/packages/web-app-files/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-app-files/src/components/FilesList/ResourceTable.vue
@@ -61,7 +61,7 @@
       <slot name="status" :resource="item" />
     </template>
     <template #sharedWith="{ item }">
-      <oc-button appearance="raw" @click="openSharingSidebar">
+      <oc-button appearance="raw" variation="inverse" @click="openSharingSidebar(item)">
         <oc-avatars
           class="resource-table-people"
           :items="item.sharedWith"
@@ -104,7 +104,7 @@
       />
     </template>
     <template #owner="{ item }">
-      <oc-button appearance="raw" @click="openSharingSidebar">
+      <oc-button appearance="raw" variation="inverse" @click="openSharingSidebar(item)">
         <oc-avatars
           class="resource-table-people"
           :items="item.owner"
@@ -159,6 +159,7 @@ import { EVENT_TROW_MOUNTED, EVENT_FILE_DROPPED } from '../../constants'
 import { SortDir } from '../../composables'
 import * as path from 'path'
 import { determineSortFields } from '../../helpers/ui/resourceTable'
+import { ShareTypes } from '../../helpers/share'
 
 export default {
   model: {
@@ -425,12 +426,14 @@ export default {
               this.formatDateRelative(item.ddate) + ' (' + this.formatDate(item.ddate) + ')'
           }
         ]
-          .filter((field) => Object.prototype.hasOwnProperty.call(firstResource, field.name))
           .filter((field) => {
+            if (!Object.prototype.hasOwnProperty.call(firstResource, field.name)) {
+              return false
+            }
             if (field.name !== 'indicators') {
               return true
             }
-            return firstResource.indicators.length > 0
+            return firstResource.indicators.length
           })
           .map((field) => {
             const sortField = sortFields.find((f) => f.name === field.name)
@@ -483,7 +486,11 @@ export default {
   },
   methods: {
     ...mapActions('Files/sidebar', ['openWithPanel']),
-    openSharingSidebar() {
+    openSharingSidebar(file) {
+      if (file.shareTypes?.includes(ShareTypes.link.value)) {
+        this.openWithPanel('links-item')
+        return
+      }
       this.openWithPanel('sharing-item')
     },
     folderLink(file) {