check for sadata changes

app/components/EntityListMain/EntityListGroups/EntityListItems/EntityListItemWrapper/index.js

@@ -61,6 +61,7 @@ export class EntityListItemWrapper extends React.Component { // eslint-disable-l
         }}
       >
         {this.state.wrapper
+          && entity
           && (
             <div>
               <EntityListItem
@@ -131,7 +132,7 @@ export class EntityListItemWrapper extends React.Component { // eslint-disable-l
 }
 
 EntityListItemWrapper.propTypes = {
-  entity: PropTypes.instanceOf(Map).isRequired,
+  entity: PropTypes.instanceOf(Map),
   taxonomies: PropTypes.instanceOf(Map),
   connections: PropTypes.instanceOf(Map),
   errors: PropTypes.instanceOf(Map),

app/components/EntityListSidebar/filterGroupsFactory.js

@@ -4,6 +4,41 @@ import { qe } from 'utils/quasi-equals';
 
 const checkFramework = (frameworks, attribute) => frameworks.some((fw) => fw.getIn(['attributes', attribute]));
 
+const getTaxOptions = (taxonomies, activeFilterOption, messages) => {
+  const taxonomiesGrouped = taxonomies.groupBy((tax) => tax.getIn(['attributes', 'parent_id']) ? 'children' : 'parents');
+  const parentTaxonomies = taxonomiesGrouped.get('parents');
+  if (!parentTaxonomies) return null;
+  return sortEntities(parentTaxonomies, 'asc', 'priority')
+    .reduce(
+      (memo, taxonomy) => {
+        let res = memo.concat([
+          {
+            id: taxonomy.get('id'), // filterOptionId
+            label: messages.taxonomies(taxonomy.get('id')),
+            active: !!activeFilterOption && activeFilterOption.optionId === taxonomy.get('id'),
+          },
+        ]);
+        if (taxonomiesGrouped.get('children') && taxonomiesGrouped.get('children').size > 0) {
+          res = sortEntities(taxonomiesGrouped.get('children'), 'asc', 'priority')
+            .filter((childTaxonomy) => qe(taxonomy.get('id'), childTaxonomy.getIn(['attributes', 'parent_id'])))
+            .reduce(
+              (memo2, childTaxonomy) => memo2.concat([
+                {
+                  id: childTaxonomy.get('id'), // filterOptionId
+                  label: messages.taxonomies(childTaxonomy.get('id')),
+                  active: !!activeFilterOption && activeFilterOption.optionId === childTaxonomy.get('id'),
+                  nested: true,
+                },
+              ]),
+              res,
+            );
+        }
+        return res;
+      },
+      [],
+    );
+};
+
 // figure out filter groups for filter panel
 export const makeFilterGroups = (
   config,
@@ -42,96 +77,49 @@ export const makeFilterGroups = (
           return taxFwIds.size === 1
               && taxFwIds.find((fwid) => qe(fwid, fw.get('id')));
         });
+        const taxOptions = getTaxOptions(fwTaxonomies, activeFilterOption, messages);
         filterGroups[`taxonomies_${fw.get('id')}`] = {
           id: `taxonomies_${fw.get('id')}`, // filterGroupId
           type: 'taxonomies',
           label: messages.taxonomyGroupByFw(fw.get('id')),
           show: true,
           icon: 'categories',
-          options:
-            sortEntities(fwTaxonomies, 'asc', 'priority')
-              .reduce(
-                (memo, taxonomy) => memo.concat([
-                  {
-                    id: taxonomy.get('id'), // filterOptionId
-                    label: messages.taxonomies(taxonomy.get('id')),
-                    active: !!activeFilterOption && activeFilterOption.optionId === taxonomy.get('id'),
-                    nested: taxonomy.getIn(['attributes', 'parent_id']),
-                  },
-                ]),
-                [],
-              ),
+          options: taxOptions,
         };
       });
       const commonTaxonomies = taxonomies.filter((tax) => tax.get('frameworkIds')
           && tax.get('frameworkIds').size > 1);
+      const taxOptions = getTaxOptions(commonTaxonomies, activeFilterOption, messages);
       filterGroups.taxonomies = {
         id: 'taxonomies', // filterGroupId
         label: messages.taxonomyGroupByFw('common'),
         show: true,
         icon: 'categories',
-        options:
-          sortEntities(commonTaxonomies, 'asc', 'priority')
-            .reduce(
-              (memo, taxonomy) => memo.concat([
-                {
-                  id: taxonomy.get('id'), // filterOptionId
-                  label: messages.taxonomies(taxonomy.get('id')),
-                  active: !!activeFilterOption && activeFilterOption.optionId === taxonomy.get('id'),
-                  nested: taxonomy.getIn(['attributes', 'parent_id']),
-                },
-              ]),
-              [],
-            ),
+        options: taxOptions,
       };
     } else {
+      const taxOptions = getTaxOptions(taxonomies, activeFilterOption, messages);
       // first prepare taxonomy options
       filterGroups.taxonomies = {
         id: 'taxonomies', // filterGroupId
         label: messages.taxonomyGroup,
         show: true,
         icon: 'categories',
-        options:
-          sortEntities(taxonomies, 'asc', 'priority')
-            .reduce(
-              (memo, taxonomy) => memo.concat([
-                {
-                  id: taxonomy.get('id'), // filterOptionId
-                  label: messages.taxonomies(taxonomy.get('id')),
-                  active: !!activeFilterOption && activeFilterOption.optionId === taxonomy.get('id'),
-                  nested: taxonomy.getIn(['attributes', 'parent_id']),
-                },
-              ]),
-              [],
-            ),
+        options: taxOptions,
       };
     }
   }
 
   // connectedTaxonomies option group
   if (config.connectedTaxonomies) {
     // first prepare taxonomy options
+    const taxOptions = getTaxOptions(connectedTaxonomies, activeFilterOption, messages);
     filterGroups.connectedTaxonomies = {
       id: 'connectedTaxonomies', // filterGroupId
       label: messages.connectedTaxonomies,
       show: true,
       icon: 'connectedCategories',
-      options:
-        sortEntities(connectedTaxonomies, 'asc', 'priority')
-          .reduce(
-            (taxOptionsMemo, taxonomy) => (config.connectedTaxonomies.exclude
-            && taxonomy.getIn(['attributes', config.connectedTaxonomies.exclude]))
-              ? taxOptionsMemo
-              : taxOptionsMemo.concat([
-                {
-                  id: taxonomy.get('id'), // filterOptionId
-                  label: messages.taxonomies(taxonomy.get('id')),
-                  active: !!activeFilterOption && activeFilterOption.optionId === taxonomy.get('id'),
-                  nested: taxonomy.getIn(['attributes', 'parent_id']),
-                },
-              ]),
-            [],
-          ),
+      options: taxOptions,
     };
   }
 

app/components/HelmetCanonical/index.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import Helmet from 'react-helmet';
+import { CLIENT_URL } from 'themes/config';
+
+const HelmetCanonical = ({ ...props }) => {
+  let canonical = CLIENT_URL;
+  if (window && window.location) {
+    const { pathname, search } = window.location;
+    if (search !== '' || pathname !== '/') {
+      canonical = `${canonical}${pathname}${search}`;
+    }
+  }
+  return (
+    <Helmet {...props}>
+      <link rel="canonical" href={canonical} />
+    </Helmet>
+  );
+};
+
+export default HelmetCanonical;

app/containers/ActionEdit/index.js

@@ -7,7 +7,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import Helmet from 'react-helmet';
+import HelmetCanonical from 'components/HelmetCanonical';
 import { FormattedMessage } from 'react-intl';
 import { actions as formActions } from 'react-redux-form/immutable';
 import { Map, fromJS } from 'immutable';
@@ -243,7 +243,7 @@ export class ActionEdit extends React.Component { // eslint-disable-line react/p
 
     return (
       <div>
-        <Helmet
+        <HelmetCanonical
           title={`${intl.formatMessage(messages.pageTitle)}: ${reference}`}
           meta={[
             { name: 'description', content: intl.formatMessage(messages.metaDescription) },

app/containers/ActionImport/index.js

@@ -7,7 +7,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import Helmet from 'react-helmet';
+import HelmetCanonical from 'components/HelmetCanonical';
 import { actions as formActions } from 'react-redux-form/immutable';
 
 import { fromJS } from 'immutable';
@@ -67,7 +67,7 @@ export class ActionImport extends React.PureComponent { // eslint-disable-line r
     const { intl } = this.context;
     return (
       <div>
-        <Helmet
+        <HelmetCanonical
           title={`${intl.formatMessage(messages.pageTitle)}`}
           meta={[
             {

app/containers/ActionList/index.js

@@ -7,7 +7,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import Helmet from 'react-helmet';
+import HelmetCanonical from 'components/HelmetCanonical';
 import { List, Map, fromJS } from 'immutable';
 
 import { loadEntitiesIfNeeded, updatePath } from 'containers/App/actions';
@@ -92,7 +92,7 @@ export class ActionList extends React.PureComponent { // eslint-disable-line rea
     }
     return (
       <div>
-        <Helmet
+        <HelmetCanonical
           title={intl.formatMessage(messages.pageTitle)}
           meta={[
             { name: 'description', content: intl.formatMessage(messages.metaDescription) },

app/containers/ActionNew/index.js

@@ -7,7 +7,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import Helmet from 'react-helmet';
+import HelmetCanonical from 'components/HelmetCanonical';
 import { actions as formActions } from 'react-redux-form/immutable';
 
 import { Map, List, fromJS } from 'immutable';
@@ -186,7 +186,7 @@ export class ActionNew extends React.PureComponent { // eslint-disable-line reac
     const { saveSending, saveError, submitValid } = viewDomain.get('page').toJS();
     return (
       <div>
-        <Helmet
+        <HelmetCanonical
           title={`${intl.formatMessage(messages.pageTitle)}`}
           meta={[
             {

app/containers/ActionView/index.js

@@ -7,7 +7,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import Helmet from 'react-helmet';
+import HelmetCanonical from 'components/HelmetCanonical';
 import { FormattedMessage } from 'react-intl';
 
 import {
@@ -210,7 +210,7 @@ export class ActionView extends React.PureComponent { // eslint-disable-line rea
 
     return (
       <div>
-        <Helmet
+        <HelmetCanonical
           title={metaTitle}
           meta={[
             { name: 'description', content: intl.formatMessage(messages.metaDescription) },

app/containers/App/index.js

@@ -8,6 +8,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { Helmet } from 'react-helmet';
+import { CLIENT_URL } from 'themes/config';
+
 import ReactModal from 'react-modal';
 import GlobalStyle from 'global-styles';
 
@@ -69,6 +71,21 @@ const Main = styled.div`
 
 class App extends React.PureComponent { // eslint-disable-line react/prefer-stateless-function
   UNSAFE_componentWillMount() {
+    if (window && window.location) {
+      let canonical = CLIENT_URL;
+      const {
+        origin,
+        hostname,
+        pathname,
+        search,
+      } = window.location;
+      if (search !== '' || pathname !== '/') {
+        canonical = `${canonical}${pathname}${search}`;
+      }
+      if (origin !== CLIENT_URL && hostname !== 'localhost') {
+        window.location.replace(canonical);
+      }
+    }
     this.props.validateToken();
     this.props.loadEntitiesIfNeeded();
   }

app/containers/App/messages.js

@@ -1348,6 +1348,58 @@ export default defineMessages({
           defaultMessage: 'About tax 10',
         },
       },
+      12: {
+        single: {
+          id: 'app.containers.App.entities.taxonomies.12.single',
+          defaultMessage: 'Taxonomy 12',
+        },
+        plural: {
+          id: 'app.containers.App.entities.taxonomies.12.plural',
+          defaultMessage: 'Taxonomy 12s',
+        },
+        empty: {
+          id: 'app.containers.App.entities.taxonomies.12.empty',
+          defaultMessage: 'No Taxonomy 12 assigned yet',
+        },
+        shortSingle: {
+          id: 'app.containers.App.entities.taxonomies.12.shortSingle',
+          defaultMessage: 'Taxonomy 12',
+        },
+        shortPlural: {
+          id: 'app.containers.App.entities.taxonomies.12.shortPlural',
+          defaultMessage: 'Taxonomy 12s',
+        },
+        description: {
+          id: 'app.containers.App.entities.taxonomies.12.description',
+          defaultMessage: 'About tax 12',
+        },
+      },
+      13: {
+        single: {
+          id: 'app.containers.App.entities.taxonomies.13.single',
+          defaultMessage: 'Taxonomy 13',
+        },
+        plural: {
+          id: 'app.containers.App.entities.taxonomies.13.plural',
+          defaultMessage: 'Taxonomy 13s',
+        },
+        empty: {
+          id: 'app.containers.App.entities.taxonomies.13.empty',
+          defaultMessage: 'No Taxonomy 13 assigned yet',
+        },
+        shortSingle: {
+          id: 'app.containers.App.entities.taxonomies.13.shortSingle',
+          defaultMessage: 'Taxonomy 13',
+        },
+        shortPlural: {
+          id: 'app.containers.App.entities.taxonomies.13.shortPlural',
+          defaultMessage: 'Taxonomy 13s',
+        },
+        description: {
+          id: 'app.containers.App.entities.taxonomies.13.description',
+          defaultMessage: 'About tax 13',
+        },
+      },
     },
     due_dates: {
       single: {
@@ -1445,6 +1497,14 @@ export default defineMessages({
       id: 'app.containers.App.messages.createdAsGuest',
       defaultMessage: '{entityType} created successfully. It will become publicly available once verified and published by an authorised user.',
     },
+    signingInServer: {
+      id: 'app.containers.App.messages.signingInServer',
+      defaultMessage: 'Note: signing in to {server} database',
+    },
+    registeringServer: {
+      id: 'app.containers.App.messages.registeringServer',
+      defaultMessage: 'Note: registering for {server} database',
+    },
   },
   ui: {
     userRoles: {