Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unused code, rename share path #9843

Merged
merged 11 commits into from
Oct 24, 2023
Merged

Remove unused code, rename share path #9843

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4d0d4bd
Remove unused code, rename share path
AlexAndBear Oct 23, 2023
1b072cf
Fix
AlexAndBear Oct 23, 2023
bcc1e68
Add changelog item
AlexAndBear Oct 23, 2023
2e7a1c8
Remove duplicated code
AlexAndBear Oct 23, 2023
a6522d8
Fix bug where clicking on a folder in search preview doesnt close the…
AlexAndBear Oct 23, 2023
72a8d57
Remove console.log
AlexAndBear Oct 23, 2023
d7149b3
Add additional changelog item
AlexAndBear Oct 24, 2023
7d5f87c
Remove bullshit
AlexAndBear Oct 24, 2023
e92bc05
remove console.log
AlexAndBear Oct 24, 2023
6187c9e
Cleanup
AlexAndBear Oct 24, 2023
ad5d02b
fix test
AlexAndBear Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions packages/web-pkg/src/components/Search/ResourcePreview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,12 @@ export default defineComponent({

const space = computed(() => getMatchingSpace(unref(resource)))

const spaceName = computed(() => {
if (isShareSpaceResource(unref(space))) {
return path.join($gettext('Shared with me'), unref(space).name)
}

return unref(space).name
})

const resourceDisabled = computed(() => {
return unref(resource).disabled === true
})

return {
space,
spaceName,
...useFileActions(),
getInternalSpace,
getMatchingSpace,
Expand Down
2 changes: 1 addition & 1 deletion packages/web-pkg/src/composables/folderLink/useFolderLink.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const useFolderLink = (options: ResourceRouteResolverOptions = {}) => {
}

if (isShareSpaceResource(space)) {
return path.join($gettext('Shares'), $gettext('Shared with me'), space.name)
return path.join($gettext('Shares'), space.name)
}

return space.name
Expand Down