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.

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

fix: template folder and file request menu order #46913

Merged
merged 2 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions apps/files/src/newMenu/newTemplatesFolder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ const initTemplatesFolder = async function(directory: Folder, name: string) {

export const entry = {
id: 'template-picker',
displayName: t('files', 'Create new templates folder'),
displayName: t('files', 'Create templates folder'),
iconSvgInline: PlusSvg,
order: 10,
order: 30,
enabled(context: Folder): boolean {
// Templates folder already initialized
if (templatesPath) {
Expand Down
35 changes: 8 additions & 27 deletions apps/files_sharing/src/new/newFileRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,50 +4,31 @@
*/
import type { Entry, Folder, Node } from '@nextcloud/files'

import { defineAsyncComponent } from 'vue'
import { spawnDialog } from '@nextcloud/dialogs'
import { translate as t } from '@nextcloud/l10n'
import FileUploadSvg from '@mdi/svg/svg/file-upload.svg?raw'
import Vue, { defineAsyncComponent } from 'vue'

import Config from '../services/ConfigService'
const sharingConfig = new Config()

const NewFileRequestDialogVue = defineAsyncComponent(() => import('../components/NewFileRequestDialog.vue'))

const sharingConfig = new Config()

export const EntryId = 'file-request'

export const entry = {
id: EntryId,
displayName: t('files_sharing', 'Create file request'),
iconSvgInline: FileUploadSvg,
order: 30,
order: 10,
enabled(): boolean {
// We will check for the folder permission on the dialog
return sharingConfig.isPublicShareAllowed
},
async handler(context: Folder, content: Node[]) {
// Create document root
const mountingPoint = document.createElement('div')
mountingPoint.id = 'file-request-dialog'
document.body.appendChild(mountingPoint)

// Init vue app
const NewFileRequestDialog = new Vue({
name: 'NewFileRequestDialogRoot',
render: (h) => h(
NewFileRequestDialogVue,
{
props: {
context,
content,
},
on: {
close: () => {
NewFileRequestDialog.$destroy()
},
},
},
),
el: mountingPoint,
spawnDialog(NewFileRequestDialogVue, {
context,
content,
})
},
} as Entry
4 changes: 2 additions & 2 deletions dist/files-init.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-init.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files_sharing-init.js

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions dist/files_sharing-init.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ SPDX-FileCopyrightText: escape-html developers
SPDX-FileCopyrightText: debounce developers
SPDX-FileCopyrightText: atomiks
SPDX-FileCopyrightText: assert developers
SPDX-FileCopyrightText: Varun A P
SPDX-FileCopyrightText: Tobias Koppers @sokra
SPDX-FileCopyrightText: Titus Wormer <[email protected]> (https://wooorm.com)
SPDX-FileCopyrightText: T. Jameson Little <[email protected]>
Expand Down Expand Up @@ -47,6 +48,7 @@ SPDX-FileCopyrightText: Austin Andrews
SPDX-FileCopyrightText: Anthony Fu <https://github.com/antfu>
SPDX-FileCopyrightText: Andris Reinman
SPDX-FileCopyrightText: Alkemics
SPDX-FileCopyrightText: @nextcloud/dialogs developers


This file is generated from multiple sources. Included packages:
Expand Down Expand Up @@ -74,6 +76,9 @@ This file is generated from multiple sources. Included packages:
- @nextcloud/capabilities
- version: 1.2.0
- license: GPL-3.0-or-later
- @nextcloud/dialogs
- version: 5.3.5
- license: AGPL-3.0-or-later
- semver
- version: 7.6.2
- license: ISC
Expand Down Expand Up @@ -281,6 +286,9 @@ This file is generated from multiple sources. Included packages:
- tabbable
- version: 6.2.0
- license: MIT
- toastify-js
- version: 1.12.0
- license: MIT
- typescript-event-target
- version: 1.1.1
- license: MIT
Expand Down
2 changes: 1 addition & 1 deletion dist/files_sharing-init.js.map

Large diffs are not rendered by default.

Loading