diff --git a/.travis.yml b/.travis.yml
index 8f97336fc7..ac454fb323 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,9 +89,11 @@ jobs:
- yes | sdkmanager "platforms;android-27" # see https://github.com/travis-ci/travis-ci/issues/8874#issuecomment-350350607
- scripts/decrypt.sh
- scripts/signing.sh
- - curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
+ - curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
- sudo apt-get install nodejs
- sudo apt-get install build-essential
+ - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.22.4
+ - export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
- yarn
- yarn run cozy-ci-transifex
- export PATH=/usr/local/android-sdk/build-tools/26.0.2:$PATH # Required to expose apksigner command.
diff --git a/package.json b/package.json
index 17c728c4dc..325472ee73 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
"lint:js": "eslint '{src,test}/**/*.{js,jsx}'",
"testcafe:drive": "node testcafe/runner-drive.js",
"testcafe:photos": "node testcafe/runner-photos.js",
- "test": "env USE_REACT=true cozy-scripts test --config=jest.config.json",
+ "test": "env NODE_ENV='test' cozy-scripts test --config=jest.config.json",
"genicon:drive:mobile": "(cd src/drive/targets/mobile && rm -Rf ./res/icons ./res/screens && splashicon-generator --imagespath='./res/model' && cp res/model/splash.png res/screens/ios/Default@2x~universal~anyany.png)",
"prepare:drive:mobile": "(cd src/drive/targets/mobile && rm -rf platforms && rm -rf plugins && rm package.json || true && rm package-lock.json || true && cordova prepare)",
"run:drive:android": "(cd src/drive/targets/mobile && cordova run android --device)",
@@ -105,7 +105,7 @@
"cozy-authentication": "^2.0.5",
"cozy-bar": "7.12.2",
"cozy-ci": "0.4.1",
- "cozy-client": "13.5.2",
+ "cozy-client": "13.8.0",
"cozy-client-js": "0.16.4",
"cozy-device-helper": "1.9.2",
"cozy-doctypes": "1.72.2",
@@ -113,9 +113,9 @@
"cozy-realtime": "3.8.0",
"cozy-scanner": "^0.3.2",
"cozy-scripts": "1.13.2",
- "cozy-sharing": "1.9.1",
+ "cozy-sharing": "1.11.0",
"cozy-stack-client": "13.5.2",
- "cozy-ui": "35.9.0",
+ "cozy-ui": "35.17.0",
"date-fns": "1.30.1",
"diacritics": "1.3.0",
"fastclick": "1.0.6",
diff --git a/src/drive/assets/icons/icon-checkbox-16.svg b/src/drive/assets/icons/icon-checkbox-16.svg
deleted file mode 100644
index d090583f2a..0000000000
--- a/src/drive/assets/icons/icon-checkbox-16.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/drive/assets/icons/icon-share-dark.svg b/src/drive/assets/icons/icon-share-dark.svg
deleted file mode 100644
index bf344c1cb5..0000000000
--- a/src/drive/assets/icons/icon-share-dark.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/src/drive/assets/icons/icon-trash-red.svg b/src/drive/assets/icons/icon-trash-red.svg
deleted file mode 100644
index 4a9cedf224..0000000000
--- a/src/drive/assets/icons/icon-trash-red.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/src/drive/assets/icons/icons-16-icon-note.svg b/src/drive/assets/icons/icons-16-icon-note.svg
deleted file mode 100644
index b163f33bea..0000000000
--- a/src/drive/assets/icons/icons-16-icon-note.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/drive/styles/toolbar.styl b/src/drive/styles/toolbar.styl
index 34e1e0c2f2..aa2bdb9e5e 100644
--- a/src/drive/styles/toolbar.styl
+++ b/src/drive/styles/toolbar.styl
@@ -29,72 +29,12 @@
.fil-toolbar-trash
margin-left auto
display flex
+
+.menu-recipients-wrapper
+ position relative
+
+.menu-recipients
+ position absolute
+ right 0
+ top -.5rem
-.fil-toolbar-menu
- //!TODO Remove this code after upgrading to cozy-bar@6
- button
- svg
- visibility: initial
- display: initial
- a
- label
- &.fil-action-upload
- span[role=button]
- display flex
- padding-left 1rem
- svg
- margin-right .5rem
-
- &.fil-action-newfolder
- background embedurl('../assets/icons/icon-folder-add-16.svg') 1rem center no-repeat
- &.fil-action-download
- background embedurl("../assets/icons/icon-download-16.svg") 1rem center no-repeat
- &.fil-action-select
- background embedurl('../assets/icons/icon-checkbox-16.svg') 1rem center no-repeat
- &.fil-action-delete
- color var(--pomegranate)
- background embedurl('../assets/icons/icon-trash-red.svg') 1rem center no-repeat
- &.fil-action-share
- position relative
- background embedurl('../assets/icons/icon-share-dark.svg') 1rem center no-repeat
- &.fil-action-create-note
- background embedurl('../assets/icons/icons-16-icon-note.svg') 1rem center no-repeat
- &.fil-action-create-shortcut
- background embedurl('../assets/icons/icon-link.svg') 1rem center no-repeat
- .fil-toolbar-menu-recipients
- position absolute
- right 1rem
- top .1rem
- .fil-action-share
- display none
-+medium-screen()
- .fil-toolbar-menu
- display block
- left 1em
- .fil-action-share
- .fil-action-select
- .fil-action-upload
- display block
-+tablet()
- .fil-toolbar-menu-recipients
- display none
-+small-screen()
- .fil-toolbar-inner-menu
- position fixed
- margin .5rem
- width calc(100% - 1rem)
- .fil-toolbar-files
- .fil-toolbar-trash
- position fixed
- top 0
- right 0
- z-index $nav-index
-
- .fil-public-download
- display none
- .fil-toolbar-menu
- .fil-toolbar-menu-recipients
- display inline-flex
-+small-screen('min')
- .fil-toolbar-menu--public
- display none
diff --git a/src/drive/targets/public/index.jsx b/src/drive/targets/public/index.jsx
index 1a4c510848..a9ba222ecc 100644
--- a/src/drive/targets/public/index.jsx
+++ b/src/drive/targets/public/index.jsx
@@ -10,6 +10,7 @@ import { RealtimePlugin } from 'cozy-realtime'
import { I18n, initTranslation } from 'cozy-ui/transpiled/react/I18n'
import Alerter from 'cozy-ui/transpiled/react/Alerter'
+import SharingProvider from 'cozy-sharing'
import { getQueryParameter } from 'react-cozy-helpers'
import { schema } from 'drive/lib/doctypes'
@@ -17,6 +18,7 @@ import configureStore from 'drive/store/configureStore'
import PublicLayout from 'drive/web/modules/public/PublicLayout'
import LightFolderView from 'drive/web/modules/public/LightFolderView'
import LightFileViewer from 'drive/web/modules/public/LightFileViewer'
+import FileHistory from 'components/FileHistory'
import ErrorShare from 'components/Error/ErrorShare'
import { configureReporter, setCozyUrl } from 'drive/lib/reporter'
import getSharedDocument from 'cozy-sharing/dist/getSharedDocument'
@@ -102,19 +104,26 @@ const init = async () => {
initCozyBar(dataset)
render(
- {isFile ? (
-
-
-
- ) : (
-
-
-
-
-
-
-
- )}
+
+ {isFile ? (
+
+
+
+ ) : (
+
+
+
+
+
+
+
+
+
+ )}
+
,
root
)
diff --git a/src/drive/web/modules/drive/Toolbar/components/AddFolderItem.jsx b/src/drive/web/modules/drive/Toolbar/components/AddFolderItem.jsx
index 1e17331a31..2a002a6e90 100644
--- a/src/drive/web/modules/drive/Toolbar/components/AddFolderItem.jsx
+++ b/src/drive/web/modules/drive/Toolbar/components/AddFolderItem.jsx
@@ -1,18 +1,19 @@
import React from 'react'
import { connect } from 'react-redux'
import { translate } from 'cozy-ui/transpiled/react/I18n'
-import styles from 'drive/styles/toolbar.styl'
import { showNewFolderInput } from 'drive/web/modules/filelist/duck'
+import { ActionMenuItem } from 'cozy-ui/transpiled/react/ActionMenu'
+import Icon from 'cozy-ui/transpiled/react/Icon'
const AddFolderItem = translate()(({ t, addFolder }) => {
return (
- }
>
{t('toolbar.menu_new_folder')}
-
+
)
})
const mapDispatchToProps = dispatch => ({
diff --git a/src/drive/web/modules/drive/Toolbar/components/CreateNoteItem.jsx b/src/drive/web/modules/drive/Toolbar/components/CreateNoteItem.jsx
index 225e28c32d..9cbc46a920 100644
--- a/src/drive/web/modules/drive/Toolbar/components/CreateNoteItem.jsx
+++ b/src/drive/web/modules/drive/Toolbar/components/CreateNoteItem.jsx
@@ -8,21 +8,47 @@ import {
useAppLinkWithStoreFallback,
useCapabilities
} from 'cozy-client'
-import { generateUniversalLink } from 'cozy-ui/transpiled/react/AppLinker/native'
+import {
+ generateUniversalLink,
+ generateWebLink
+} from 'cozy-ui/transpiled/react/AppLinker/native'
+import { ActionMenuItem } from 'cozy-ui/transpiled/react/ActionMenu'
+import Icon from 'cozy-ui/transpiled/react/Icon'
import toolbarContainer from 'drive/web/modules/drive/Toolbar/toolbar'
-import styles from 'drive/styles/toolbar.styl'
-const CreateNoteItem = ({ client, t, displayedFolder }) => {
- const { fetchStatus, url, isInstalled } = useAppLinkWithStoreFallback(
- 'notes',
- client
- )
+const CreateNoteItem = ({
+ client,
+ t,
+ displayedFolder,
+ hasAppsPermissions = true
+}) => {
const capabilities = useCapabilities(client)
const isFlatDomain = get(
capabilities,
'capabilities.data.attributes.flat_subdomains'
)
+
+ let notesAppUrl = undefined
+ let notesAppIsInstalled = true
+
+ if (hasAppsPermissions) {
+ const { fetchStatus, url, isInstalled } = useAppLinkWithStoreFallback(
+ 'notes',
+ client
+ )
+ if (fetchStatus === 'loaded') {
+ notesAppUrl = url
+ notesAppIsInstalled = isInstalled
+ }
+ } else {
+ notesAppUrl = generateWebLink({
+ slug: 'notes',
+ cozyUrl: client.getStackClient().uri,
+ subDomainType: isFlatDomain ? 'flat' : 'nested'
+ })
+ }
+
let returnUrl = ''
if (displayedFolder) {
returnUrl = generateUniversalLink({
@@ -34,28 +60,28 @@ const CreateNoteItem = ({ client, t, displayedFolder }) => {
}
return (
- }
onClick={async () => {
- if (!fetchStatus) return
- if (isInstalled) {
+ if (notesAppUrl === undefined) return
+ if (notesAppIsInstalled) {
const { data: file } = await client.create('io.cozy.notes', {
dir_id: displayedFolder.id
})
window.location.href = await models.note.generatePrivateUrl(
- url,
+ notesAppUrl,
file,
{ returnUrl }
)
} else {
- window.location.href = url
+ window.location.href = notesAppUrl
}
}}
>
{t('toolbar.menu_create_note')}
-
+
)
}
diff --git a/src/drive/web/modules/drive/Toolbar/components/CreateShortcut.jsx b/src/drive/web/modules/drive/Toolbar/components/CreateShortcut.jsx
index b81a66c860..177f6cb794 100644
--- a/src/drive/web/modules/drive/Toolbar/components/CreateShortcut.jsx
+++ b/src/drive/web/modules/drive/Toolbar/components/CreateShortcut.jsx
@@ -1,30 +1,33 @@
-import React, { useState, useCallback } from 'react'
+import React from 'react'
+import { connect } from 'react-redux'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import styles from 'drive/styles/toolbar.styl'
+import { ActionMenuItem } from 'cozy-ui/transpiled/react/ActionMenu'
+import Icon from 'cozy-ui/transpiled/react/Icon'
import ShortcutCreationModal from './ShortcutCreationModalConnected'
+import { showModal } from 'react-cozy-helpers'
-const CreateShortcutWrapper = () => {
- const [isModalDisplayed, setIsModalDisplayed] = useState(false)
+const CreateShortcutWrapper = ({ openModal }) => {
const { t } = useI18n()
- if (!isModalDisplayed) {
- return (
- {
- setIsModalDisplayed(true)
- })}
- >
- {t('toolbar.menu_create_shortcut')}
-
- )
- } else {
- return (
- setIsModalDisplayed(false))}
- />
- )
- }
+
+ return (
+ }
+ onClick={openModal}
+ >
+ {t('toolbar.menu_create_shortcut')}
+
+ )
}
-export default CreateShortcutWrapper
+const mapDispatchToProps = (dispatch, ownProps) => ({
+ openModal: () =>
+ dispatch(
+ showModal()
+ )
+})
+
+export default connect(
+ null,
+ mapDispatchToProps
+)(CreateShortcutWrapper)
diff --git a/src/drive/web/modules/drive/Toolbar/components/DownloadButtonItem.jsx b/src/drive/web/modules/drive/Toolbar/components/DownloadButtonItem.jsx
index df761a2e0c..dde68e817a 100644
--- a/src/drive/web/modules/drive/Toolbar/components/DownloadButtonItem.jsx
+++ b/src/drive/web/modules/drive/Toolbar/components/DownloadButtonItem.jsx
@@ -1,20 +1,21 @@
import React from 'react'
import { connect } from 'react-redux'
-import styles from 'drive/styles/toolbar.styl'
-import { translate } from 'cozy-ui/transpiled/react'
+import { translate } from 'cozy-ui/transpiled/react/I18n'
+import { ActionMenuItem } from 'cozy-ui/transpiled/react/ActionMenu'
+import Icon from 'cozy-ui/transpiled/react/Icon'
import { downloadFiles } from 'drive/web/modules/navigation/duck'
import toolbarContainer from '../toolbar'
const DownloadButtonItem = translate()(
({ t, displayedFolder, downloadAll }) => {
return (
- }
onClick={() => downloadAll([displayedFolder])}
>
{t('toolbar.menu_download_folder')}
-
+
)
}
)
diff --git a/src/drive/web/modules/drive/Toolbar/components/MoreMenu.jsx b/src/drive/web/modules/drive/Toolbar/components/MoreMenu.jsx
new file mode 100644
index 0000000000..7d67283104
--- /dev/null
+++ b/src/drive/web/modules/drive/Toolbar/components/MoreMenu.jsx
@@ -0,0 +1,76 @@
+import React, { useState, useCallback } from 'react'
+
+import { MoreButton } from 'components/Button'
+import { isMobileApp } from 'cozy-device-helper'
+import ActionMenu from 'cozy-ui/transpiled/react/ActionMenu'
+import withBreakpoints from 'cozy-ui/transpiled/react/helpers/withBreakpoints'
+
+import NotRootFolder from 'drive/web/modules/drive/Toolbar/components/NotRootFolder'
+
+import UploadItem from './UploadItem'
+import DeleteItem from '../delete/DeleteItem'
+import SelectableItem from '../selectable/SelectableItem'
+import AddFolderItem from './AddFolderItem'
+import CreateNoteItem from './CreateNoteItem'
+import CreateShortcut from './CreateShortcut'
+import DownloadButtonItem from './DownloadButtonItem'
+import ShareItem from '../share/ShareItem'
+import ScanWrapper from './ScanWrapper'
+
+const MoreMenu = ({
+ isDisabled,
+ canCreateFolder,
+ canUpload,
+ hasWriteAccess,
+ breakpoints: { isMobile }
+}) => {
+ const [menuIsVisible, setMenuVisible] = useState(false)
+ const anchorRef = React.createRef()
+
+ const openMenu = useCallback(() => setMenuVisible(true))
+ const closeMenu = useCallback(() => setMenuVisible(false))
+
+ return (
+
+
+
+
+ {menuIsVisible && (
+
+ {canCreateFolder && hasWriteAccess && }
+ {hasWriteAccess && }
+ {hasWriteAccess && }
+ {canUpload && hasWriteAccess && }
+ {isMobileApp() &&
+ canUpload &&
+ hasWriteAccess && (
+
+ )}
+ {hasWriteAccess &&
}
+ {isMobile && (
+
+
+
+ )}
+
+
+
+
+ {hasWriteAccess && (
+
+
+
+
+ )}
+
+ )}
+
e.stopPropagation()}>
+
{
+ const date = new Date()
+ //We had to replace : by - since the Cordova File plugin doesn't support : in the filename
+ //https://github.com/apache/cordova-plugin-file/issues/289#issuecomment-477954331
+ return `Scan_${date.toISOString().replace(/:/g, '-')}.jpg`
+ }}
+ onConflict={'rename'}
+ //We need to cancel the MediaBackup before doing the upload since the scanned file will be
+ //inserted we don't know where in the queue resulting in a non uploaded file if the queue is
+ //big enough
+ onBeforeUpload={() => stopMediaBackup()}
+ onFinish={() => {
+ const tracker = getTracker()
+ if (tracker) {
+ tracker.push(['trackEvent', 'Drive', 'Scanner', 'Finished'])
+ }
+ startMediaBackup()
+ }}
+ >
+ {({ status, error, startScanner, filename, onClear, online }) => {
+ if (error || !filename) {
+ return (
+
+ )
+ }
return (
-
+ <>
+
+
+
)
- }
- return (
- <>
-
-
-
- )
- }}
-
+ }}
+
+
-
-
-
- )}
- {hasWriteAccess && (
- -
-
-
- )}
- {hasWriteAccess && (
- -
-
-
- )}
- {canUpload &&
- hasWriteAccess && (
- -
-
-
- )}
- {isMobileApp() &&
- canUpload &&
- hasWriteAccess && (
- -
-
-
- )}
- {hasWriteAccess &&
}
-
- -
-
-
-
-
- -
-
-
-
- -
-
-
- {t('toolbar.menu_select')}
-
-
-
- {hasWriteAccess && (
-
-
- -
-
-
-
- )}
-
- )
-
return (
{!isShared &&
canUpload &&
- hasWriteAccess && }
+ hasWriteAccess && }
@@ -145,12 +67,22 @@ class Toolbar extends Component {
lang={lang}
>
- {MoreMenu}
+
) : (
- MoreMenu
+
)}
)
diff --git a/src/drive/web/modules/drive/Toolbar/selectable/SelectableItem.jsx b/src/drive/web/modules/drive/Toolbar/selectable/SelectableItem.jsx
index 284ba10b2e..6c7109cd91 100644
--- a/src/drive/web/modules/drive/Toolbar/selectable/SelectableItem.jsx
+++ b/src/drive/web/modules/drive/Toolbar/selectable/SelectableItem.jsx
@@ -1,7 +1,16 @@
import React from 'react'
+import { translate } from 'cozy-ui/transpiled/react/I18n'
+import { ActionMenuItem } from 'cozy-ui/transpiled/react/ActionMenu'
+import Icon from 'cozy-ui/transpiled/react/Icon'
import selectableContainer from './selectable'
-const SelectableItem = props => {
- return React.cloneElement(props.children, { onClick: props.showSelectionBar })
-}
-export default selectableContainer(SelectableItem)
+const SelectableItem = ({ t, showSelectionBar }) => (
+ }
+ onClick={showSelectionBar}
+ >
+ {t('toolbar.menu_select')}
+
+)
+
+export default selectableContainer(translate()(SelectableItem))
diff --git a/src/drive/web/modules/drive/Toolbar/share/ShareItem.jsx b/src/drive/web/modules/drive/Toolbar/share/ShareItem.jsx
index c84caeeb47..f931e42f9e 100644
--- a/src/drive/web/modules/drive/Toolbar/share/ShareItem.jsx
+++ b/src/drive/web/modules/drive/Toolbar/share/ShareItem.jsx
@@ -1,6 +1,8 @@
import React from 'react'
import { RecipientsAvatars } from 'cozy-sharing/dist/components/Recipient'
-import { translate } from 'cozy-ui/transpiled/react'
+import { translate } from 'cozy-ui/transpiled/react/I18n'
+import { ActionMenuItem } from 'cozy-ui/transpiled/react/ActionMenu'
+import Icon from 'cozy-ui/transpiled/react/Icon'
import styles from 'drive/styles/toolbar.styl'
import { SharedDocument } from 'cozy-sharing'
import shareContainer from './share'
@@ -9,22 +11,26 @@ const ShareItem = translate()(({ t, share, displayedFolder }) => {
return (
{({ isSharedWithMe, recipients, link }) => (
- share(displayedFolder)}
+ left={}
+ right={
+
+
+
+ }
>
{t(
isSharedWithMe
? 'Files.share.sharedWithMe'
: 'toolbar.menu_share_folder'
)}
-
-
+
)}
)
diff --git a/src/drive/web/modules/navigation/duck/actions.jsx b/src/drive/web/modules/navigation/duck/actions.jsx
index 96371c10eb..840ce38d0f 100644
--- a/src/drive/web/modules/navigation/duck/actions.jsx
+++ b/src/drive/web/modules/navigation/duck/actions.jsx
@@ -234,15 +234,21 @@ export const getFileDownloadUrl = async id => {
* @param {Array} files - The list of File objects to upload
* @param {string} dirId - The id of the directory in which we upload the files
* @param {Object} sharingState - The sharing context (provided by SharingContext.Provider)
+ * @param {function} fileUploadedCallback - Optional function to call when the upload is completed
* @returns {function} - A function that dispatches addToUploadQueue action
*/
-export const uploadFiles = (files, dirId, sharingState) => dispatch => {
+export const uploadFiles = (
+ files,
+ dirId,
+ sharingState,
+ fileUploadedCallback = () => null
+) => dispatch => {
dispatch(
addToUploadQueue(
files,
dirId,
sharingState, // used to know if files are shared for conflicts management
- () => null,
+ fileUploadedCallback,
(loaded, quotas, conflicts, networkErrors, errors, updated) =>
dispatch(
uploadQueueProcessed(
diff --git a/src/drive/web/modules/public/Actions.jsx b/src/drive/web/modules/public/Actions.jsx
new file mode 100644
index 0000000000..cd06cbe7ab
--- /dev/null
+++ b/src/drive/web/modules/public/Actions.jsx
@@ -0,0 +1,63 @@
+import React from 'react'
+import { showModal } from 'react-cozy-helpers'
+import { downloadFiles, trashFiles } from 'drive/web/modules/navigation/duck'
+import DeleteConfirm from 'drive/web/modules/drive/DeleteConfirm'
+import {
+ isRenaming,
+ getRenamingFile,
+ startRenamingAsync
+} from 'drive/web/modules/drive/rename'
+import { isFile, isReferencedByAlbum } from 'drive/web/modules/drive/files'
+
+const isAnyFileReferencedByAlbum = files => {
+ for (let i = 0, l = files.length; i < l; ++i) {
+ if (isReferencedByAlbum(files[i])) return true
+ }
+ return false
+}
+
+export const mapStateToProps = state => ({
+ isRenaming: isRenaming(state),
+ renamingFile: getRenamingFile(state)
+})
+
+export const mapDispatchToProps = (dispatch, ownProps) => {
+ const { onFileDelete, hasWriteAccess } = ownProps
+ return {
+ actions: Object.assign({}, ownProps.actions, {
+ download: {
+ action: files => dispatch(downloadFiles(files))
+ },
+ trash: {
+ action: files =>
+ dispatch(
+ showModal(
+ {
+ await dispatch(trashFiles(files))
+ onFileDelete()
+ }}
+ />
+ )
+ ),
+ displayCondition: () => hasWriteAccess
+ },
+ rename: {
+ action: selected => dispatch(startRenamingAsync(selected[0])),
+ displayCondition: selections =>
+ selections.length === 1 && hasWriteAccess
+ },
+ history: {
+ action: selected => {
+ return ownProps.router.push(
+ `${ownProps.location.pathname}/file/${selected[0].id}/revision`
+ )
+ },
+ displayCondition: selections =>
+ selections.length === 1 && isFile(selections[0]) && hasWriteAccess
+ }
+ })
+ }
+}
diff --git a/src/drive/web/modules/public/LightFileList.jsx b/src/drive/web/modules/public/LightFileList.jsx
new file mode 100644
index 0000000000..54c3d05ed4
--- /dev/null
+++ b/src/drive/web/modules/public/LightFileList.jsx
@@ -0,0 +1,29 @@
+import React from 'react'
+import { connect } from 'react-redux'
+
+import FileList from 'drive/web/modules/filelist/FileList'
+import SelectionBar from 'drive/web/modules/selection/SelectionBar'
+import { mapStateToProps, mapDispatchToProps } from './Actions'
+
+const LightFileList = ({
+ actions,
+ onFileOpen,
+ onFolderOpen,
+ fileListProps
+}) => (
+ <>
+
+
+
+)
+
+export default connect(
+ mapStateToProps,
+ mapDispatchToProps
+)(LightFileList)
diff --git a/src/drive/web/modules/public/LightFolderView.jsx b/src/drive/web/modules/public/LightFolderView.jsx
index 8bf8ef5b2c..f63b58c0ce 100644
--- a/src/drive/web/modules/public/LightFolderView.jsx
+++ b/src/drive/web/modules/public/LightFolderView.jsx
@@ -5,13 +5,14 @@ import { withRouter } from 'react-router'
import { Content, Overlay } from 'cozy-ui/transpiled/react'
import Alerter from 'cozy-ui/transpiled/react/Alerter'
import { models, withClient } from 'cozy-client'
+import { ModalManager } from 'react-cozy-helpers'
-import FileList from 'drive/web/modules/filelist/FileList'
import Main from 'drive/web/modules/layout/Main'
import Topbar from 'drive/web/modules/layout/Topbar'
import Breadcrumb from 'drive/web/modules/navigation/Breadcrumb'
import ErrorShare from 'components/Error/ErrorShare'
import PublicToolbar from './PublicToolbar'
+import LightFileList from './LightFileList'
import {
openFolder,
@@ -30,7 +31,8 @@ class DumbFolderView extends React.Component {
state = {
revoked: false,
viewerOpened: false,
- currentViewedIndex: null
+ currentViewedIndex: null,
+ hasWriteAccess: false
}
handleFileOpen = async file => {
const isNote = models.file.isNote(file)
@@ -72,6 +74,11 @@ class DumbFolderView extends React.Component {
}))
componentWillMount() {
+ this.loadCurrentFolder()
+ this.loadPermissions()
+ }
+
+ loadCurrentFolder = () => {
this.props
.fetchFolder(getFolderIdFromRoute(this.props.location, this.props.params))
.then(e => {
@@ -81,6 +88,15 @@ class DumbFolderView extends React.Component {
})
}
+ loadPermissions = async () => {
+ const { client } = this.props
+
+ const permissions = await models.permission.fetchOwn(client)
+ this.setState({
+ hasWriteAccess: !models.permission.isReadOnly(permissions[0])
+ })
+ }
+
navigateToFolder = async folderId => {
await this.props.fetchFolder(folderId)
this.props.router.push(getFolderUrl(folderId, this.props.location))
@@ -90,21 +106,29 @@ class DumbFolderView extends React.Component {
if (this.state.revoked) {
return
}
- const { viewerOpened, currentViewedIndex } = this.state
+ const { viewerOpened, currentViewedIndex, hasWriteAccess } = this.state
+ const { children, ...fileListProps } = this.props
return (
-
+
-
+
{viewerOpened && (
)}
+ {children}
+
)
}
diff --git a/src/drive/web/modules/public/PublicToolbar.jsx b/src/drive/web/modules/public/PublicToolbar.jsx
index 2d84f9ff92..72e8e9ae62 100644
--- a/src/drive/web/modules/public/PublicToolbar.jsx
+++ b/src/drive/web/modules/public/PublicToolbar.jsx
@@ -1,17 +1,12 @@
/* global cozy */
-import React from 'react'
+import React, { useState, useCallback } from 'react'
import { connect } from 'react-redux'
-import classnames from 'classnames'
import PropTypes from 'prop-types'
import logger from 'lib/logger'
import { withClient, useClient } from 'cozy-client'
-import {
- withBreakpoints,
- Menu,
- MenuItem,
- Icon,
- useI18n
-} from 'cozy-ui/transpiled/react'
+import withBreakpoints from 'cozy-ui/transpiled/react/helpers/withBreakpoints'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import BarContextProvider from 'cozy-ui/transpiled/react/BarContextProvider'
import { MoreButton } from 'components/Button'
@@ -25,6 +20,13 @@ import OpenInCozyButton from './OpenInCozyButton'
import DownloadIcon from 'drive/assets/icons/icon-download-16.svg'
+import ActionMenu, { ActionMenuItem } from 'cozy-ui/transpiled/react/ActionMenu'
+import SelectableItem from 'drive/web/modules/drive/Toolbar/selectable/SelectableItem'
+import AddFolderItem from 'drive/web/modules/drive/Toolbar/components/AddFolderItem'
+import UploadItem from 'drive/web/modules/drive/Toolbar/components/UploadItem'
+import CreateNoteItem from 'drive/web/modules/drive/Toolbar/components/CreateNoteItem'
+import CreateShortcut from 'drive/web/modules/drive/Toolbar/components/CreateShortcut'
+
const { BarRight } = cozy.bar
const DownloadFilesButton = ({ t, onDownload, size, isFile }) => (
@@ -48,33 +50,74 @@ DownloadFilesButton.propTypes = {
size: PropTypes.oneOf(['tiny', 'small', 'large'])
}
-const MoreMenu = ({ t, onDownload, onOpenInCozy, onCreateCozy, isFile }) => (
- }
- position="right"
- >
- {onOpenInCozy && (
- }>
- {t('toolbar.menu_open_cozy')}
-
- )}
- {onCreateCozy && (
- }>
- {t('Share.create-cozy')}
-
- )}
- }>
- {isFile
- ? t('toolbar.menu_download_file')
- : t('toolbar.menu_download_folder')}
-
-
+const MoreMenu = withBreakpoints()(
+ ({
+ t,
+ onDownload,
+ onOpenInCozy,
+ onCreateCozy,
+ isFile,
+ hasWriteAccess,
+ refreshFolderContent,
+ breakpoints: { isMobile }
+ }) => {
+ const anchorRef = React.createRef()
+ const [menuIsVisible, setMenuVisible] = useState(false)
+
+ const openMenu = useCallback(() => setMenuVisible(true))
+ const closeMenu = useCallback(() => setMenuVisible(false))
+
+ return (
+
+
+
+
+
+ {menuIsVisible && (
+
+ {onOpenInCozy &&
+ isMobile && (
+ }
+ >
+ {t('toolbar.menu_open_cozy')}
+
+ )}
+ {onCreateCozy &&
+ isMobile && (
+ }
+ >
+ {t('Share.create-cozy')}
+
+ )}
+ }
+ >
+ {isFile
+ ? t('toolbar.menu_download_file')
+ : t('toolbar.menu_download_folder')}
+
+ {hasWriteAccess && }
+ {hasWriteAccess && }
+ {hasWriteAccess && (
+
+ )}
+ {hasWriteAccess && }
+
+
+ )}
+
(
) : (
)}
-
+
openExternalLink(discoveryLink) : false
+ }
+ onCreateCozy={
+ discoveryLink
+ ? false
+ : () => openExternalLink(getHomeLinkHref('sharing-drive'))
+ }
+ />
@@ -214,7 +281,9 @@ class PublicToolbar extends React.Component {
const {
breakpoints: { isMobile },
renderInBar = false,
- isFile
+ isFile,
+ hasWriteAccess,
+ refreshFolderContent
} = this.props
const { discoveryLink } = this.state
@@ -224,6 +293,8 @@ class PublicToolbar extends React.Component {
onDownload={this.downloadFiles}
discoveryLink={discoveryLink}
isFile={isFile}
+ hasWriteAccess={hasWriteAccess}
+ refreshFolderContent={refreshFolderContent}
/>
)
} else if (renderInBar) {
@@ -240,6 +311,8 @@ class PublicToolbar extends React.Component {
onDownload={this.downloadFiles}
discoveryLink={discoveryLink}
isFile={isFile}
+ hasWriteAccess={hasWriteAccess}
+ refreshFolderContent={refreshFolderContent}
/>
)
}
@@ -249,7 +322,9 @@ PublicToolbar.propTypes = {
isFile: PropTypes.bool.isRequired,
renderInBar: PropTypes.bool,
breakpoints: PropTypes.object.isRequired,
- files: PropTypes.array.isRequired
+ files: PropTypes.array.isRequired,
+ hasWriteAccess: PropTypes.bool,
+ refreshFolderContent: PropTypes.func.isRequired
}
const mapDispatchToProps = dispatch => ({
onDownload: files => dispatch(downloadFiles(files))
diff --git a/src/drive/web/modules/trash/Toolbar.jsx b/src/drive/web/modules/trash/Toolbar.jsx
index 8da2fb6607..d1f0b906d1 100644
--- a/src/drive/web/modules/trash/Toolbar.jsx
+++ b/src/drive/web/modules/trash/Toolbar.jsx
@@ -1,14 +1,17 @@
/* global cozy */
-import React from 'react'
+import React, { useState, useCallback } from 'react'
+import { compose } from 'redux'
import { connect } from 'react-redux'
+import { useClient } from 'cozy-client'
import { translate } from 'cozy-ui/transpiled/react/I18n'
-import { Button, withBreakpoints } from 'cozy-ui/transpiled/react'
+import withBreakpoints from 'cozy-ui/transpiled/react/helpers/withBreakpoints'
+import Button from 'cozy-ui/transpiled/react/Button'
+import ActionMenu, { ActionMenuItem } from 'cozy-ui/transpiled/react/ActionMenu'
+import Icon from 'cozy-ui/transpiled/react/Icon'
import BarContextProvider from 'cozy-ui/transpiled/react/BarContextProvider'
-import { useClient } from 'cozy-client'
import { showModal } from 'react-cozy-helpers'
import { MoreButton } from 'components/Button'
-import Menu, { Item } from 'components/Menu'
import EmptyTrashConfirm from './components/EmptyTrashConfirm'
import { emptyTrash } from './actions'
@@ -27,25 +30,40 @@ const Toolbar = ({
}) => {
const client = useClient()
const { BarRight } = cozy.bar
+ const [menuIsVisible, setMenuVisible] = useState(false)
+ const anchorRef = React.createRef()
+ const openMenu = useCallback(() => setMenuVisible(true))
+ const closeMenu = useCallback(() => setMenuVisible(false))
+
const MoreMenu = (
- }
- >
- -
- emptyTrash()}>
- {t('toolbar.empty_trash')}
-
-
-
-
-
- {t('toolbar.menu_select')}
-
-
-
+
+
+
+
+ {menuIsVisible && (
+
+ {isMobile && (
+ <>
+ emptyTrash()}
+ left={}
+ >
+
+ {t('toolbar.empty_trash')}
+
+
+
+
+ )}
+
+
+ )}
+