Merge pull request #178 from mgilangjanuar/staging

hotfix: share toggle
mgilangjanuar · Jan 8, 2022 · 2bfd0b2 · 2bfd0b2
2 parents 7299ede + 1245e40
commit 2bfd0b2
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/web/src/pages/View.tsx b/web/src/pages/View.tsx
@@ -330,16 +330,16 @@ const View: React.FC<PageProps> = ({ match }) => {
                   onClick: () => onRowClick(row)
                 }),
                 render: (_: any, row: any) => {
-                  let type
+                  let type: any
                   if (row.sharing_options?.includes('*')) {
                     type = <GlobalOutlined />
                   } else if (row.sharing_options?.length) {
                     type = <TeamOutlined />
                   }
 
-                  return <>
+                  return <Button type="text" block style={{ textAlign: 'left', padding: 0 }}>
                     {row.link_id ? <BranchesOutlined /> : '' } {type} <Icon type={row.type} /> {row.name}
-                  </>
+                  </Button>
                 }
               },
               {
@@ -396,7 +396,7 @@ const View: React.FC<PageProps> = ({ match }) => {
     </Layout.Content>
     <Footer me={me} />
     <ContextMenu />
-    <Modal title={<><Icon type={showDetails?.type} /> {showDetails?.name}</>}
+    <Modal title={<Typography.Text ellipsis><Icon type={showDetails?.type} /> {showDetails?.name}</Typography.Text>}
       visible={Boolean(showDetails)}
       onCancel={() => setShowDetails(undefined)}
       okText="View"
@@ -405,7 +405,7 @@ const View: React.FC<PageProps> = ({ match }) => {
       okButtonProps={{ shape: 'round' }}>
       <Descriptions column={1}>
         <Descriptions.Item label="Size">{showDetails?.size && prettyBytes(Number(showDetails?.size || 0))}</Descriptions.Item>
-        <Descriptions.Item label="Uploaded At">{moment(showDetails?.uploaded_at).local().format('llll')}</Descriptions.Item>
+        <Descriptions.Item label="Uploaded At">{moment(showDetails?.uploaded_at).local().format('lll')}</Descriptions.Item>
       </Descriptions>
     </Modal>
   </Layout> : <>

diff --git a/web/src/pages/dashboard/components/AddFolder.tsx b/web/src/pages/dashboard/components/AddFolder.tsx
@@ -33,7 +33,6 @@ const AddFolder: React.FC<Props> = ({
       setAddFolder(false)
       setLoadingAddFolder(false)
     } catch (error: any) {
-      console.error(error)
       setLoadingAddFolder(false)
       return notification.error({
         message: 'Error',

diff --git a/web/src/pages/dashboard/components/Messaging.tsx b/web/src/pages/dashboard/components/Messaging.tsx
@@ -152,8 +152,8 @@ const Messaging: React.FC<Props> = ({ me, collapsed, parent, setCollapsed }) =>
             title: user ? user.title || `${user.firstName || ''} ${user.lastName || ''}`.trim() : 'Unknown',
             onTitleClick: () => user?.username ? window.open(`https://t.me/${user?.username}`, '_blank') : undefined,
             titleColor: '#0088CC',
-            text: `${fileTitle.slice(0, 20)}${fileTitle.length > 20 ? '...' : ''}`,
-            message: `${fileTitle.slice(0, 20)}${fileTitle.length > 20 ? '...' : ''}`,
+            text: `${fileTitle.slice(0, 16)}${fileTitle.length > 16 ? '...' : ''}`,
+            message: `${fileTitle.slice(0, 16)}${fileTitle.length > 16 ? '...' : ''}`,
             status: me?.user.tg_id == user?.id ? msg.id <= dialog?.dialog?.readOutboxMaxId ? 'read' : 'received' : undefined,
             date: msg.date * 1000,
             user,

diff --git a/web/src/pages/dashboard/components/Rename.tsx b/web/src/pages/dashboard/components/Rename.tsx
@@ -1,4 +1,4 @@
-import { Modal, Form, Input, notification } from 'antd'
+import { Modal, Form, Input, notification, Typography } from 'antd'
 import { useForm } from 'antd/lib/form/Form'
 import React, { useState, useEffect } from 'react'
 import { req } from '../../../utils/Fetcher'
@@ -51,7 +51,7 @@ const Rename: React.FC<Props> = ({
   return <Modal visible={fileRename}
     onCancel={() => setFileRename(undefined)}
     okText="Add"
-    title={`Rename ${fileRename?.name}`}
+    title={<Typography.Text ellipsis>Rename {fileRename?.name}</Typography.Text>}
     onOk={() => formRename.submit()}
     cancelButtonProps={{ shape: 'round' }}
     okButtonProps={{ loading: loadingRename, shape: 'round' }}>

diff --git a/web/src/pages/dashboard/components/Share.tsx b/web/src/pages/dashboard/components/Share.tsx
@@ -61,10 +61,13 @@ const Share: React.FC<Props> = ({
     setLoadingShare(true)
     const { id, public: isPublic, sharing_options: sharingOpts, username } = formShare.getFieldsValue()
 
-    const sharing = sharingOpts?.length ? [
-      ...new Set([...sharingOpts === undefined ? sharingOptions : sharingOpts, isPublic ? '*' : null]
-        .filter(sh => isPublic ? sh : sh !== '*').filter(Boolean)) as any
+    const sharing = (sharingOpts || sharingOptions)?.length || isPublic ? [
+      ...new Set([
+        ...sharingOpts === undefined ? sharingOptions : sharingOpts,
+        isPublic ? '*' : null
+      ].filter(sh => isPublic ? sh : sh !== '*').filter(Boolean)) as any
     ] : []
+    console.log(isPublic, sharing, sharingOptions, sharingOpts)
     setSharingOptions(sharing)
 
     try {
@@ -111,7 +114,7 @@ const Share: React.FC<Props> = ({
   return <Modal visible={selectShare?.row}
     onCancel={() => setSelectShare(undefined)}
     footer={null}
-    title={`${selectShare?.action === 'share' ? 'Share' : 'Send'} ${selectShare?.row.name}`}>
+    title={<Typography.Text ellipsis>{selectShare?.action === 'share' ? 'Share' : 'Send'} {selectShare?.row.name}</Typography.Text>}>
     <Form form={formShare} layout="horizontal" onFinish={share}>
       <Form.Item name="id" hidden>
         <Input />

diff --git a/web/src/pages/dashboard/components/TableFiles.tsx b/web/src/pages/dashboard/components/TableFiles.tsx
@@ -15,7 +15,7 @@ import {
   TeamOutlined,
   VideoCameraOutlined
 } from '@ant-design/icons'
-import { Descriptions, Menu, Modal, Table } from 'antd'
+import { Descriptions, Menu, Modal, Table, Typography } from 'antd'
 import { SorterResult } from 'antd/lib/table/interface'
 import moment from 'moment'
 import prettyBytes from 'pretty-bytes'
@@ -326,7 +326,7 @@ const TableFiles: React.FC<Props> = ({
         } : undefined} />
     </DndProvider>
     <ContextMenu />
-    <Modal title={<><Icon type={showDetails?.type} /> {showDetails?.name}</>}
+    <Modal title={<Typography.Text ellipsis><Icon type={showDetails?.type} /> {showDetails?.name}</Typography.Text>}
       visible={Boolean(showDetails)}
       onCancel={() => setShowDetails(undefined)}
       okText="View"
@@ -335,7 +335,7 @@ const TableFiles: React.FC<Props> = ({
       okButtonProps={{ shape: 'round' }}>
       <Descriptions column={1}>
         <Descriptions.Item label="Size">{showDetails?.size && prettyBytes(Number(showDetails?.size || 0))}</Descriptions.Item>
-        <Descriptions.Item label="Uploaded At">{moment(showDetails?.uploaded_at).local().format('llll')}</Descriptions.Item>
+        <Descriptions.Item label="Uploaded At">{moment(showDetails?.uploaded_at).local().format('lll')}</Descriptions.Item>
         <Descriptions.Item label="Uploaded By">
           <a href={`https://t.me/${user?.user.username}`} target="_blank">@{user?.user.username}</a>
         </Descriptions.Item>