@@ -19,14 +19,18 @@ import { IntlProvider } from 'react-intl';
1919import { connect , Provider } from 'react-redux' ;
2020import axios from 'axios' ;
2121import shortUUID from 'short-uuid' ;
22- import { CommonCanvas , CanvasController , CommonProperties } from '@elyra/canvas' ;
22+ import {
23+ CommonCanvas ,
24+ CanvasController ,
25+ CommonProperties ,
26+ } from '@elyra/canvas' ;
2327import { Button , Loading , Modal , Select } from 'carbon-components-react' ;
2428import {
2529 Play32 ,
2630 WarningAlt24 ,
2731 DocumentDownload32 ,
2832 Upload16 ,
29- SettingsAdjust32
33+ SettingsAdjust32 ,
3034} from '@carbon/icons-react' ;
3135import nlpPalette from '../config/nlpPalette.json' ;
3236import RHSPanel from './components/rhs-panel' ;
@@ -53,7 +57,7 @@ import {
5357 setShowRightPanel ,
5458 setShowDocumentViewer ,
5559 setDirty ,
56- setModuleName
60+ setModuleName ,
5761} from '../redux/slice' ;
5862
5963const TIMER_TICK = 250 ; // 1/4 second
@@ -100,13 +104,15 @@ class VisualEditor extends React.Component {
100104 errorMessage : undefined ,
101105 languageSelectModal : false ,
102106 showSettings : false ,
103- editorSettings : localStorage . getItem ( 'nlpEditorSettings' ) ? JSON . parse ( localStorage . getItem ( 'nlpEditorSettings' ) ) : {
104- moduleName : 'elyraNLPCanvas' ,
105- language : 'en'
106- }
107+ editorSettings : localStorage . getItem ( 'nlpEditorSettings' )
108+ ? JSON . parse ( localStorage . getItem ( 'nlpEditorSettings' ) )
109+ : {
110+ moduleName : 'elyraNLPCanvas' ,
111+ language : 'en' ,
112+ } ,
107113 } ;
108114
109- this . props . setModuleName ( this . state . editorSettings . moduleName ) ;
115+ this . props . setModuleName ( this . state . editorSettings . moduleName ) ;
110116
111117 this . canvasController = new CanvasController ( ) ;
112118 this . canvasController . openPalette ( ) ;
@@ -414,8 +420,8 @@ class VisualEditor extends React.Component {
414420 this . props . setShowRightPanel ( { showPanel : true } ) ;
415421 this . props . setShowDocumentViewer ( { showViewer : false } ) ;
416422 this . setState ( {
417- showSettings : true
418- } )
423+ showSettings : true ,
424+ } ) ;
419425 }
420426
421427 getToolbar = ( ) => {
@@ -522,12 +528,7 @@ class VisualEditor extends React.Component {
522528 tooltip : 'Select Language' ,
523529 jsx : (
524530 < >
525- < Button
526- id = { 'btn-language' }
527- size = "field"
528- kind = "ghost"
529- disabled
530- >
531+ < Button id = { 'btn-language' } size = "field" kind = "ghost" disabled >
531532 Language ({ languages [ this . getCurrentLanguage ( ) ] } )
532533 </ Button >
533534 </ >
@@ -665,61 +666,67 @@ class VisualEditor extends React.Component {
665666 parameterDef : {
666667 titleDefinition : {
667668 title : 'NLP Settings' ,
668- editable : false
669+ editable : false ,
669670 } ,
670671 current_parameters : {
671672 moduleName : this . state . editorSettings . moduleName ,
672- language : this . getCurrentLanguage ( )
673+ language : this . getCurrentLanguage ( ) ,
673674 } ,
674- parameters : [ {
675- id : 'moduleName' ,
676- type : 'string' ,
677- default : ''
678- } , {
679- id : 'language' ,
680- type : 'string'
681- } ] ,
675+ parameters : [
676+ {
677+ id : 'moduleName' ,
678+ type : 'string' ,
679+ default : '' ,
680+ } ,
681+ {
682+ id : 'language' ,
683+ type : 'string' ,
684+ } ,
685+ ] ,
682686 uihints : {
683687 id : 'Settings' ,
684688 editor_size : 'medium' ,
685689 label : {
686- default : 'General Settings'
690+ default : 'General Settings' ,
687691 } ,
688- parameter_info : [ {
689- parameter_ref : 'moduleName' ,
690- label : {
691- default : 'Module Name'
692+ parameter_info : [
693+ {
694+ parameter_ref : 'moduleName' ,
695+ label : {
696+ default : 'Module Name' ,
697+ } ,
698+ description : {
699+ default : 'Module Name' ,
700+ } ,
692701 } ,
693- description : {
694- default : 'Module Name'
695- }
696- } ] ,
697- action_info : [ {
698- id : 'language ' ,
699- label : {
700- default : 'Select Language'
702+ ] ,
703+ action_info : [
704+ {
705+ id : 'language' ,
706+ label : {
707+ default : 'Select Language ' ,
708+ } ,
709+ control : 'button' ,
701710 } ,
702- control : 'button'
703- } ] ,
704- group_info : [ {
705- id : 'settings' ,
706- label : {
707- default : 'Settings'
711+ ] ,
712+ group_info : [
713+ {
714+ id : 'settings' ,
715+ label : {
716+ default : 'Settings' ,
717+ } ,
718+ parameter_refs : [ 'moduleName' ] ,
708719 } ,
709- parameter_refs : [
710- 'moduleName'
711- ] ,
712- } , {
713- id : 'lang' ,
714- label : {
715- default : 'Language'
720+ {
721+ id : 'lang' ,
722+ label : {
723+ default : 'Language' ,
724+ } ,
725+ type : 'actionPanel' ,
726+ action_refs : [ 'language' ] ,
716727 } ,
717- type : 'actionPanel' ,
718- action_refs : [
719- 'language'
720- ] ,
721- } ]
722- }
728+ ] ,
729+ } ,
723730 } ,
724731 } ;
725732 }
@@ -740,35 +747,41 @@ class VisualEditor extends React.Component {
740747 ref = { ( instance ) => {
741748 this . CommonProperties = instance ;
742749 } }
743- propertiesConfig = { { containerType : " Custom" , rightFlyout : true } }
750+ propertiesConfig = { { containerType : ' Custom' , rightFlyout : true } }
744751 propertiesInfo = { this . getPropertiesInfo ( ) } // required
745752 callbacks = { {
746753 applyPropertyChanges : ( propertySet ) => {
747754 this . setState ( {
748755 editorSettings : {
749- moduleName : propertySet . moduleName
750- }
756+ moduleName : propertySet . moduleName ,
757+ } ,
751758 } ) ;
752- this . props . setModuleName ( propertySet . moduleName ) ;
753- localStorage . setItem ( 'nlpEditorSettings' , JSON . stringify ( { ...this . state . editorSettings , ...propertySet } ) ) ;
759+ this . props . setModuleName ( propertySet . moduleName ) ;
760+ localStorage . setItem (
761+ 'nlpEditorSettings' ,
762+ JSON . stringify ( {
763+ ...this . state . editorSettings ,
764+ ...propertySet ,
765+ } ) ,
766+ ) ;
754767 } ,
755768 closePropertiesDialog : ( ) => {
756769 this . props . setShowRightPanel ( { showPanel : false } ) ;
757770 this . setState ( {
758- showSettings : false
771+ showSettings : false ,
759772 } ) ;
760773 } ,
761774 actionHandler : ( id , appData , data ) => {
762- switch ( id ) {
775+ switch ( id ) {
763776 case 'language' :
764777 this . setState ( { languageSelectModal : true } ) ;
765778 break ;
766779 }
767- }
780+ } ,
768781 } } // required
769782 light // optional
770783 > </ CommonProperties >
771- )
784+ ) ;
772785 }
773786 return (
774787 < Provider store = { store } >
@@ -790,10 +803,16 @@ class VisualEditor extends React.Component {
790803 this . setCurrentLanguage ( language ) ;
791804 const editorSettings = {
792805 ...this . state . editorSettings ,
793- ...{ language : language }
806+ ...{ language : language } ,
794807 } ;
795- this . setState ( { languageSelectModal : false , editorSettings : editorSettings } ) ;
796- localStorage . setItem ( 'nlpEditorSettings' , JSON . stringify ( editorSettings ) ) ;
808+ this . setState ( {
809+ languageSelectModal : false ,
810+ editorSettings : editorSettings ,
811+ } ) ;
812+ localStorage . setItem (
813+ 'nlpEditorSettings' ,
814+ JSON . stringify ( editorSettings ) ,
815+ ) ;
797816 } }
798817 onRequestClose = { ( ) => {
799818 this . setState ( { languageSelectModal : false } ) ;
@@ -897,7 +916,7 @@ const mapDispatchToProps = (dispatch) => ({
897916 setShowRightPanel : ( doShow ) => dispatch ( setShowRightPanel ( doShow ) ) ,
898917 setShowDocumentViewer : ( doShow ) => dispatch ( setShowDocumentViewer ( doShow ) ) ,
899918 setDirty : ( dirty ) => dispatch ( setDirty ( dirty ) ) ,
900- setModuleName : ( name ) => dispatch ( setModuleName ( name ) )
919+ setModuleName : ( name ) => dispatch ( setModuleName ( name ) ) ,
901920} ) ;
902921
903922export default connect ( mapStateToProps , mapDispatchToProps ) ( VisualEditor ) ;
0 commit comments