Feature/remove external forms (#126)

* added pmd ruleset (#115)

minor fix in pom and gitignore

* Release/1.8.3 (#117)

* prepare release 1.8.0-RC1

* Feature/money filter (#92)

* Replace concept nodes by concept lists (#88)

* Make concept lists the default node type, remove special handling

* Add code list resolution to demo data

* initial money range filter

* update moneyRange

* remove accounting
update yarn.lock

* update demo data

* update formatted value for money range

* fix decimal scale expect number

* fixed wrong result display position (#93)

* update money range

* fix type imports

* update demo data

* reset max-len in eslintrc.json

* Fix/new features from develop (#100)

* New query node editor layout (#96)

* Define QNE state and apply initial draft of the new layout

* Make node label editable

* Reorganize QueryNodeEditor component

* Make node label changeable in forms

* Embed QueryNodeEditor directly into RightPane

* Fix styles and cleanup

* Reset QueryNodeModal state when closing

* Add filter icon, improve style compatibility

* Update Filter label text

* Remove hasActiveFilters property from query nodes

* Make concept lists editable

* WIP

* Cleanup

* Fix QueryGroupModal styles

* More cleanup

* Fix formatting

* Query Node Editor fixes (#97)

* QueryNodeEditor related fixes

* Fix FormQueryNodeEditor being recreated on every edit

* Money range fixes (#98)

* Add some fixes for the money range input

* Reset formattedValue when switching range filter modes

* Fix indentation

* prepare release 1.8.0-RC2

* Fix clear value button layout in ClearableInput

* Fix check for already existing concepts
... when dragging a concept from the tree into the query node editor

* Align labels used for opening the QueryNodeEditor

* prepare release 1.8.0-RC4

* Tree Search (#103)

* - Create a search box at the top of the category tree view
- Implement filter function as part of a reducer

* fix: missing clear value button in input
refactoring

* fix: check undefined

* - changes
- prepare async

* regex search

* set search?: SearchType optional

* refactoring

* changes

* trailing spaces removed

* fuzzyMatch commented out

* fix import

* refactoring

* update flow version to 0.69.0

* replace searchbox mode with isMulti

* add flow

* changes

*  imports organized

* WIP: searching with js worker

* update concept search

* Update CategoryTreeNode.js

set SearchType optional

* SEARCH_API: indexing only values

* show result state in bottom of search input

* refactoring

* Update CategoryTree.js

* Update package.json

Downgrade flow-bin

* update yarn.lock

* clearable searchbox
placeholder color
fix loading

* removed deplay input
searchbox style

* add deplay input
refactoring

* searching in backend integrated, refactoring

* search to simulate api added

* SearchApi removed

* fix initial state

* refactoring

* refactoring

* search fix empty result

* return value of search api changed

* prepare release 1.8.0-RC6

* fix searching

* update .gitignore

* prepare release 1.8.0-RC7

* refactoring

* fix "could not find node" after expand query

* prepare release 1.8.0-rc.10

* prepare release 1.8.0-rc.10

* update downloadResults label

* fix moment locale

* Feature/additional info scroll (#113)

* demo data extended

* tooltip scroll changes

* tooltip scrollbar hide but still scrolling

* fix TypeError e.suggestions[n] is undefined

* create pre release 1.8.0-rc.11-pre

* prepare release 1.8.0-rc.12

* fix: TypeError: Cannot read property '0' of undefined

* prepare release 1.8.0-rc.14

* prepare release 1.8.0-rc.14

* prepare release 1.8.0

* fix exit code 127

* fix exit code 127

* fix convert float to factor value

* Release/1.8.3 (#118)

* prepare release 1.8.0-RC1

* Feature/money filter (#92)

* Replace concept nodes by concept lists (#88)

* Make concept lists the default node type, remove special handling

* Add code list resolution to demo data

* initial money range filter

* update moneyRange

* remove accounting
update yarn.lock

* update demo data

* update formatted value for money range

* fix decimal scale expect number

* fixed wrong result display position (#93)

* update money range

* fix type imports

* update demo data

* reset max-len in eslintrc.json

* Fix/new features from develop (#100)

* New query node editor layout (#96)

* Define QNE state and apply initial draft of the new layout

* Make node label editable

* Reorganize QueryNodeEditor component

* Make node label changeable in forms

* Embed QueryNodeEditor directly into RightPane

* Fix styles and cleanup

* Reset QueryNodeModal state when closing

* Add filter icon, improve style compatibility

* Update Filter label text

* Remove hasActiveFilters property from query nodes

* Make concept lists editable

* WIP

* Cleanup

* Fix QueryGroupModal styles

* More cleanup

* Fix formatting

* Query Node Editor fixes (#97)

* QueryNodeEditor related fixes

* Fix FormQueryNodeEditor being recreated on every edit

* Money range fixes (#98)

* Add some fixes for the money range input

* Reset formattedValue when switching range filter modes

* Fix indentation

* prepare release 1.8.0-RC2

* Fix clear value button layout in ClearableInput

* Fix check for already existing concepts
... when dragging a concept from the tree into the query node editor

* Align labels used for opening the QueryNodeEditor

* prepare release 1.8.0-RC4

* Tree Search (#103)

* - Create a search box at the top of the category tree view
- Implement filter function as part of a reducer

* fix: missing clear value button in input
refactoring

* fix: check undefined

* - changes
- prepare async

* regex search

* set search?: SearchType optional

* refactoring

* changes

* trailing spaces removed

* fuzzyMatch commented out

* fix import

* refactoring

* update flow version to 0.69.0

* replace searchbox mode with isMulti

* add flow

* changes

*  imports organized

* WIP: searching with js worker

* update concept search

* Update CategoryTreeNode.js

set SearchType optional

* SEARCH_API: indexing only values

* show result state in bottom of search input

* refactoring

* Update CategoryTree.js

* Update package.json

Downgrade flow-bin

* update yarn.lock

* clearable searchbox
placeholder color
fix loading

* removed deplay input
searchbox style

* add deplay input
refactoring

* searching in backend integrated, refactoring

* search to simulate api added

* SearchApi removed

* fix initial state

* refactoring

* refactoring

* search fix empty result

* return value of search api changed

* prepare release 1.8.0-RC6

* fix searching

* update .gitignore

* prepare release 1.8.0-RC7

* refactoring

* fix "could not find node" after expand query

* prepare release 1.8.0-rc.10

* prepare release 1.8.0-rc.10

* update downloadResults label

* fix moment locale

* Feature/additional info scroll (#113)

* demo data extended

* tooltip scroll changes

* tooltip scrollbar hide but still scrolling

* fix TypeError e.suggestions[n] is undefined

* create pre release 1.8.0-rc.11-pre

* prepare release 1.8.0-rc.12

* fix: TypeError: Cannot read property '0' of undefined

* prepare release 1.8.0-rc.14

* prepare release 1.8.0-rc.14

* prepare release 1.8.0

* fix exit code 127

* fix exit code 127

* fix convert float to factor value

* Release/1.8.3 (#122)

* prepare release 1.8.0-RC1

* Feature/money filter (#92)

* Replace concept nodes by concept lists (#88)

* Make concept lists the default node type, remove special handling

* Add code list resolution to demo data

* initial money range filter

* update moneyRange

* remove accounting
update yarn.lock

* update demo data

* update formatted value for money range

* fix decimal scale expect number

* fixed wrong result display position (#93)

* update money range

* fix type imports

* update demo data

* reset max-len in eslintrc.json

* Fix/new features from develop (#100)

* New query node editor layout (#96)

* Define QNE state and apply initial draft of the new layout

* Make node label editable

* Reorganize QueryNodeEditor component

* Make node label changeable in forms

* Embed QueryNodeEditor directly into RightPane

* Fix styles and cleanup

* Reset QueryNodeModal state when closing

* Add filter icon, improve style compatibility

* Update Filter label text

* Remove hasActiveFilters property from query nodes

* Make concept lists editable

* WIP

* Cleanup

* Fix QueryGroupModal styles

* More cleanup

* Fix formatting

* Query Node Editor fixes (#97)

* QueryNodeEditor related fixes

* Fix FormQueryNodeEditor being recreated on every edit

* Money range fixes (#98)

* Add some fixes for the money range input

* Reset formattedValue when switching range filter modes

* Fix indentation

* prepare release 1.8.0-RC2

* Fix clear value button layout in ClearableInput

* Fix check for already existing concepts
... when dragging a concept from the tree into the query node editor

* Align labels used for opening the QueryNodeEditor

* prepare release 1.8.0-RC4

* Tree Search (#103)

* - Create a search box at the top of the category tree view
- Implement filter function as part of a reducer

* fix: missing clear value button in input
refactoring

* fix: check undefined

* - changes
- prepare async

* regex search

* set search?: SearchType optional

* refactoring

* changes

* trailing spaces removed

* fuzzyMatch commented out

* fix import

* refactoring

* update flow version to 0.69.0

* replace searchbox mode with isMulti

* add flow

* changes

*  imports organized

* WIP: searching with js worker

* update concept search

* Update CategoryTreeNode.js

set SearchType optional

* SEARCH_API: indexing only values

* show result state in bottom of search input

* refactoring

* Update CategoryTree.js

* Update package.json

Downgrade flow-bin

* update yarn.lock

* clearable searchbox
placeholder color
fix loading

* removed deplay input
searchbox style

* add deplay input
refactoring

* searching in backend integrated, refactoring

* search to simulate api added

* SearchApi removed

* fix initial state

* refactoring

* refactoring

* search fix empty result

* return value of search api changed

* prepare release 1.8.0-RC6

* fix searching

* update .gitignore

* prepare release 1.8.0-RC7

* refactoring

* fix "could not find node" after expand query

* prepare release 1.8.0-rc.10

* prepare release 1.8.0-rc.10

* update downloadResults label

* fix moment locale

* Feature/additional info scroll (#113)

* demo data extended

* tooltip scroll changes

* tooltip scrollbar hide but still scrolling

* fix TypeError e.suggestions[n] is undefined

* create pre release 1.8.0-rc.11-pre

* prepare release 1.8.0-rc.12

* fix: TypeError: Cannot read property '0' of undefined

* prepare release 1.8.0-rc.14

* prepare release 1.8.0-rc.14

* prepare release 1.8.0

* fix exit code 127

* fix exit code 127

* fix convert float to factor value

* Remove external forms

* Keep react components off the redux state

* prepare rc 1.9.0-rc.ex-forms

.gitignore

@@ -14,9 +14,10 @@ launch.json
 *.ctxt
 
 # Eclipse files
-*/.project
-*/.classpath
-*/.settings
+**/.project
+**/.classpath
+**/.settings
+**/.eclipse-pmd
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
@@ -36,4 +37,4 @@ hs_err_pid*
 /frontend/node/
 /frontend/cfp-*
 nbactions.xml
-/selenium-test/target/
+/selenium-test/target/

frontend/app/src/js/main.js

@@ -1,7 +1,8 @@
 // @flow
 
-import conquery                   from '../../../lib/js';
-import exampleForm                from './forms/example-form';
+import conquery                    from '../../../lib/js';
+import { StandardQueryEditorTab }  from '../../../lib/js/standard-query-editor';
+import { TimebasedQueryEditorTab } from '../../../lib/js/timebased-query-editor';
 
 require('../styles/styles.sass');
 require('../images/favicon.png');
@@ -15,8 +16,9 @@ const environment = {
     apiUrl: '/api'
 };
 
-const forms = {
-  [exampleForm.type]: exampleForm
+const tabs = {
+  [StandardQueryEditorTab.description.key]: StandardQueryEditorTab,
+  [TimebasedQueryEditorTab.description.key]: TimebasedQueryEditorTab,
 };
 
-conquery(environment, forms);
+conquery(environment, tabs);

frontend/lib/js/app/Content.js

@@ -16,7 +16,9 @@ import RightPane                    from './RightPane';
 type PropsType = {
   leftPaneActiveTab: string,
   rightPaneActiveTab: string,
+  rightPaneAvailableTabs: Object,
   displayTooltip: boolean,
+  rightPaneTabs: Object,
 };
 
 const Content = (props: PropsType) => {
@@ -38,7 +40,7 @@ const Content = (props: PropsType) => {
           defaultSize="50%"
         >
           <LeftPane activeTab={props.leftPaneActiveTab} />
-          <RightPane activeTab={props.rightPaneActiveTab} />
+          <RightPane activeTab={props.rightPaneActiveTab} tabs={props.rightPaneTabs} />
         </SplitPane>
         {
           props.displayTooltip
@@ -53,6 +55,7 @@ const Content = (props: PropsType) => {
 const mapStateToProps = (state, ownProps) => ({
   leftPaneActiveTab: state.panes.left.activeTab,
   rightPaneActiveTab: state.panes.right.activeTab,
+  rightPaneTabs: state.panes.right.tabs,
   displayTooltip: state.tooltip.displayTooltip,
 });
 

frontend/lib/js/app/RightPane.js

@@ -6,65 +6,28 @@ import { Route }     from 'react-router';
 import { Pane }      from '../pane';
 import { templates } from '../routes';
 import {
-  QueryEditor,
-  StandardQueryRunner,
-  QueryClearButton,
-} from '../standard-query-editor';
-
-import {
-  TimebasedQueryEditor,
-  TimebasedQueryRunner,
-  TimebasedQueryClearButton,
-} from '../timebased-query-editor'
-
-import {
-  ExternalFormsQueryRunner,
-  ExternalFormsNavigation,
-  ExternalFormsContainer,
-} from '../external-forms';
-
+  getRightPaneTabComponent
+}                    from '../pane/reducer';
 
 type PropsType = {
-  activeTab: string
+  activeTab: string,
+  tabs: Object
 };
 
-const RightPane = (props: PropsType) => {
-  const rightPaneContent = (activeTab, selectedDatasetId) => {
-    switch (props.activeTab) {
-      case 'queryEditor':
-        return [
-          <QueryClearButton key={0} />,
-          <QueryEditor selectedDatasetId={selectedDatasetId} key={1} />,
-          <StandardQueryRunner datasetId={selectedDatasetId} key={2} />,
-        ];
-      case 'timebasedQueryEditor':
-        return [
-          <TimebasedQueryClearButton key={0} />,
-          <TimebasedQueryEditor key={1} />,
-          <TimebasedQueryRunner datasetId={selectedDatasetId} key={2} />,
-        ]
-      case 'externalForms':
-        return [
-          <ExternalFormsNavigation key={0} />,
-          <ExternalFormsContainer datasetId={selectedDatasetId} key={1} />,
-          <ExternalFormsQueryRunner datasetId={selectedDatasetId} key={2} />,
-        ]
-      default:
-        return null;
-    }
-  };
-
-  return (
-    <Route path={templates.toDataset} children={({ match }) => {
-      const selectedDatasetId = match && match.params ? match.params.datasetId : null;
-
-      return (
-        <Pane type="right">
-          { rightPaneContent(props.activeTab, selectedDatasetId) }
-        </Pane>
-      );
-    }} />
-  )
-};
+const RightPane = (props: PropsType) =>
+  <Route path={templates.toDataset} children={({ match }) => {
+    const selectedDatasetId = match && match.params ? match.params.datasetId : null;
+
+    const tab = React.createElement(
+      getRightPaneTabComponent(props.activeTab),
+      { selectedDatasetId }
+    );
+
+    return (
+      <Pane type="right">
+        { tab }
+      </Pane>
+    );
+  }} />;
 
 export default RightPane;

frontend/lib/js/app/actions.js

@@ -18,7 +18,6 @@ import * as previousQueriesFilterActions    from '../previous-queries/filter/act
 import * as deletePreviousQueryModalActions from '../previous-queries/delete-modal/actions';
 import * as timebasedQueryEditorActions     from '../timebased-query-editor/actions';
 import * as queryEditorActions              from '../standard-query-editor/actions';
-import * as externalFormsActions            from '../external-forms/actions';
 
 import createQueryRunnerActions             from '../query-runner/actions';
 
@@ -41,5 +40,4 @@ export default {
   ...previousQueriesFilterActions,
   ...deletePreviousQueryModalActions,
   ...timebasedQueryEditorActions,
-  ...externalFormsActions,
 };

frontend/lib/js/app/reducers.js

@@ -23,22 +23,18 @@ import {
 } from '../tooltip';
 
 import {
-  reducer as panes,
   type StateType as PanesStateType
 } from '../pane';
 
-import { reducer as query }                    from '../standard-query-editor';
+import { buildPanesReducer }                   from '../pane/reducer';
 import { reducer as queryGroupModal }          from '../query-group-modal';
 import { reducer as previousQueries }          from '../previous-queries/list';
 import { reducer as previousQueriesSearch }    from '../previous-queries/search';
 import { reducer as previousQueriesFilter }    from '../previous-queries/filter';
 import { reducer as uploadQueryResults }       from '../previous-queries/upload';
 import { reducer as deletePreviousQueryModal } from '../previous-queries/delete-modal';
-import { reducer as timebasedQuery }           from '../timebased-query-editor';
-import { buildExternalFormsReducer }           from '../external-forms';
 import { reducer as uploadConceptListModal }   from '../upload-concept-list-modal';
 
-import { createQueryRunnerReducer }            from '../query-runner';
 import { createQueryNodeEditorReducer }        from '../query-node-editor';
 
 export type StateType = {
@@ -49,25 +45,20 @@ export type StateType = {
   version: VersionStateType,
 };
 
-const buildAppReducer = (availableForms) => combineReducers({
+const buildAppReducer = (tabs) => combineReducers({
   categoryTrees,
-  query,
   uploadConceptListModal,
-  standardQueryRunner: createQueryRunnerReducer('standard'),
-  timebasedQueryRunner: createQueryRunnerReducer('timebased'),
   queryNodeEditor: createQueryNodeEditorReducer('standard'),
   queryGroupModal,
   datasets,
   tooltip,
-  panes,
+  panes: buildPanesReducer(tabs),
   previousQueries,
   previousQueriesSearch,
   previousQueriesFilter,
   uploadQueryResults,
   deletePreviousQueryModal,
-  timebasedQuery,
   version,
-  externalForms: buildExternalFormsReducer(availableForms),
 });
 
 export default buildAppReducer;

frontend/lib/js/dataset/DatasetSelector.js

@@ -54,7 +54,7 @@ const DatasetSelector = (props: PropsType) => (
 const mapStateToProps = (state) => ({
   datasets: state.datasets.data,
   error: state.datasets.error,
-  query: state.query,
+  query: state.panes.right.tabs.queryEditor.query,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch) => ({