Merge remote-tracking branch 'origin/release'

.github/workflows/ci_e2e_puppeteer.yml

@@ -1,6 +1,12 @@
 name: e2e puppeteer
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - development
+      - release
+  pull_request:
 
 jobs:
   e2e_test_puppeteer:

.github/workflows/ci_e2e_suite1.yml

@@ -1,6 +1,12 @@
 name: e2e suite 1
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - development
+      - release
+  pull_request:
 
 jobs:
   e2e_test:

.github/workflows/ci_e2e_suite2.yml

@@ -1,6 +1,12 @@
 name: e2e suite 2
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - development
+      - release
+  pull_request:
 
 jobs:
   e2e_test:

.github/workflows/ci_eslint.yml

@@ -1,6 +1,12 @@
 name: eslint
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - development
+      - release
+  pull_request:
 
 jobs:
   eslint:

.github/workflows/ci_ts_types.yml

@@ -1,6 +1,12 @@
 name: check-types
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - development
+      - release
+  pull_request:
 
 jobs:
   check-types:

.github/workflows/ci_unit_tests.yml

@@ -1,6 +1,12 @@
 name: unit tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - development
+      - release
+  pull_request:
 
 jobs:
   unit_test:

.github/workflows/security_audit.yml

@@ -1,6 +1,12 @@
 name: Modules security check
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - development
+      - release
+  pull_request:
 
 jobs:
   yarn-audit:

app/react/Routes.js

@@ -101,14 +101,14 @@ function getPageIndexRoute(customHomePage) {
 function getIndexRoute(_nextState, callBack) {
   const state = store.getState();
   const homePageSetting = state.settings.collection.get('home_page');
-  const customHomePage = homePageSetting ? homePageSetting.split('/') : [];
+  const customHomePage = homePageSetting ? homePageSetting.split('/').filter(v => v) : [];
   const isPageRoute = customHomePage.includes('page');
 
   if (isPageRoute) {
     return callBack(null, getPageIndexRoute(customHomePage));
   }
 
-  if (homePageSetting) {
+  if (customHomePage.length) {
     return callBack(null, {
       onEnter: (_nxtState, replace) => {
         replace(customHomePage.join('/'));

app/react/Settings/SettingsAPI.ts

@@ -19,7 +19,6 @@ export default {
         return linkWithoutLocalID;
       }),
     });
-
     return api.post('settings', processedSettings).then((response: any) => response.json);
   },
 

app/shared/types/userGroupSchema.ts

@@ -5,6 +5,7 @@ export const emitSchemaTypes = true;
 export const groupMemberSchema = {
   type: 'object',
   additionalProperties: false,
+  definitions: { objectIdSchema },
   properties: {
     _id: objectIdSchema,
     username: { type: 'string' },
@@ -19,6 +20,7 @@ export const userGroupSchema = {
   type: 'object',
   additionalProperties: false,
   uniqueName: true,
+  definitions: { objectIdSchema },
   properties: {
     _id: objectIdSchema,
     name: { type: 'string' },

app/shared/types/userGroupType.d.ts

@@ -1,19 +1,20 @@
 /* eslint-disable */
 /**AUTO-GENERATED. RUN yarn emit-types to update.*/
-import { ObjectId } from 'mongodb';
+
+import { ObjectIdSchema } from 'shared/types/commonTypes';
 
 export interface GroupMemberSchema {
-  _id: string | ObjectId;
+  _id: ObjectIdSchema;
   username?: string;
   role?: string;
   email?: string;
 }
 
 export interface UserGroupSchema {
-  _id?: string | ObjectId;
+  _id?: ObjectIdSchema;
   name: string;
   members: {
-    _id: string | ObjectId;
+    _id: ObjectIdSchema;
     username?: string;
     role?: string;
     email?: string;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "uwazi",
-  "version": "1.19.4",
+  "version": "1.20.0-rc.2",
   "description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.",
   "keywords": [
     "react"