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
7bf13dd5
Commit
7bf13dd5
authored
Sep 11, 2017
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor: move filter selection from terminal to txLogger
parent
40401964
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
22 deletions
+39
-22
txLogger.js
src/app/execution/txLogger.js
+20
-2
editor-panel.js
src/app/panels/editor-panel.js
+8
-3
terminal.js
src/app/panels/terminal.js
+11
-17
No files found.
src/app/execution/txLogger.js
View file @
7bf13dd5
...
@@ -76,16 +76,34 @@ class TxLogger {
...
@@ -76,16 +76,34 @@ class TxLogger {
var
data
=
args
[
0
]
var
data
=
args
[
0
]
var
el
=
renderKnownTransaction
(
this
,
data
)
var
el
=
renderKnownTransaction
(
this
,
data
)
append
(
el
)
append
(
el
)
})
},
{
activate
:
true
})
this
.
logUnknownTX
=
opts
.
api
.
editorpanel
.
registerCommand
(
'unknownTransaction'
,
(
args
,
cmds
,
append
)
=>
{
this
.
logUnknownTX
=
opts
.
api
.
editorpanel
.
registerCommand
(
'unknownTransaction'
,
(
args
,
cmds
,
append
)
=>
{
var
data
=
args
[
0
]
var
data
=
args
[
0
]
var
el
=
renderUnknownTransaction
(
this
,
data
)
var
el
=
renderUnknownTransaction
(
this
,
data
)
append
(
el
)
append
(
el
)
})
},
{
activate
:
false
})
this
.
logEmptyBlock
=
opts
.
api
.
editorpanel
.
registerCommand
(
'emptyBlock'
,
(
args
,
cmds
,
append
)
=>
{
this
.
logEmptyBlock
=
opts
.
api
.
editorpanel
.
registerCommand
(
'emptyBlock'
,
(
args
,
cmds
,
append
)
=>
{
var
data
=
args
[
0
]
var
data
=
args
[
0
]
var
el
=
renderEmptyBlock
(
this
,
data
)
var
el
=
renderEmptyBlock
(
this
,
data
)
append
(
el
)
append
(
el
)
},
{
activate
:
true
})
opts
.
api
.
editorpanel
.
event
.
register
(
'terminalFilterChanged'
,
(
type
,
label
)
=>
{
if
(
type
===
'deselect'
)
{
if
(
label
===
'only remix transactions'
)
{
opts
.
api
.
editorpanel
.
updateTerminalFilter
({
type
:
'select'
,
value
:
'unknownTransaction'
})
}
else
if
(
label
===
'all transactions'
)
{
opts
.
api
.
editorpanel
.
updateTerminalFilter
({
type
:
'deselect'
,
value
:
'unknownTransaction'
})
}
}
else
if
(
type
===
'select'
)
{
if
(
label
===
'only remix transactions'
)
{
opts
.
api
.
editorpanel
.
updateTerminalFilter
({
type
:
'deselect'
,
value
:
'unknownTransaction'
})
}
else
if
(
label
===
'all transactions'
)
{
opts
.
api
.
editorpanel
.
updateTerminalFilter
({
type
:
'select'
,
value
:
'unknownTransaction'
})
}
}
})
})
opts
.
events
.
txListener
.
register
(
'newBlock'
,
(
block
)
=>
{
opts
.
events
.
txListener
.
register
(
'newBlock'
,
(
block
)
=>
{
...
...
src/app/panels/editor-panel.js
View file @
7bf13dd5
...
@@ -167,7 +167,9 @@ class EditorPanel {
...
@@ -167,7 +167,9 @@ class EditorPanel {
</div>`
</div>`
})
})
}
}
self
.
_components
.
terminal
.
updateJournal
({
type
:
'select'
,
value
:
'emptyBlock'
})
self
.
_components
.
terminal
.
event
.
register
(
'filterChanged'
,
(
type
,
value
)
=>
{
this
.
event
.
trigger
(
'terminalFilterChanged'
,
[
type
,
value
])
})
self
.
_components
.
terminal
.
event
.
register
(
'resize'
,
delta
=>
self
.
_adjustLayout
(
'top'
,
delta
))
self
.
_components
.
terminal
.
event
.
register
(
'resize'
,
delta
=>
self
.
_adjustLayout
(
'top'
,
delta
))
if
(
self
.
_api
.
txListener
)
{
if
(
self
.
_api
.
txListener
)
{
self
.
_components
.
terminal
.
event
.
register
(
'listenOnNetWork'
,
(
listenOnNetWork
)
=>
{
self
.
_components
.
terminal
.
event
.
register
(
'listenOnNetWork'
,
(
listenOnNetWork
)
=>
{
...
@@ -233,9 +235,12 @@ class EditorPanel {
...
@@ -233,9 +235,12 @@ class EditorPanel {
self
.
_adjustLayout
(
'top'
,
self
.
data
.
_layout
.
top
.
offset
)
self
.
_adjustLayout
(
'top'
,
self
.
data
.
_layout
.
top
.
offset
)
return
self
.
_view
.
el
return
self
.
_view
.
el
}
}
registerCommand
(
name
,
command
)
{
registerCommand
(
name
,
command
,
opts
)
{
var
self
=
this
var
self
=
this
return
self
.
_components
.
terminal
.
registerCommand
(
name
,
command
)
return
self
.
_components
.
terminal
.
registerCommand
(
name
,
command
,
opts
)
}
updateTerminalFilter
(
filter
)
{
this
.
_components
.
terminal
.
updateJournal
(
filter
)
}
}
_renderTabsbar
()
{
_renderTabsbar
()
{
var
self
=
this
var
self
=
this
...
...
src/app/panels/terminal.js
View file @
7bf13dd5
...
@@ -143,20 +143,14 @@ class Terminal {
...
@@ -143,20 +143,14 @@ class Terminal {
dependencies
:
{
'all transactions'
:
[
'only remix transactions'
],
'only remix transactions'
:
[
'all transactions'
]}
dependencies
:
{
'all transactions'
:
[
'only remix transactions'
],
'only remix transactions'
:
[
'all transactions'
]}
})
})
self
.
_components
.
dropdown
.
event
.
register
(
'deselect'
,
function
(
label
)
{
self
.
_components
.
dropdown
.
event
.
register
(
'deselect'
,
function
(
label
)
{
if
(
label
===
'only remix transactions'
)
{
self
.
event
.
trigger
(
'filterChanged'
,
[
'deselect'
,
label
])
self
.
updateJournal
({
type
:
'select'
,
value
:
'unknownTransaction'
})
if
(
label
===
'script'
)
{
}
else
if
(
label
===
'all transactions'
)
{
self
.
updateJournal
({
type
:
'deselect'
,
value
:
'unknownTransaction'
})
}
else
{
// script
self
.
updateJournal
({
type
:
'deselect'
,
value
:
label
})
self
.
updateJournal
({
type
:
'deselect'
,
value
:
label
})
}
}
})
})
self
.
_components
.
dropdown
.
event
.
register
(
'select'
,
function
(
label
)
{
self
.
_components
.
dropdown
.
event
.
register
(
'select'
,
function
(
label
)
{
if
(
label
===
'only remix transactions'
)
{
self
.
event
.
trigger
(
'filterChanged'
,
[
'select'
,
label
])
self
.
updateJournal
({
type
:
'deselect'
,
value
:
'unknownTransaction'
})
if
(
label
===
'script'
)
{
}
else
if
(
label
===
'all transactions'
)
{
self
.
updateJournal
({
type
:
'select'
,
value
:
'unknownTransaction'
})
}
else
{
// script
self
.
updateJournal
({
type
:
'select'
,
value
:
label
})
self
.
updateJournal
({
type
:
'select'
,
value
:
label
})
}
}
})
})
...
@@ -171,10 +165,10 @@ class Terminal {
...
@@ -171,10 +165,10 @@ class Terminal {
self
.
_INDEX
.
commandsMain
=
{}
self
.
_INDEX
.
commandsMain
=
{}
self
.
registerCommand
(
'banner'
,
function
(
args
,
scopedCommands
,
append
)
{
self
.
registerCommand
(
'banner'
,
function
(
args
,
scopedCommands
,
append
)
{
append
(
args
[
0
])
append
(
args
[
0
])
})
}
,
{
activate
:
true
}
)
self
.
registerCommand
(
'log'
,
self
.
_blocksRenderer
(
'log'
))
self
.
registerCommand
(
'log'
,
self
.
_blocksRenderer
(
'log'
)
,
{
activate
:
true
}
)
self
.
registerCommand
(
'info'
,
self
.
_blocksRenderer
(
'info'
))
self
.
registerCommand
(
'info'
,
self
.
_blocksRenderer
(
'info'
)
,
{
activate
:
true
}
)
self
.
registerCommand
(
'error'
,
self
.
_blocksRenderer
(
'error'
))
self
.
registerCommand
(
'error'
,
self
.
_blocksRenderer
(
'error'
)
,
{
activate
:
true
}
)
self
.
registerCommand
(
'script'
,
function
execute
(
args
,
scopedCommands
,
append
)
{
self
.
registerCommand
(
'script'
,
function
execute
(
args
,
scopedCommands
,
append
)
{
var
script
=
String
(
args
[
0
])
var
script
=
String
(
args
[
0
])
scopedCommands
.
log
(
`>
${
script
}
`
)
scopedCommands
.
log
(
`>
${
script
}
`
)
...
@@ -182,12 +176,11 @@ class Terminal {
...
@@ -182,12 +176,11 @@ class Terminal {
if
(
error
)
scopedCommands
.
error
(
error
)
if
(
error
)
scopedCommands
.
error
(
error
)
else
scopedCommands
.
log
(
output
)
else
scopedCommands
.
log
(
output
)
})
})
})
}
,
{
activate
:
true
}
)
self
.
_jsSandboxContext
=
{}
self
.
_jsSandboxContext
=
{}
self
.
_jsSandbox
=
vm
.
createContext
(
self
.
_jsSandboxContext
)
self
.
_jsSandbox
=
vm
.
createContext
(
self
.
_jsSandboxContext
)
if
(
opts
.
shell
)
self
.
_shell
=
opts
.
shell
if
(
opts
.
shell
)
self
.
_shell
=
opts
.
shell
register
(
self
)
register
(
self
)
self
.
updateJournal
({
type
:
'select'
,
value
:
'knownTransaction'
})
}
}
render
()
{
render
()
{
var
self
=
this
var
self
=
this
...
@@ -545,7 +538,7 @@ class Terminal {
...
@@ -545,7 +538,7 @@ class Terminal {
})
})
return
scopedCommands
return
scopedCommands
}
}
registerCommand
(
name
,
command
)
{
registerCommand
(
name
,
command
,
opts
)
{
var
self
=
this
var
self
=
this
name
=
String
(
name
)
name
=
String
(
name
)
if
(
self
.
_commands
[
name
])
throw
new
Error
(
`command "
${
name
}
" exists already`
)
if
(
self
.
_commands
[
name
])
throw
new
Error
(
`command "
${
name
}
" exists already`
)
...
@@ -584,6 +577,7 @@ class Terminal {
...
@@ -584,6 +577,7 @@ class Terminal {
].
join
(
'
\
n'
)
].
join
(
'
\
n'
)
self
.
commands
[
name
].
toString
=
_
=>
{
return
help
}
self
.
commands
[
name
].
toString
=
_
=>
{
return
help
}
self
.
commands
[
name
].
help
=
help
self
.
commands
[
name
].
help
=
help
self
.
data
.
activeFilters
.
commands
[
name
]
=
opts
&&
opts
.
activate
return
self
.
commands
[
name
]
return
self
.
commands
[
name
]
}
}
_shell
(
script
,
scopedCommands
,
done
)
{
// default shell
_shell
(
script
,
scopedCommands
,
done
)
{
// default shell
...
...
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