Release/1.8.0 (#108)

* 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

.gitignore

@@ -1,3 +1,9 @@
+# maven
+*.xml.versionsBackup
+
+# vscode
+launch.json
+
 # Compiled class file
 *.class
 

.travis.yml

@@ -19,7 +19,8 @@ script:
 
 deploy:
   - provider: script
-    script: bash frontend/scripts/deploy-npm.sh
+    skip_cleanup: true
+    script: chmod +x frontend/scripts/deploy-npm.sh && sh frontend/scripts/deploy-npm.sh
     on:
       tags: true
   - provider: script

frontend/app/api/concepts/movie_appearances.json

@@ -3,6 +3,7 @@
     "parent": "movie_appearances",
     "label": "Action Movies",
     "matchingEntries": 8234,
+    "dateRange":{"lowerEndpoint":"2009-12-07","lowerBoundType":"CLOSED","upperEndpoint":"2018-03-20","upperBoundType":"CLOSED"},
     "additionalInfos": [
       {
           "key": "Action film",

frontend/lib/js/category-trees/CategoryTreeList.js

@@ -12,7 +12,7 @@ import {
 }                                   from './reducer';
 import CategoryTree                 from './CategoryTree';
 import CategoryTreeFolder           from './CategoryTreeFolder';
-import { isSearchResultInChildren } from './selectors';
+import { isInSearchResult }         from './selectors';
 
 type PropsType = {
   trees: TreesType,
@@ -48,7 +48,7 @@ class CategoryTreeList extends React.Component<PropsType> {
               const rootConcept = getConceptById(treeId);
 
               const render = searching
-              ? isSearchResultInChildren(tree.children, search)
+              ? isInSearchResult(treeId, tree.children, search)
               : true;
 
               if (!render) return null;

frontend/lib/js/category-trees/selectors.js

@@ -3,7 +3,7 @@
 import { type TreeNodeIdType }   from '../common/types/backend';
 import { type SearchType }       from './reducer';
 
-export const isSearchResultInChildren = (children?: [], search?: SearchType) => {
+const isSearchResultInChildren = (children?: [], search?: SearchType) => {
     if (!search || !search.result || !children) return false;
     const result = search.result;
 
@@ -22,12 +22,10 @@ export const isInSearchResult = (id: TreeNodeIdType, children?: [], search?: Sea
     if (!search || !search.result) return false;
     const result = search.result;
 
-    for (var i = 0; i < result.length; i++) {
-        const resultId = result[i];
-        if (resultId.indexOf(id) >= 0)
-        return true;
-    }
+    if (result.includes(id)) return true;
+
     if (children && children.length > 0)
         return isSearchResultInChildren(children, search);
+
     return false;
 }

frontend/lib/js/external-forms/stateSelectors.js

@@ -35,6 +35,7 @@ export const selectEditedConcept = (state, formName, fieldName, {andIdx, orIdx})
 export const selectSuggestions = (state, fieldName, {andIdx, orIdx}) => {
   return state.suggestions &&
     state.suggestions[fieldName] &&
+    state.suggestions[fieldName][andIdx] &&
     state.suggestions[fieldName][andIdx][orIdx];
 };
 

frontend/lib/js/localization/index.js

@@ -10,6 +10,6 @@ export const initializeLocalization = (language, ...texts) => {
   T.setTexts(mergeDeep(...texts));
 
   // Set moment locale
-  moment.locale(language);
   momentDurationFormatSetup(moment);
+  moment.locale(language);
 };

frontend/lib/js/query-node-editor/ParameterTableFilters.js

@@ -83,11 +83,15 @@ const ParameterTableFilters = (props: PropsType) => (
                     label={filter.label}
                     options={
                       filter.options ||
-                      (props.suggestions && props.suggestions[filterIdx].options)
+                      (props.suggestions &&
+                        props.suggestions[filterIdx] &&
+                        props.suggestions[filterIdx].options)
                     }
                     isLoading={
                       filter.isLoading ||
-                      (props.suggestions && props.suggestions[filterIdx].isLoading)
+                      (props.suggestions &&
+                        props.suggestions[filterIdx] &&
+                        props.suggestions[filterIdx].isLoading)
                     }
                     startLoadingThreshold={filter.threshold || 1}
                     onLoad={(prefix) => props.onLoadFilterSuggestions(filterIdx, filter.id, prefix)}

frontend/lib/js/standard-query-editor/reducer.js

@@ -463,7 +463,7 @@ const expandPreviousQuery = (state, action: { payload: { groups: QueryGroupType[
           };
         } else {
           const convertConceptToConceptList = element.type === 'CONCEPT';
-          const ids = convertConceptToConceptList ? [element.id] : element.ids;
+          const ids = element.ids || [element.id];
           const lookupResult = getConceptsByIdsWithTables(ids, rootConcepts);
 
           if (!lookupResult)

frontend/lib/js/tooltip/Tooltip.js

@@ -31,28 +31,30 @@ const Tooltip = (props: PropsType) => {
   return (
     <div className="tooltip">
       <div className="tooltip__left">
-        {
-          !label && !description &&
-          <p className="tooltip__placeholder">
-            { T.translate('tooltip.placeholder') }
-          </p>
-        }
-        <h3 className="tooltip__headline">
+        <div>
           {
-            label
-          } {
-            description &&
-            <span> - {description}</span>
+            !label && !description &&
+            <p className="tooltip__placeholder">
+              { T.translate('tooltip.placeholder') }
+            </p>
           }
-        </h3>
-        {
-          infos && infos.map((info, i) => (
-            <div className="tooltip-info" key={i}>
-              <h3 className="tooltip-info__key" >{info.key}</h3>
-              <Markdown className="tooltip-info__value" source={info.value} />
-            </div>
-          ))
-        }
+          <h3 className="tooltip__headline">
+            {
+              label
+            } {
+              description &&
+              <span> - {description}</span>
+            }
+          </h3>
+          {
+            infos && infos.map((info, i) => (
+              <div className="tooltip-info" key={i}>
+                <h3 className="tooltip-info__key" >{info.key}</h3>
+                <Markdown className="tooltip-info__value" source={info.value} />
+              </div>
+            ))
+          }
+        </div>
       </div>
       <TooltipEntries
         className="tooltip__right"

frontend/lib/localization/de.yml

@@ -24,7 +24,7 @@ queryRunner:
   resultCount: "{count} Ergebnisse gefunden"
   queryFailed: "Anfrage ist fehlgeschlagen."
   queryCanceled: "Anfrage wurde abgebrochen."
-  downloadResults: "Ergebnisse herunterladen (CSV)"
+  downloadResults: "Ergebnisse herunterladen"
 
 queryEditor:
   couldNotExpandNode: "Knoten nicht gefunden"

frontend/lib/styles/components/tooltip.sass

@@ -1,10 +1,11 @@
 .tooltip
   background-color: $col-bg
   padding: 10px 20px
-  display: table
   width: 100%
   height: 100%
   position: relative
+  overflow: hidden
+  display: flex
 
   &--activate
     padding: 0 20px
@@ -13,12 +14,24 @@
     font-size: $font-sm
     margin: 5px 0 5px
 
-  &__left, &__right
-    display: table-cell
-    vertical-align: middle
+  &__left
+    flex: 1
+    width: 100%
+    height: 100%
+    overflow: hidden
+    position: relative
+
+    & > div
+      position: absolute
+      top: 0
+      bottom: 0
+      left: 0
+      right: -17px
+      overflow-y: scroll
 
   &__right
     width: 35%
+    flex: 1
 
   &__placeholder
     color: $col-gray

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "conquery",
-  "version": "1.8.0-RC2",
+  "version": "1.8.0",
   "description": "conquery",
   "main": "dist/js/index.js",
   "private": false,

frontend/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bakdata.conquery</groupId>
         <artifactId>parent</artifactId>
-        <version>1.8.0-RC2</version>
+        <version>1.8.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.bakdata.conquery</groupId>
     <artifactId>parent</artifactId>
-    <version>1.8.0-RC2</version>
+    <version>1.8.0</version>
 
     <packaging>pom</packaging>
     <name>Conquery Parent</name>
@@ -48,4 +48,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

selenium-test/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.bakdata.conquery</groupId>
         <artifactId>parent</artifactId>
-        <version>1.8.0-RC2</version>
+        <version>1.8.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>