cozy-sharing 33.6.0 → 34.0.0

package/src/components/ShareRestrictionModal/BoxDate.jsx

@@ -1,11 +1,10 @@
+import { Icon, Calendar } from '@linagora/twake-icons'
 import { format } from 'date-fns'
 import PropTypes from 'prop-types'
 import React from 'react'
 
 import Box from 'cozy-ui/transpiled/react/Box'
 import DatePicker from 'cozy-ui/transpiled/react/DatePicker'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import CalendarIcon from 'cozy-ui/transpiled/react/Icons/Calendar'
 import List from 'cozy-ui/transpiled/react/List'
 import ListItem from 'cozy-ui/transpiled/react/ListItem'
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon'
@@ -33,7 +32,7 @@ export const BoxDate = ({ onChange, date, toggle, onToggle }) => {
           onClick={() => handleDateToggle(!toggle)}
         >
           <ListItemIcon>
-            <Icon icon={CalendarIcon} />
+            <Icon icon={Calendar} />
           </ListItemIcon>
           <ListItemText primary={t('BoxDate.text')} />
           <ListItemSecondaryAction>

package/src/components/ShareRestrictionModal/BoxEditingRights.jsx

@@ -1,3 +1,4 @@
+import { Icon, Bottom, People } from '@linagora/twake-icons'
 import PropTypes from 'prop-types'
 import React, { useReducer, useRef } from 'react'
 
@@ -7,9 +8,6 @@ import flag from 'cozy-flags'
 import ActionsMenu from 'cozy-ui/transpiled/react/ActionsMenu'
 import { makeActions } from 'cozy-ui/transpiled/react/ActionsMenu/Actions'
 import Box from 'cozy-ui/transpiled/react/Box'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import BottomIcon from 'cozy-ui/transpiled/react/Icons/Bottom'
-import PeopleIcon from 'cozy-ui/transpiled/react/Icons/People'
 import List from 'cozy-ui/transpiled/react/List'
 import ListItem from 'cozy-ui/transpiled/react/ListItem'
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon'
@@ -67,11 +65,11 @@ export const BoxEditingRights = ({ file, editingRights, setEditingRights }) => {
               onClick={toggleMenuDisplayed}
             >
               <ListItemIcon>
-                <Icon icon={PeopleIcon} />
+                <Icon icon={People} />
               </ListItemIcon>
               <ListItemText primary={textPrimary} secondary={textSecondary} />
               <ListItemIcon className="u-mr-half">
-                <Icon icon={BottomIcon} />
+                <Icon icon={Bottom} />
               </ListItemIcon>
             </ListItem>
           </List>

package/src/components/ShareRestrictionModal/BoxPassword.jsx

@@ -1,11 +1,9 @@
+import { Icon, Copy, Password } from '@linagora/twake-icons'
 import PropTypes from 'prop-types'
 import React, { useState } from 'react'
 
 import Box from 'cozy-ui/transpiled/react/Box'
-import Icon from 'cozy-ui/transpiled/react/Icon'
 import IconButton from 'cozy-ui/transpiled/react/IconButton'
-import CopyIcon from 'cozy-ui/transpiled/react/Icons/Copy'
-import PasswordIcon from 'cozy-ui/transpiled/react/Icons/Password'
 import List from 'cozy-ui/transpiled/react/List'
 import ListItem from 'cozy-ui/transpiled/react/ListItem'
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon'
@@ -69,7 +67,7 @@ export const BoxPassword = ({
           onClick={() => handlePasswordToggle(!toggle)}
         >
           <ListItemIcon>
-            <Icon icon={PasswordIcon} />
+            <Icon icon={Password} />
           </ListItemIcon>
           <ListItemText primary={t('BoxPassword.text')} />
           <ListItemSecondaryAction>
@@ -106,7 +104,7 @@ export const BoxPassword = ({
             InputProps={{
               endAdornment: (
                 <IconButton onClick={handleCopy}>
-                  <Icon icon={CopyIcon} />
+                  <Icon icon={Copy} />
                 </IconButton>
               )
             }}

package/src/components/ShareRestrictionModal/ShareRestrictionModal.jsx

@@ -1,3 +1,4 @@
+import { Icon, Trash } from '@linagora/twake-icons'
 import { addDays } from 'date-fns'
 import PropTypes from 'prop-types'
 import React, { useState } from 'react'
@@ -6,8 +7,6 @@ import { generateWebLink, useClient } from 'cozy-client'
 import flag from 'cozy-flags'
 import Button from 'cozy-ui/transpiled/react/Buttons'
 import { ConfirmDialog } from 'cozy-ui/transpiled/react/CozyDialogs'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import TrashIcon from 'cozy-ui/transpiled/react/Icons/Trash'
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
 import { useI18n } from 'twake-i18n'
 
@@ -172,7 +171,7 @@ export const ShareRestrictionModal = ({ file, onClose }) => {
               label={t('Share.permissionLink.deactivate')}
               variant="secondary"
               color="error"
-              startIcon={<Icon icon={TrashIcon} />}
+              startIcon={<Icon icon={Trash} />}
               onClick={handleRevokeLink}
               busy={loading}
             />

package/src/components/SharedBadge.jsx

@@ -1,9 +1,7 @@
+import { Icon, Share } from '@linagora/twake-icons'
 import classNames from 'classnames'
 import React from 'react'
 
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import ShareIcon from 'cozy-ui/transpiled/react/Icons/Share'
-
 import styles from '../styles/badge.styl'
 
 const SharedBadge = ({ byMe, className, small, xsmall }) => (
@@ -17,7 +15,7 @@ const SharedBadge = ({ byMe, className, small, xsmall }) => (
     )}
   >
     <Icon
-      icon={ShareIcon}
+      icon={Share}
       color="var(--primaryContrastTextColor)"
       className={styles['shared-badge-icon']}
     />

package/src/components/SharedDrive/SharedDriveHeader.jsx

@@ -1,6 +1,6 @@
+import { Icon } from '@linagora/twake-icons'
 import React from 'react'
 
-import Icon from 'cozy-ui/transpiled/react/Icon'
 import Typography from 'cozy-ui/transpiled/react/Typography'
 
 import SharedDriveIcon from '../../assets/icons/shared-drive.svg'

package/src/helpers/sharings.js

@@ -1,7 +1,6 @@
+import { CloudPlusOutlined, Sync, ToTheCloud } from '@linagora/twake-icons'
+
 import { Q } from 'cozy-client'
-import CloudPlusOutlinedIcon from 'cozy-ui/transpiled/react/Icons/CloudPlusOutlined'
-import SyncIcon from 'cozy-ui/transpiled/react/Icons/Sync'
-import ToTheCloudIcon from 'cozy-ui/transpiled/react/Icons/ToTheCloud'
 
 import { fetchFilesPaths } from './files'
 import {
@@ -78,20 +77,20 @@ export const getIconWithlabel = ({
 }) => {
   if (link === CREATE_COZY_HREF) {
     return {
-      icon: ToTheCloudIcon,
+      icon: ToTheCloud,
       label: t('Share.create-cozy', { smart_count: isShortLabel ? 1 : 2 })
     }
   }
   if (!isSharingShortcutCreated) {
     return {
-      icon: CloudPlusOutlinedIcon,
+      icon: CloudPlusOutlined,
       label: t('Share.banner.add_to_mine', {
         smart_count: isShortLabel ? 1 : 2
       })
     }
   }
   return {
-    icon: SyncIcon,
+    icon: Sync,
     label: t('Share.banner.sync_to_mine', { smart_count: isShortLabel ? 1 : 2 })
   }
 }

package/src/state.js

@@ -184,10 +184,7 @@ const byDocId = (state = {}, action) => {
     case REVOKE_GROUP:
     case REVOKE_RECIPIENT:
     case UPDATE_SHARING:
-      if (
-        !isSharingADrive(action.sharing) &&
-        areAllRecipientsRevoked(action.sharing)
-      ) {
+      if (areAllRecipientsRevoked(action.sharing)) {
         return forgetSharing(state, action.sharing)
       }
       return state
@@ -258,10 +255,7 @@ const sharings = (state = [], action) => {
     case UPDATE_SHARING:
     case REVOKE_GROUP:
     case REVOKE_RECIPIENT:
-      if (
-        !isSharingADrive(action.sharing) &&
-        areAllRecipientsRevoked(action.sharing)
-      ) {
+      if (areAllRecipientsRevoked(action.sharing)) {
         return state.filter(s => s.id !== action.sharing.id)
       }
       return state.map(s => {
@@ -287,10 +281,8 @@ const sharedPaths = (state = [], action) => {
       return newState
     case REVOKE_GROUP:
     case REVOKE_RECIPIENT:
-      if (
-        !isSharingADrive(action.sharing) &&
-        areAllRecipientsRevoked(action.sharing)
-      ) {
+    case UPDATE_SHARING:
+      if (areAllRecipientsRevoked(action.sharing)) {
         return state.filter(p => p !== action.path)
       }
       return state

package/src/state.spec.js

@@ -6,6 +6,7 @@ import reducer, {
   revokeSharingLink,
   getRecipients,
   getRecipientsFromSharing,
+  revokeGroup,
   revokeRecipient,
   revokeSelf,
   updateSharing,
@@ -143,7 +144,7 @@ describe('Sharing state', () => {
     expect(state.sharings).toEqual([SHARING_1, SHARED_DRIVE_WITHOUT_RECIPIENTS])
   })
 
-  it('should not forget shared drives without recipients when updating', () => {
+  it('should forget shared drives without recipients when updating', () => {
     const SHARED_DRIVE_WITHOUT_RECIPIENTS = {
       ...SHARING_1,
       id: 'shared_drive_no_recipients',
@@ -184,16 +185,65 @@ describe('Sharing state', () => {
       }
     }
     const state = reducer(initialState, updateSharing(updatedSharing))
-    expect(state.byDocId).toEqual({
-      shared_drive_folder: {
-        sharings: [SHARED_DRIVE_WITHOUT_RECIPIENTS.id],
-        permissions: []
+
+    expect(state.byDocId).toEqual({})
+    expect(state.sharings).toEqual([])
+  })
+
+  it('should forget a shared drive when revoking its last group', () => {
+    const SHARED_DRIVE_WITH_GROUP = {
+      ...SHARING_1,
+      id: 'shared_drive_group',
+      attributes: {
+        ...SHARING_1.attributes,
+        drive: true,
+        members: [
+          {
+            status: 'owner',
+            name: 'Jane Doe',
+            email: 'jane@doe.com',
+            instance: 'http://cozy.tools:8080'
+          }
+        ],
+        groups: [
+          {
+            name: 'Last group',
+            addedBy: 0
+          }
+        ],
+        rules: [
+          {
+            title: 'My Shared Drive',
+            doctype: 'io.cozy.files',
+            values: ['shared_drive_group_folder'],
+            add: 'sync',
+            update: 'sync',
+            remove: 'sync'
+          }
+        ]
       }
-    })
-    expect(state.sharings).toEqual([updatedSharing])
+    }
+    const sharedDrivePath = '/shared_drive_group_folder'
+    const initialState = reducer(
+      reducer(
+        undefined,
+        receiveSharings({
+          sharings: [SHARED_DRIVE_WITH_GROUP]
+        })
+      ),
+      addSharing(SHARED_DRIVE_WITH_GROUP, sharedDrivePath)
+    )
+    const state = reducer(
+      initialState,
+      revokeGroup(SHARED_DRIVE_WITH_GROUP, 0, sharedDrivePath)
+    )
+
+    expect(state.byDocId).toEqual({})
+    expect(state.sharings).toEqual([])
+    expect(state.sharedPaths).toEqual([])
   })
 
-  it('should not remove shared drive path when revoking last recipient', () => {
+  it('should forget a shared drive when revoking last recipient', () => {
     const SHARED_DRIVE_WITH_ONE_RECIPIENT = {
       ...SHARING_1,
       id: 'shared_drive_one_recipient',
@@ -236,30 +286,14 @@ describe('Sharing state', () => {
       ),
       addSharing(SHARED_DRIVE_WITH_ONE_RECIPIENT, sharedDrivePath)
     )
-    const sharingAfterRevoke = {
-      ...SHARED_DRIVE_WITH_ONE_RECIPIENT,
-      attributes: {
-        ...SHARED_DRIVE_WITH_ONE_RECIPIENT.attributes,
-        members: [
-          SHARED_DRIVE_WITH_ONE_RECIPIENT.attributes.members[0],
-          {
-            ...SHARED_DRIVE_WITH_ONE_RECIPIENT.attributes.members[1],
-            status: 'revoked'
-          }
-        ]
-      }
-    }
     const state = reducer(
       initialState,
-      revokeRecipient(sharingAfterRevoke, 1, sharedDrivePath)
+      revokeRecipient(SHARED_DRIVE_WITH_ONE_RECIPIENT, 1, sharedDrivePath)
     )
-    expect(state.sharedPaths).toContain(sharedDrivePath)
-    expect(state.byDocId).toEqual({
-      shared_drive_folder: {
-        sharings: [SHARED_DRIVE_WITH_ONE_RECIPIENT.id],
-        permissions: []
-      }
-    })
+
+    expect(state.byDocId).toEqual({})
+    expect(state.sharings).toEqual([])
+    expect(state.sharedPaths).toEqual([])
   })
 
   it('should index received permissions', () => {