Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
d23cb5a1
Commit
d23cb5a1
authored
Dec 26, 2020
by
ioedeveloper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added toaster messages
parent
8f2ea70e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
59 deletions
+41
-59
tab-proxy.js
apps/remix-ide/src/app/panels/tab-proxy.js
+1
-1
file-explorer.tsx
libs/remix-ui/file-explorer/src/lib/file-explorer.tsx
+31
-57
toaster.tsx
libs/remix-ui/toaster/src/lib/toaster.tsx
+9
-1
No files found.
apps/remix-ide/src/app/panels/tab-proxy.js
View file @
d23cb5a1
...
@@ -194,7 +194,7 @@ export class TabProxy extends Plugin {
...
@@ -194,7 +194,7 @@ export class TabProxy extends Plugin {
}
}
this
.
_view
.
filetabs
.
addTab
({
this
.
_view
.
filetabs
.
addTab
({
id
:
name
,
id
:
name
.
split
(
' '
).
join
(
''
)
,
title
,
title
,
icon
,
icon
,
tooltip
:
name
tooltip
:
name
...
...
libs/remix-ui/file-explorer/src/lib/file-explorer.tsx
View file @
d23cb5a1
import
React
,
{
useEffect
,
useState
,
useRef
}
from
'react'
// eslint-disable-line
import
React
,
{
useEffect
,
useState
,
useRef
}
from
'react'
// eslint-disable-line
import
{
TreeView
,
TreeViewItem
}
from
'@remix-ui/tree-view'
// eslint-disable-line
import
{
DragDropContext
,
Droppable
,
Draggable
}
from
'react-beautiful-dnd'
// eslint-disable-line
import
{
DragDropContext
,
Droppable
,
Draggable
}
from
'react-beautiful-dnd'
// eslint-disable-line
import
{
TreeView
,
TreeViewItem
}
from
'@remix-ui/tree-view'
// eslint-disable-line
import
{
ModalDialog
}
from
'@remix-ui/modal-dialog'
// eslint-disable-line
import
{
Toaster
}
from
'@remix-ui/toaster'
// eslint-disable-line
import
{
FileExplorerMenu
}
from
'./file-explorer-menu'
// eslint-disable-line
import
{
FileExplorerMenu
}
from
'./file-explorer-menu'
// eslint-disable-line
import
{
FileExplorerContextMenu
}
from
'./file-explorer-context-menu'
// eslint-disable-line
import
{
FileExplorerContextMenu
}
from
'./file-explorer-context-menu'
// eslint-disable-line
import
{
ModalDialog
}
from
'@remix-ui/modal-dialog'
// eslint-disable-line
import
{
FileExplorerProps
,
File
}
from
'./types'
import
{
FileExplorerProps
,
File
}
from
'./types'
import
*
as
helper
from
'../../../../../apps/remix-ide/src/lib/helper'
import
*
as
helper
from
'../../../../../apps/remix-ide/src/lib/helper'
...
@@ -49,7 +50,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
...
@@ -49,7 +50,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
fn
:
null
fn
:
null
},
},
handleHide
:
null
handleHide
:
null
}
},
toasterMsg
:
''
})
})
const
editRef
=
useRef
(
null
)
const
editRef
=
useRef
(
null
)
...
@@ -83,6 +85,10 @@ export const FileExplorer = (props: FileExplorerProps) => {
...
@@ -83,6 +85,10 @@ export const FileExplorer = (props: FileExplorerProps) => {
setState
(
prevState
=>
{
setState
(
prevState
=>
{
return
{
...
prevState
,
fileManager
,
accessToken
,
files
,
actions
}
return
{
...
prevState
,
fileManager
,
accessToken
,
files
,
actions
}
})
})
if
(
props
.
filesProvider
)
{
props
.
filesProvider
.
event
.
register
(
'fileAdded'
,
fileAdded
)
}
})()
})()
},
[])
},
[])
...
@@ -166,7 +172,7 @@ export const FileExplorer = (props: FileExplorerProps) => {
...
@@ -166,7 +172,7 @@ export const FileExplorer = (props: FileExplorerProps) => {
}
}
}
}
const
createNewFile
=
(
parentFolder
:
string
,
newFilePath
:
string
)
=>
{
const
createNewFile
=
(
newFilePath
:
string
)
=>
{
const
fileManager
=
state
.
fileManager
const
fileManager
=
state
.
fileManager
helper
.
createNonClashingName
(
newFilePath
,
filesProvider
,
async
(
error
,
newName
)
=>
{
helper
.
createNonClashingName
(
newFilePath
,
filesProvider
,
async
(
error
,
newName
)
=>
{
...
@@ -179,20 +185,17 @@ export const FileExplorer = (props: FileExplorerProps) => {
...
@@ -179,20 +185,17 @@ export const FileExplorer = (props: FileExplorerProps) => {
const
createFile
=
await
fileManager
.
writeFile
(
newName
,
''
)
const
createFile
=
await
fileManager
.
writeFile
(
newName
,
''
)
if
(
!
createFile
)
{
if
(
!
createFile
)
{
// tooltip('Failed to create file ' + newName)
setState
(
prevState
=>
{
}
else
{
return
{
...
prevState
,
toasterMsg
:
'Failed to create file '
+
newName
}
addFile
(
parentFolder
,
newName
)
})
await
fileManager
.
open
(
newName
)
}
}
}
}
})
})
// }, null, true)
}
}
const
createNewFolder
=
async
(
parentFolder
:
string
,
newFolderPath
:
string
)
=>
{
const
createNewFolder
=
async
(
parentFolder
:
string
,
newFolderPath
:
string
)
=>
{
const
fileManager
=
state
.
fileManager
const
fileManager
=
state
.
fileManager
const
dirName
=
newFolderPath
+
'/'
const
dirName
=
newFolderPath
+
'/'
// if (error) return tooltip('Unexpected error while creating folder: ' + error)
const
exists
=
fileManager
.
exists
(
dirName
)
const
exists
=
fileManager
.
exists
(
dirName
)
if
(
exists
)
return
if
(
exists
)
return
...
@@ -200,13 +203,18 @@ export const FileExplorer = (props: FileExplorerProps) => {
...
@@ -200,13 +203,18 @@ export const FileExplorer = (props: FileExplorerProps) => {
await
fileManager
.
mkdir
(
dirName
)
await
fileManager
.
mkdir
(
dirName
)
addFolder
(
parentFolder
,
newFolderPath
)
addFolder
(
parentFolder
,
newFolderPath
)
}
catch
(
e
)
{
}
catch
(
e
)
{
// tooltip('Failed to create file ' + newName)
setState
(
prevState
=>
{
return
{
...
prevState
,
toasterMsg
:
'Failed to create folder: '
+
newFolderPath
}
})
}
}
}
}
const
deletePath
=
async
(
path
:
string
)
=>
{
const
deletePath
=
async
(
path
:
string
)
=>
{
// if (self.files.isReadOnly(key)) { return tooltip('cannot delete file. ' + self.files.type + ' is a read only explorer') }
if
(
filesProvider
.
isReadOnly
(
path
))
{
if
(
filesProvider
.
isReadOnly
(
path
))
return
return
setState
(
prevState
=>
{
return
{
...
prevState
,
toasterMsg
:
'cannot delete file. '
+
name
+
' is a read only explorer'
}
})
}
const
isDir
=
state
.
fileManager
.
isDirectory
(
path
)
const
isDir
=
state
.
fileManager
.
isDirectory
(
path
)
modal
(
'Delete file'
,
`Are you sure you want to delete
${
path
}
${
isDir
?
'folder'
:
'file'
}
?`
,
{
modal
(
'Delete file'
,
`Are you sure you want to delete
${
path
}
${
isDir
?
'folder'
:
'file'
}
?`
,
{
...
@@ -222,7 +230,9 @@ export const FileExplorer = (props: FileExplorerProps) => {
...
@@ -222,7 +230,9 @@ export const FileExplorer = (props: FileExplorerProps) => {
return
{
...
prevState
,
files
:
updatedFiles
}
return
{
...
prevState
,
files
:
updatedFiles
}
})
})
}
catch
(
e
)
{
}
catch
(
e
)
{
// tooltip(`Failed to remove file ${key}.`)
setState
(
prevState
=>
{
return
{
...
prevState
,
toasterMsg
:
`Failed to remove file
${
path
}
.`
}
})
}
}
}
}
},
{
},
{
...
@@ -421,49 +431,12 @@ export const FileExplorer = (props: FileExplorerProps) => {
...
@@ -421,49 +431,12 @@ export const FileExplorer = (props: FileExplorerProps) => {
// // modalDialogCustom.alert(error)
// // modalDialogCustom.alert(error)
// })
// })
// props.filesProvider.event.register('fileAdded', async (filePath: string) => {
const
fileAdded
=
async
(
filePath
:
string
)
=>
{
// const pathArr = filePath.split('/')
const
parentFolder
=
extractParentFromKey
(
filePath
)
// const hasChild = pathArr.length > 2
// if (hasChild) {
// const expandPath = pathArr.map((path, index) => {
// return [...pathArr.slice(0, index)].join('/')
// }).filter(path => path && (path !== name))
// if (state.files.findIndex(item => item.path === expandPath[0]) === -1) {
// const dir = buildTree(expandPath)
// let files = [dir, ...state.files]
// await Promise.all(expandPath.map(async path => {
// files = await resolveDirectory(path, files)
// }))
// setState(prevState => {
// return { ...prevState, files, expandPath: [...state.expandPath, ...expandPath] }
// })
// } else {
// console.log('called here again')
// console.log('expandPath[expandPath.length - 1]: ', expandPath[expandPath.length - 1])
// if (state.expandPath.findIndex(path => path === expandPath[expandPath.length - 1]) !== -1) return
// const dir = state.files.find(item => item.path === expandPath[0])
// let files = [{
// ...dir,
// child: [...(await fetchDirectoryContent(dir.path))]
// }, ...state.files.filter(item => item.path !== expandPath[0])]
// console.log('files: ', files)
// await Promise.all(expandPath.map(async path => {
addFile
(
parentFolder
,
filePath
)
// files = await resolveDirectory(path, files)
await
state
.
fileManager
.
open
(
filePath
)
// }))
}
// const updatedPath = [state.expandPath.filter(key => key && (typeof key === 'string') && !key.startsWith(expandPath[0]))]
// setState(prevState => {
// return { ...prevState, files, expandPath: [...updatedPath, ...expandPath] }
// })
// }
// } else {
// addFile(pathArr[0], filePath)
// }
// })
// props.filesProvider.event.register('folderAdded', async (folderpath: string) => {
// props.filesProvider.event.register('folderAdded', async (folderpath: string) => {
// const pathArr = folderpath.split('/')
// const pathArr = folderpath.split('/')
...
@@ -620,7 +593,7 @@ export const FileExplorer = (props: FileExplorerProps) => {
...
@@ -620,7 +593,7 @@ export const FileExplorer = (props: FileExplorerProps) => {
},
null
)
},
null
)
}
else
{
}
else
{
if
(
state
.
focusEdit
.
isNew
)
{
if
(
state
.
focusEdit
.
isNew
)
{
state
.
focusEdit
.
type
===
'file'
?
createNewFile
(
parentFolder
,
parentFolder
+
'/'
+
content
)
:
createNewFolder
(
parentFolder
,
parentFolder
+
'/'
+
content
)
state
.
focusEdit
.
type
===
'file'
?
createNewFile
(
parentFolder
+
'/'
+
content
)
:
createNewFolder
(
parentFolder
,
parentFolder
+
'/'
+
content
)
const
files
=
removePath
(
state
.
focusEdit
.
element
,
state
.
files
)
const
files
=
removePath
(
state
.
focusEdit
.
element
,
state
.
files
)
const
updatedFiles
=
files
.
filter
(
file
=>
file
)
const
updatedFiles
=
files
.
filter
(
file
=>
file
)
...
@@ -824,6 +797,7 @@ export const FileExplorer = (props: FileExplorerProps) => {
...
@@ -824,6 +797,7 @@ export const FileExplorer = (props: FileExplorerProps) => {
cancel=
{
state
.
modalOptions
.
cancel
}
cancel=
{
state
.
modalOptions
.
cancel
}
handleHide=
{
handleHideModal
}
handleHide=
{
handleHideModal
}
/>
/>
<
Toaster
message=
{
state
.
toasterMsg
}
/>
</
div
>
</
div
>
)
)
}
}
...
...
libs/remix-ui/toaster/src/lib/toaster.tsx
View file @
d23cb5a1
...
@@ -89,7 +89,15 @@ export const Toaster = (props: ToasterProps) => {
...
@@ -89,7 +89,15 @@ export const Toaster = (props: ToasterProps) => {
return
(
return
(
<>
<>
{
/* <ModalDialog /> */
}
<
ModalDialog
message=
{
props
.
message
}
cancel=
{
{
label
:
'Close'
,
fn
:
()
=>
{}
}
}
hide=
{
!
state
.
showModal
}
handleHide=
{
hideFullMessage
}
/>
{
!
state
.
hide
&&
{
!
state
.
hide
&&
<
div
data
-
shared=
"tooltipPopup"
className=
{
`remixui_tooltip alert alert-info p-2 ${state.hiding ? 'remixui_animateTop' : 'remixui_animateBottom'}`
}
onMouseEnter=
{
handleMouseEnter
}
onMouseLeave=
{
handleMouseLeave
}
>
<
div
data
-
shared=
"tooltipPopup"
className=
{
`remixui_tooltip alert alert-info p-2 ${state.hiding ? 'remixui_animateTop' : 'remixui_animateBottom'}`
}
onMouseEnter=
{
handleMouseEnter
}
onMouseLeave=
{
handleMouseLeave
}
>
<
span
className=
"px-2"
>
<
span
className=
"px-2"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment