diff --git a/public/version_latest.txt b/public/version_latest.txt index 32f3eaad0d92..acf69b48b843 100644 --- a/public/version_latest.txt +++ b/public/version_latest.txt @@ -1 +1 @@ -5.0.1 \ No newline at end of file +5.1.0 \ No newline at end of file diff --git a/src/data/vendorTenantList.json b/src/data/vendorTenantList.json index de12e3508819..314e92081780 100644 --- a/src/data/vendorTenantList.json +++ b/src/data/vendorTenantList.json @@ -11,10 +11,6 @@ "vendorName": "Datto Backupify", "vendorTenantId": "8ebde5a4-a587-497c-9881-8a5c272dd1c4" }, - { - "vendorName": "Eshgro Smarter365", - "vendorTenantId": "0a3132f8-cbcd-430f-a554-b0490bea8018" - }, { "vendorName": "BitTitan", "vendorTenantId": "6690473e-14f0-4f77-bf88-2ae5ade8746c" @@ -47,14 +43,6 @@ "vendorName": "CloudMore AB", "vendorTenantId": "0cc4f6a9-d96a-4508-b938-32386e1c44cf" }, - { - "vendorName": "Google Workspace", - "vendorTenantId": "0f8cb250-b44f-4acd-b24e-2524ef9f85ac" - }, - { - "vendorName": "Merill", - "vendorTenantId": "10407d69-1ba5-4bec-8ebe-9af2f0b9e06a" - }, { "vendorName": "Citrix Cloud", "vendorTenantId": "13d925d3-c1fe-4447-9600-bb8572753a33" @@ -191,10 +179,6 @@ "vendorName": "SuperVision (KPN)", "vendorTenantId": "8edc1ef5-a81d-4229-badb-e2634a284461" }, - { - "vendorName": "MSPMagic", - "vendorTenantId": "74d3d0de-bbd7-433f-95c2-40cc5d185968" - }, { "vendorName": "SimeonCloud", "vendorTenantId": "3d945cb7-f7da-444c-8c9e-93c3226581ec" diff --git a/src/views/teams-share/onedrive/OneDriveList.jsx b/src/views/teams-share/onedrive/OneDriveList.jsx index d63e3a468177..b4114ab96c06 100644 --- a/src/views/teams-share/onedrive/OneDriveList.jsx +++ b/src/views/teams-share/onedrive/OneDriveList.jsx @@ -1,10 +1,77 @@ -import { CLink } from '@coreui/react' -import React from 'react' +import { CButton, CLink } from '@coreui/react' +import { faEllipsisV } from '@fortawesome/free-solid-svg-icons' +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' +import React, { useState } from 'react' import { useSelector } from 'react-redux' import { CippPageList } from 'src/components/layout' import { CellTip } from 'src/components/tables' +import { CippActionsOffcanvas } from 'src/components/utilities' const OneDriveList = () => { + const Offcanvas = (row, rowIndex, formatExtraData) => { + const tenant = useSelector((state) => state.app.currentTenant) + const [ocVisible, setOCVisible] = useState(false) + + //console.log(row) + return ( + <> + setOCVisible(true)}> + + + setOCVisible(false)} + /> + + ) + } const tenant = useSelector((state) => state.app.currentTenant) const columns = [ { @@ -58,6 +125,10 @@ const OneDriveList = () => { ) }, }, + { + name: 'Actions', + cell: Offcanvas, + }, ] return ( row['URL'], - sortable: true, - cell: (row) => CellTip(row['URL']), - exportSelector: 'URL', - }, - { - name: 'Owner', - selector: (row) => row['displayName'], - sortable: true, - cell: (row) => CellTip(row['displayName']), - exportSelector: 'displayName', - maxWidth: '300px', - }, - { - name: 'Last Active', - selector: (row) => row['LastActive'], - sortable: true, - exportSelector: 'LastActive', - maxWidth: '120px', - }, - { - name: 'File Count (Total)', - selector: (row) => row['FileCount'], - sortable: true, - exportSelector: 'FileCount', - maxWidth: '120px', - }, - { - name: 'Used (GB)', - selector: (row) => row['UsedGB'], - sortable: true, - exportSelector: 'UsedGB', - maxWidth: '120px', - }, - { - name: 'Allocated (GB)', - selector: (row) => row['Allocated'], - sortable: true, - exportSelector: 'Allocated', - maxWidth: '70px', - }, - { - name: 'Root Template', - selector: (row) => row['Template'], - sortable: true, - cell: (row) => CellTip(row['Template']), - exportSelector: 'Template', - maxWidth: '200px', - }, -] +import { CippActionsOffcanvas } from 'src/components/utilities' const SharepointList = () => { const tenant = useSelector((state) => state.app.currentTenant) + const Offcanvas = (row, rowIndex, formatExtraData) => { + const tenant = useSelector((state) => state.app.currentTenant) + const [ocVisible, setOCVisible] = useState(false) + //console.log(row) + return ( + <> + setOCVisible(true)}> + + + setOCVisible(false)} + /> + + ) + } + const columns = [ + { + name: 'URL', + selector: (row) => row['URL'], + sortable: true, + cell: (row) => CellTip(row['URL']), + exportSelector: 'URL', + }, + { + name: 'Owner', + selector: (row) => row['displayName'], + sortable: true, + cell: (row) => CellTip(row['displayName']), + exportSelector: 'displayName', + maxWidth: '300px', + }, + { + name: 'Last Active', + selector: (row) => row['LastActive'], + sortable: true, + exportSelector: 'LastActive', + maxWidth: '120px', + }, + { + name: 'File Count (Total)', + selector: (row) => row['FileCount'], + sortable: true, + exportSelector: 'FileCount', + maxWidth: '120px', + }, + { + name: 'Used (GB)', + selector: (row) => row['UsedGB'], + sortable: true, + exportSelector: 'UsedGB', + maxWidth: '120px', + }, + { + name: 'Allocated (GB)', + selector: (row) => row['Allocated'], + sortable: true, + exportSelector: 'Allocated', + maxWidth: '70px', + }, + { + name: 'Root Template', + selector: (row) => row['Template'], + sortable: true, + cell: (row) => CellTip(row['Template']), + exportSelector: 'Template', + maxWidth: '200px', + }, + { + name: 'Actions', + cell: Offcanvas, + }, + ] return (