From 93d9af9fa66198fb185afaff958d329e5d21463a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Loi=CC=88c=20Correnson?= <loic.correnson@cea.fr>
Date: Wed, 26 Feb 2020 17:11:43 +0100
Subject: [PATCH] [ivette] move components inside modules
---
ivette/src/frama-c/labviews.js | 15 ++++++++-------
ivette/src/renderer/Application.js | 8 ++------
ivette/src/renderer/Controller.js | 20 ++++++++++++++------
ivette/src/renderer/Properties.js | 18 +++++++++++++++++-
4 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/ivette/src/frama-c/labviews.js b/ivette/src/frama-c/labviews.js
index 644978de9eb..1e8e5bf830c 100644
--- a/ivette/src/frama-c/labviews.js
+++ b/ivette/src/frama-c/labviews.js
@@ -16,7 +16,8 @@ import { Hbox, Hfill, Vfill, Filler } from 'dome/layout/boxes' ;
import { IconButton, Field } from 'dome/controls/buttons' ;
import { Label } from 'dome/controls/labels' ;
import { Icon } from 'dome/controls/icons' ;
-import { Item as RenderItem, Render } from 'dome/layout/dispatch' ;
+import { Item as ItemToRender,
+ Render as RenderItem } from 'dome/layout/dispatch' ;
import './labviews.css' ;
// --------------------------------------------------------------------------
@@ -225,15 +226,15 @@ const TitleContext = React.createContext();
If specified, the icon, label and title properties are rendered in an `<Label/>` component.
By default, the component title bar is labelled according to the component properties.
*/
-export const Title = ({icon,label,title,children}) => {
+export const TitleBar = ({icon,label,title,children}) => {
let context = React.useContext(TitleContext);
return (
- <RenderItem id={'labview.title.'+context.id}>
+ <ItemToRender id={'labview.title.'+context.id}>
<Label className='labview-handle' icon={icon}
label={label || context.label}
title={title || context.title}/>
{children}
- </RenderItem>
+ </ItemToRender>
);
};
@@ -292,10 +293,10 @@ const makeGridItem = (customize,onClose) => comp => {
<Hbox className='labview-titlebar'>
<Hfill>
<Catch title={id}>
- <Render id={ 'labview.title.' + id }>
+ <RenderItem id={ 'labview.title.' + id }>
<Label className='labview-handle'
label={label} title={title} />
- </Render>
+ </RenderItem>
</Catch>
</Hfill>
{ CLOSING }
@@ -603,6 +604,6 @@ export function LabView(props)
// --------------------------------------------------------------------------
-export default { LabView, View, Group, Component, Title } ;
+export default { LabView, View, Group, Component, TitleBar } ;
// --------------------------------------------------------------------------
diff --git a/ivette/src/renderer/Application.js b/ivette/src/renderer/Application.js
index 381b77ec6bc..61bb9744fe8 100644
--- a/ivette/src/renderer/Application.js
+++ b/ivette/src/renderer/Application.js
@@ -55,12 +55,8 @@ export default (function() {
<GridItem id='frama-c.console'/>
</View>
<Group id='frama-c' label='Frama-C' title='Frama-C Kernel Components'>
- <Component id='frama-c.console' label='Console' >
- <Controller.Console/>
- </Component>
- <Component id='frama-c.properties' label='Properties' >
- <Properties.PropTable/>
- </Component>
+ <Controller.Console/>
+ <Properties.PropTable/>
</Group>
</LabView>
</Splitter>
diff --git a/ivette/src/renderer/Controller.js b/ivette/src/renderer/Controller.js
index 11fa7a9e781..ee41351df46 100644
--- a/ivette/src/renderer/Controller.js
+++ b/ivette/src/renderer/Controller.js
@@ -8,7 +8,7 @@ import Server from 'frama-c/server' ;
import States from 'frama-c/states' ;
import { Vfill } from 'dome/layout/boxes' ;
-import { Title } from 'frama-c/labviews' ;
+import { Component, TitleBar } from 'frama-c/labviews' ;
import { Button as ToolButton, ButtonGroup, Filler } from 'dome/layout/toolbars' ;
import { LED, IconButton } from 'dome/controls/buttons' ;
import { Label, Code } from 'dome/controls/labels' ;
@@ -120,27 +120,35 @@ function execCmdLine() {
Server.restart();
}
-export const Console = () => {
+const RenderConsole = () => {
const [ cmd , switchCmd ] = Dome.useSwitch();
const doExec = () => {
switchCmd();
execCmdLine();
};
return (
- <Vfill>
- <Title>
+ <React.Fragment>
+ <TitleBar label={cmd ? 'Command Line' : 'Console'}>
<IconButton icon='RELOAD' display={cmd} onClick={resetCmdLine} title='Reset Command Line'/>
<IconButton icon='MEDIA.PLAY' display={cmd} onClick={doExec} title='Execute Command Line'/>
<IconButton icon='EDIT' selected={cmd} onClick={switchCmd} title='Edit Command Line'/>
- </Title>
+ </TitleBar>
<Text buffer={cmd ? cmdLine : Server.buffer}
mode='text'
readOnly={!cmd}
theme='ambiance' />
- </Vfill>
+ </React.Fragment>
);
};
+export const Console = () => (
+ <Component id='frama-c.console'
+ label='Console'
+ title='Frama-C Server Output & Command Line'>
+ <RenderConsole/>
+ </Component>
+);
+
// --------------------------------------------------------------------------
// --- Status
// --------------------------------------------------------------------------
diff --git a/ivette/src/renderer/Properties.js b/ivette/src/renderer/Properties.js
index dcc88232172..80f2fa3ff1c 100644
--- a/ivette/src/renderer/Properties.js
+++ b/ivette/src/renderer/Properties.js
@@ -6,14 +6,22 @@ import _ from 'lodash' ;
import React from 'react' ;
import Dome from 'dome' ;
import States from 'frama-c/states' ;
+import { Code } from 'dome/controls/labels' ;
import { ArrayModel } from 'dome/table/arrays' ;
import { Table, Column, DefineColumn } from 'dome/table/views' ;
+import { Component } from 'frama-c/labviews' ;
// --------------------------------------------------------------------------
// --- Properties Array
// --------------------------------------------------------------------------
-const PropTable = () => {
+const ColumnCode = DefineColumn({ renderValue: (text) => <Code>{text}</Code> });
+
+// --------------------------------------------------------------------------
+// --- Columns
+// -------------------------------------------------------------------------
+
+const RenderTable = () => {
const model = React.useMemo( () => new ArrayModel() , [] );
const items = States.useSyncArray('kernel.properties');
model.setData( _.toArray( items ) );
@@ -25,6 +33,14 @@ const PropTable = () => {
);
};
+const PropTable = () => (
+ <Component id='frama-c.properties'
+ label='Properties'
+ title='Registered Frama-C Property Status' >
+ <RenderTable/>
+ </Component>
+);
+
// --------------------------------------------------------------------------
// --- Exports
// --------------------------------------------------------------------------
--
GitLab