Rebase and add changelog item

owncloud · Oct 5, 2023 · 2669000 · 2669000
1 parent d7f471b
commit 2669000
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/changelog/unreleased/enhancement-show-hide-shares b/changelog/unreleased/enhancement-show-hide-shares
@@ -0,0 +1,9 @@
+Enhancement: Personal shares can be shown and hidden
+
+On the shared-with-me page, there is no distinction between pending, accepted and rejected shares anymore.
+Instead, the user can toggle to display either shown or hidden shares.
+
+Furthermore, accepting and rejecting shares has been renamed to "enable sync"/"disable sync" to better reflect what's happening on the server and on other devices.
+
+https://github.com/owncloud/web/issues/9531
+https://github.com/owncloud/web/pull/9718
diff --git a/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue b/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue
@@ -59,7 +59,7 @@
           @click.stop="triggerAction('accept-share', { space: null, resources: [resource] })"
         >
           <oc-icon size="small" name="check" />
-          <span v-translate>Accept</span>
+          <span v-translate>Enable sync</span>
         </oc-button>
         <oc-button
           v-if="getShowDeclineButton(resource)"

diff --git a/packages/web-app-files/src/views/shares/SharedWithMe.vue b/packages/web-app-files/src/views/shares/SharedWithMe.vue
@@ -66,15 +66,15 @@ import { AppLoadingSpinner } from '@ownclouders/web-pkg'
 import { AppBar } from '@ownclouders/web-pkg'
 import SharedWithMeSection from '../../components/Shares/SharedWithMeSection.vue'
 import { ShareStatus } from '@ownclouders/web-client/src/helpers/share'
-import { computed, defineComponent, unref } from 'vue'
+import { computed, defineComponent, ref, unref } from 'vue'
 import { Resource } from '@ownclouders/web-client'
 import SideBar from '../../components/SideBar/SideBar.vue'
 import FilesViewWrapper from '../../components/FilesViewWrapper.vue'
 import { useGetMatchingSpace, useSort } from '@ownclouders/web-pkg'
 // import { useGroupingSettings } from '@ownclouders/web-pkg'
 import SharesNavigation from 'web-app-files/src/components/AppBar/SharesNavigation.vue'
 import { useGettext } from 'vue3-gettext'
-import { useStore } from 'web-pkg/src/composables'
+import { useStore } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   components: {

diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsHideShare.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsHideShare.ts
@@ -2,20 +2,17 @@ import { triggerShareAction } from '../../../helpers/share/triggerShareAction'
 
 import { Store } from 'vuex'
 import PQueue from 'p-queue'
-import { ShareStatus } from 'web-client/src/helpers/share'
+import { ShareStatus } from '@ownclouders/web-client/src/helpers/share'
 import { isLocationSharesActive, isLocationSpacesActive } from '../../../router'
-import {
-  useCapabilityFilesSharingResharing,
-  useCapabilityShareJailEnabled,
-  useClientService,
-  useConfigurationManager,
-  useLoadingService,
-  useRouter,
-  useStore
-} from 'web-pkg/src/composables'
+import { useCapabilityFilesSharingResharing, useCapabilityShareJailEnabled } from '../../capability'
+import { useClientService } from '../../clientService'
+import { useConfigurationManager } from '../../configuration'
+import { useLoadingService } from '../../loadingService'
+import { useRouter } from '../../router'
+import { useStore } from '../../store'
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
-import { FileAction, FileActionOptions } from 'web-pkg/src/composables/actions/types'
+import { FileAction, FileActionOptions } from '../../actions'
 
 // TODO: Replace all "accept" copy leftovers
 export const useFileActionsHideShare = ({ store }: { store?: Store<any> } = {}) => {

diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json
@@ -26,7 +26,7 @@
     "luxon": "^2.4.0",
     "marked": "^4.0.12",
     "oidc-client-ts": "^2.1.0",
-    "owncloud-sdk": "3.1.0-alpha.9",
+    "owncloud-sdk": "file:./../../../owncloud-sdk",
     "p-queue": "^6.6.2",
     "pinia": "^2.1.3",
     "portal-vue": "3.0.0",