diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a12bd07069efef9e5f20a84ef6d5bc3d5cfb236..ae3880d67e25804af152863f06ac78b60d791ae0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,7 +61,7 @@ demo:now:
- master
environment:
name: $PACKAGE_NAME/demo
- url: $NOW_URL
+ url: https://xpub-faraday.now.sh/
script:
- npm i -g --unsafe-perm now
- cd ${HOME}/now
diff --git a/automation/.classpath b/automation/.classpath
index af599703398f3fa18bcfb98074d95bb95e8ba619..3a7fee78b7d3b51aabd19743cef74d561cb69316 100644
--- a/automation/.classpath
+++ b/automation/.classpath
@@ -70,6 +70,5 @@
<classpathentry kind="lib" path="/Applications/Katalon Studio.app/Contents/Eclipse/plugins/com.google.oauth-client.google-oauth-client_1.22.0.jar"/>
<classpathentry kind="lib" path="/Applications/Katalon Studio.app/Contents/Eclipse/plugins/com.google.http-client.google-http-client_1.22.0.jar"/>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
- <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/automation/Object Repository/NewUser/Dr.rs b/automation/Object Repository/NewUser/Dr.rs
new file mode 100644
index 0000000000000000000000000000000000000000..eff2346d3af26506c0f90ae60007d245beaee54d
--- /dev/null
+++ b/automation/Object Repository/NewUser/Dr.rs
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>Dr</name>
+ <tag></tag>
+ <elementGuidId>8bdc9a24-0f0a-4806-9187-24d32796e957</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>XPATH</key>
+ <value>//div[contains(text(), 'Dr')]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>div</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>role</name>
+ <type>Main</type>
+ <value>option</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tabindex</name>
+ <type>Main</type>
+ <value>0</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>aria-selected</name>
+ <type>Main</type>
+ <value>true</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-cMljjf dpAtdf</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Dr</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-ugnQR keFDzo"]/form[@class="sc-eIHaNI bdGTel"]/div[1]/div[@class="sc-cpmKsF huoLCL"]/div[@class="sc-kQsIoO fuwMDp"]/div[2]/div[@class="sc-eNQAEJ jgsVpS"]/div[@class="sc-cvbbAY cDfiQI"]/div[@class="sc-jWBwVP dVZxvi"]/div[@class="sc-brqgnP bTwMpG"]/div[@class="sc-cMljjf dpAtdf"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/EditUser/.meta b/automation/Object Repository/NewUser/EditUser/.meta
new file mode 100644
index 0000000000000000000000000000000000000000..19883ad9e19e08afbfa1df71deffe0e36eceeaa0
--- /dev/null
+++ b/automation/Object Repository/NewUser/EditUser/.meta
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FolderEntity>
+ <description>folder</description>
+ <name>EditUser</name>
+ <tag></tag>
+ <folderType>WEBELEMENT</folderType>
+</FolderEntity>
diff --git a/automation/Object Repository/NewUser/a_Edit.rs b/automation/Object Repository/NewUser/a_Edit.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e17c1daea2784b0d054271f634a1300ec7579677
--- /dev/null
+++ b/automation/Object Repository/NewUser/a_Edit.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>a_Edit</name>
+ <tag></tag>
+ <elementGuidId>1ab696f2-d3f9-4d16-a6d1-c6e1e9274fa7</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>#root > div > div > div.sc-drKuOJ.fmUpkt > div > table > tbody > tr:nth-child(1) > td:nth-child(7) > a</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>a</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-bEjcJn hzylbl</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>href</name>
+ <type>Main</type>
+ <value>/admin/users/edit/cfcaebdf-82b0-4d06-94d6-687d126165e7</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Edit</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[1]/table[@class="sc-hzDEsm cniXiH"]/tbody[1]/tr[@class="sc-jeCdPy kCgSUu"]/td[7]/a[@class="sc-bEjcJn hzylbl"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/addUser.rs b/automation/Object Repository/NewUser/addUser.rs
new file mode 100644
index 0000000000000000000000000000000000000000..9a821d12d3b7f7817c73c132751d505947cf47ed
--- /dev/null
+++ b/automation/Object Repository/NewUser/addUser.rs
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>addUser</name>
+ <tag></tag>
+ <elementGuidId>603be35e-a2f1-4b42-9155-c50663f2f154</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>XPATH</key>
+ <value>//button/*[1]</value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value>button:first-child</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>button</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-hgHYgh ljXRif</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Â Add User</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[1]/div[@class="sc-eInJlc bZxNvb"]/button[@class="sc-hgHYgh ljXRif"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/admin.rs b/automation/Object Repository/NewUser/admin.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d46e98fc39661dc1a0b179c86d868c1d75524cd1
--- /dev/null
+++ b/automation/Object Repository/NewUser/admin.rs
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>admin</name>
+ <tag></tag>
+ <elementGuidId>9be9ae36-fc08-41ea-9e5e-66e6b3424324</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>XPATH</key>
+ <value>//span[contains(text(),'admin')]</value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>span</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>admin</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-ibxdXY kLiOmR"]/div[@class="sc-iQKALj gyquxk"]/div[1]/span[2]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/adminDashboard.rs b/automation/Object Repository/NewUser/adminDashboard.rs
new file mode 100644
index 0000000000000000000000000000000000000000..05527f1db5a04ac366d4c48dc5232ac2b7ade208
--- /dev/null
+++ b/automation/Object Repository/NewUser/adminDashboard.rs
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>adminDashboard</name>
+ <tag></tag>
+ <elementGuidId>e89c9572-6cfd-4b02-a8a3-861c8932498f</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>XPATH</key>
+ <value>//div[contains(text(),'Admin dashboard')]</value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value></value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>div</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-hrWEMg eeRLUW</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Admin dashboard</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-ibxdXY kLiOmR"]/div[@class="sc-iQKALj gyquxk"]/div[@class="sc-bwCtUz eJpifv"]/div[@class="sc-hrWEMg eeRLUW"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/affiliation.rs b/automation/Object Repository/NewUser/affiliation.rs
new file mode 100644
index 0000000000000000000000000000000000000000..da9a81f5693daa3ea231733454745bf7018679c2
--- /dev/null
+++ b/automation/Object Repository/NewUser/affiliation.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>affiliation</name>
+ <tag></tag>
+ <elementGuidId>470c59a2-5fa0-4f30-ac66-e95cbf70d88d</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>input[name="affiliation"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>input</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>type</name>
+ <type>Main</type>
+ <value>text</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-bRBYWo cBIccu</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>name</name>
+ <type>Main</type>
+ <value>affiliation</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-ugnQR keFDzo"]/form[@class="sc-eIHaNI bdGTel"]/div[1]/div[@class="sc-cpmKsF huoLCL"]/div[@class="sc-kQsIoO fuwMDp"]/div[2]/div[@class="sc-csuQGl cQCuEk"]/input[@class="sc-bRBYWo cBIccu"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/author.rs b/automation/Object Repository/NewUser/author.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8abb4b6cc6a3397dc458522ba0111d043689a4fd
--- /dev/null
+++ b/automation/Object Repository/NewUser/author.rs
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>author</name>
+ <tag></tag>
+ <elementGuidId>75e282fc-78d2-4a0d-aaaf-03af3c9ec268</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>XPATH</key>
+ <value>//div[contains(text(), 'Author')]</value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value></value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>div</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>role</name>
+ <type>Main</type>
+ <value>option</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tabindex</name>
+ <type>Main</type>
+ <value>0</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>aria-selected</name>
+ <type>Main</type>
+ <value>false</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-cMljjf gYrREv</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Author</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-ugnQR keFDzo"]/form[@class="sc-eIHaNI bdGTel"]/div[1]/div[@class="sc-cpmKsF huoLCL"]/div[@class="sc-kQsIoO fuwMDp"]/div[2]/div[@class="sc-eNQAEJ jgsVpS"]/div[@class="sc-cvbbAY cDfiQI"]/div[@class="sc-jWBwVP dVZxvi"]/div[@class="sc-brqgnP bTwMpG"]/div[@class="sc-cMljjf gYrREv"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/back.rs b/automation/Object Repository/NewUser/back.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8f46e5514dfba5d7f2c99bf822dc4108f9306faf
--- /dev/null
+++ b/automation/Object Repository/NewUser/back.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>back</name>
+ <tag></tag>
+ <elementGuidId>31117721-59ff-4d5f-ac9c-98912b39b191</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>XPATH</key>
+ <value>//button[contains(text(),'Back')]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>button</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>type</name>
+ <type>Main</type>
+ <value>button</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-VigVT eawDXx</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Back</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-ugnQR keFDzo"]/form[@class="sc-eIHaNI bdGTel"]/div[@class="sc-eTpRJs juzepW"]/button[@class="sc-VigVT eawDXx"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/editorInChied.rs b/automation/Object Repository/NewUser/editorInChied.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5dcfb48b271c9523027480c02c7b6b2d5c87ddc0
--- /dev/null
+++ b/automation/Object Repository/NewUser/editorInChied.rs
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>editorInChied</name>
+ <tag></tag>
+ <elementGuidId>34eca5ab-ac60-4162-b582-26cf8ae1d055</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>XPATH</key>
+ <value>//label[@class="sc-kAzzGY dnReMb"]/input[@name="editorInChief"]</value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value></value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>span</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Editor in Chief</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-ugnQR keFDzo"]/form[@class="sc-eIHaNI bdGTel"]/div[1]/div[@class="sc-iybRtq cyLdLK"]/div[@class="sc-iQtOjA FBgTe"]/div[3]/label[@class="sc-kAzzGY dnReMb"]/span[1]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/email.rs b/automation/Object Repository/NewUser/email.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ec8cb51872a5e5d8babab0115dbe91a1ac5cbecd
--- /dev/null
+++ b/automation/Object Repository/NewUser/email.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>email</name>
+ <tag></tag>
+ <elementGuidId>1858a722-d885-4a1e-b442-cf4f5e56dc49</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>input[name="email"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>input</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>type</name>
+ <type>Main</type>
+ <value>text</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-bRBYWo cBIccu</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>name</name>
+ <type>Main</type>
+ <value>email</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-ugnQR keFDzo"]/form[@class="sc-eIHaNI bdGTel"]/div[1]/div[@class="sc-cpmKsF huoLCL"]/div[@class="sc-kQsIoO fuwMDp"]/div[2]/div[@class="sc-csuQGl cQCuEk"]/input[@class="sc-bRBYWo cBIccu"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/firstName.rs b/automation/Object Repository/NewUser/firstName.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1c911543bf1c746cd35033a4498bdf94b8a2a4a4
--- /dev/null
+++ b/automation/Object Repository/NewUser/firstName.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>firstName</name>
+ <tag></tag>
+ <elementGuidId>1acf4240-f00b-4f93-8833-625af953cbc7</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>input[name="firstName"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>input</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>type</name>
+ <type>Main</type>
+ <value>text</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-bRBYWo cBIccu</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>name</name>
+ <type>Main</type>
+ <value>firstName</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-ugnQR keFDzo"]/form[@class="sc-eIHaNI bdGTel"]/div[1]/div[@class="sc-cpmKsF huoLCL"]/div[@class="sc-kQsIoO fuwMDp"]/div[2]/div[@class="sc-csuQGl cQCuEk"]/input[@class="sc-bRBYWo cBIccu"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/lastName.rs b/automation/Object Repository/NewUser/lastName.rs
new file mode 100644
index 0000000000000000000000000000000000000000..04f64121cb9625f92c7d58f7e8ba4415611c8fb4
--- /dev/null
+++ b/automation/Object Repository/NewUser/lastName.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>lastName</name>
+ <tag></tag>
+ <elementGuidId>76427985-e357-418e-bd3c-7c9f6e5821bb</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>input[name="lastName"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>input</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>type</name>
+ <type>Main</type>
+ <value>text</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-bRBYWo cBIccu</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>name</name>
+ <type>Main</type>
+ <value>lastName</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-ugnQR keFDzo"]/form[@class="sc-eIHaNI bdGTel"]/div[1]/div[@class="sc-cpmKsF huoLCL"]/div[@class="sc-kQsIoO fuwMDp"]/div[2]/div[@class="sc-csuQGl cQCuEk"]/input[@class="sc-bRBYWo cBIccu"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/login.rs b/automation/Object Repository/NewUser/login.rs
new file mode 100644
index 0000000000000000000000000000000000000000..43a596efe3f0b88cd852a3dee00a5749203b0f9d
--- /dev/null
+++ b/automation/Object Repository/NewUser/login.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>login</name>
+ <tag></tag>
+ <elementGuidId>13c40cbc-2634-4147-b93b-717f7ea9cc2b</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>button[type="submit"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>button</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>type</name>
+ <type>Main</type>
+ <value>submit</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-jTzLTM jwsELq</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Login</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-TOsTZ beQaWr"]/form[1]/button[@class="sc-jTzLTM jwsELq"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/password.rs b/automation/Object Repository/NewUser/password.rs
new file mode 100644
index 0000000000000000000000000000000000000000..fcbea6dfa6e6325f1f5ea2378b78a03cfaf165ac
--- /dev/null
+++ b/automation/Object Repository/NewUser/password.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>password</name>
+ <tag></tag>
+ <elementGuidId>7f5f3c44-335f-4a8e-9e97-46646ad1755b</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>input[name="password"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>input</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>type</name>
+ <type>Main</type>
+ <value>password</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-bRBYWo cBIccu</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>name</name>
+ <type>Main</type>
+ <value>password</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-TOsTZ beQaWr"]/form[1]/div[@class="sc-csuQGl cQCuEk"]/input[@class="sc-bRBYWo cBIccu"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/roleAdmin.rs b/automation/Object Repository/NewUser/roleAdmin.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e568d0ea2dc034399094c8528fb379685d58ee0a
--- /dev/null
+++ b/automation/Object Repository/NewUser/roleAdmin.rs
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>roleAdmin</name>
+ <tag></tag>
+ <elementGuidId>e32a2bfe-254a-42d6-b533-255570389045</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>XPATH</key>
+ <value>//div[contains(text(),'Editor in Chief')]</value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value>div[data-test="role-selector"] div[role="option"]:last-child</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>span</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Admin</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-ugnQR keFDzo"]/form[@class="sc-eIHaNI bdGTel"]/div[1]/div[@class="sc-iybRtq cyLdLK"]/div[@class="sc-iQtOjA FBgTe"]/div[4]/label[@class="sc-kAzzGY dnReMb"]/span[1]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/roleDropDown.rs b/automation/Object Repository/NewUser/roleDropDown.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b450ce1c88ec543c897a7cad7dbd3c9c461e0979
--- /dev/null
+++ b/automation/Object Repository/NewUser/roleDropDown.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>roleDropDown</name>
+ <tag></tag>
+ <elementGuidId>7e0c179c-c8a8-4c69-96b1-d5eed9615c3e</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>div[data-test="role-selector"] button</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>button</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>type</name>
+ <type>Main</type>
+ <value>button</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-kEYyzF eQSWqQ</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Choose in the listâ–¼</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-ugnQR keFDzo"]/form[@class="sc-eIHaNI bdGTel"]/div[1]/div[@class="sc-cpmKsF huoLCL"]/div[@class="sc-kQsIoO fuwMDp"]/div[2]/div[@class="sc-eNQAEJ jgsVpS"]/div[@class="sc-cvbbAY cDfiQI"]/button[@class="sc-kEYyzF eQSWqQ"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/save.rs b/automation/Object Repository/NewUser/save.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4999eff76563cb36ded2ab248b83a75e33c3d78f
--- /dev/null
+++ b/automation/Object Repository/NewUser/save.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>save</name>
+ <tag></tag>
+ <elementGuidId>e889f3f3-ff55-4aa4-bbda-6cbab91338b1</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>button[type="submit"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>button</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>type</name>
+ <type>Main</type>
+ <value>submit</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-jTzLTM jwsELq</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Save user</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-ugnQR keFDzo"]/form[@class="sc-eIHaNI bdGTel"]/div[@class="sc-eTpRJs juzepW"]/button[@class="sc-jTzLTM jwsELq"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/signUp.rs b/automation/Object Repository/NewUser/signUp.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e54272f1a5de32f3214806bc16d8e2085b74097e
--- /dev/null
+++ b/automation/Object Repository/NewUser/signUp.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>signUp</name>
+ <tag></tag>
+ <elementGuidId>19400002-75ea-4914-8827-72d5fa40aaf3</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>a[href="/signup"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>a</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-gisBJw eWHBkB</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>href</name>
+ <type>Main</type>
+ <value>/signup</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Sign up</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-TOsTZ beQaWr"]/div[@class="sc-eerKOB eFhTIp"]/a[@class="sc-gisBJw eWHBkB"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/td_vlad.stegarunewuserthinslic.rs b/automation/Object Repository/NewUser/td_vlad.stegarunewuserthinslic.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f4ef7825b8ff65cf36154ff32576a771dc69eb52
--- /dev/null
+++ b/automation/Object Repository/NewUser/td_vlad.stegarunewuserthinslic.rs
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>td_vlad.stegarunewuserthinslic</name>
+ <tag></tag>
+ <elementGuidId>1ee7b131-9b37-44ca-a75a-e710f5aa3d91</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>#root > div > div > div.sc-drKuOJ.fmUpkt > div > table > tbody > tr:nth-child(1)</value>
+ </entry>
+ <entry>
+ <key>XPATH</key>
+ <value></value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>td</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>vlad.stegaru+newuser@thinslices.com</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[1]/table[@class="sc-hzDEsm cniXiH"]/tbody[1]/tr[@class="sc-jeCdPy kCgSUu"]/td[2]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/titleDropDown.rs b/automation/Object Repository/NewUser/titleDropDown.rs
new file mode 100644
index 0000000000000000000000000000000000000000..32cc7ea26883b5e2301420161a29cba20b44dc17
--- /dev/null
+++ b/automation/Object Repository/NewUser/titleDropDown.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>titleDropDown</name>
+ <tag></tag>
+ <elementGuidId>fb697c85-1d88-41ce-b084-64f1bf1ba28f</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>div[data-test="title-selector"] button</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>button</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>type</name>
+ <type>Main</type>
+ <value>button</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-kEYyzF eQSWqQ</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Choose in the listâ–¼</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-ugnQR keFDzo"]/form[@class="sc-eIHaNI bdGTel"]/div[1]/div[@class="sc-cpmKsF huoLCL"]/div[@class="sc-kQsIoO fuwMDp"]/div[2]/div[@class="sc-eNQAEJ jgsVpS"]/div[@class="sc-cvbbAY cDfiQI"]/button[@class="sc-kEYyzF eQSWqQ"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/username.rs b/automation/Object Repository/NewUser/username.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1b371925b13ac14f1216df05b46eef7d44846eee
--- /dev/null
+++ b/automation/Object Repository/NewUser/username.rs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>username</name>
+ <tag></tag>
+ <elementGuidId>5478eb88-8fb8-483f-8f82-f56766b37933</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>input[name="username"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>input</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>type</name>
+ <type>Main</type>
+ <value>text</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-bRBYWo cBIccu</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>name</name>
+ <type>Main</type>
+ <value>username</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-TOsTZ beQaWr"]/form[1]/div[@class="sc-csuQGl cQCuEk"]/input[@class="sc-bRBYWo cBIccu"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/users.rs b/automation/Object Repository/NewUser/users.rs
new file mode 100644
index 0000000000000000000000000000000000000000..741e7f5528791d64e35ab023b30a877a1422ef02
--- /dev/null
+++ b/automation/Object Repository/NewUser/users.rs
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>users</name>
+ <tag></tag>
+ <elementGuidId>fc06cfc7-c7e0-449f-b85c-d7c1f34f21c3</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>XPATH</key>
+ <value>//span[contains(text(),'Users')]</value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value>//span[contains(text(),'Users')]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>tag</name>
+ <type>Main</type>
+ <value>div</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>class</name>
+ <type>Main</type>
+ <value>sc-eXNvrr hVBWZK</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>true</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>text</name>
+ <type>Main</type>
+ <value>Users</value>
+ </webElementProperties>
+ <webElementProperties>
+ <isSelected>false</isSelected>
+ <matchCondition>equals</matchCondition>
+ <name>xpath</name>
+ <type>Main</type>
+ <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-hIVACf dydoGZ"]/div[@class="sc-gVyKpa knVGhf"]/div[@class="sc-eXNvrr hVBWZK"]</value>
+ </webElementProperties>
+</WebElementEntity>
diff --git a/automation/Scripts/Add a new user/Add a new user/Script1521123804636.groovy b/automation/Scripts/Add a new user/Add a new user/Script1521123804636.groovy
new file mode 100644
index 0000000000000000000000000000000000000000..9c9b4fd5dac17e68e54db977ce98921e656337f0
--- /dev/null
+++ b/automation/Scripts/Add a new user/Add a new user/Script1521123804636.groovy
@@ -0,0 +1,103 @@
+import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint
+import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase
+import static com.kms.katalon.core.testdata.TestDataFactory.findTestData
+import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject
+import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint
+import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory
+import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as MobileBuiltInKeywords
+import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile
+import com.kms.katalon.core.model.FailureHandling as FailureHandling
+import com.kms.katalon.core.testcase.TestCase as TestCase
+import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory
+import com.kms.katalon.core.testdata.TestData as TestData
+import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory
+import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository
+import com.kms.katalon.core.testobject.TestObject as TestObject
+import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WSBuiltInKeywords
+import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS
+import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUiBuiltInKeywords
+import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI
+import internal.GlobalVariable as GlobalVariable
+
+WebUI.openBrowser(null)
+
+WebUI.navigateToUrl('https://xpub-faraday.now.sh')
+
+username = findTestObject('NewUser/username')
+
+WebUI.click(username)
+
+WebUI.setText(username, 'admin')
+
+password = findTestObject('NewUser/password')
+
+WebUI.click(password)
+
+WebUI.setText(password, 'admin123')
+
+login = findTestObject('NewUser/login')
+
+WebUI.click(login)
+
+admin = findTestObject('NewUser/admin')
+
+WebUI.click(admin)
+
+adminDashboard = findTestObject('NewUser/adminDashboard')
+
+WebUI.click(adminDashboard)
+
+users = findTestObject('NewUser/users')
+
+WebUI.waitForElementVisible(users, 2)
+
+WebUI.click(users)
+
+addUser = findTestObject('NewUser/addUser')
+
+WebUI.click(addUser)
+
+email = findTestObject('NewUser/email')
+
+WebUI.click(email)
+
+WebUI.setText(email, 'bogdan.cochior+author@thinslices.com')
+
+roleDropDown = findTestObject('NewUser/roleDropDown')
+
+WebUI.click(roleDropDown)
+
+author = findTestObject('NewUser/author')
+
+WebUI.click(author)
+
+firstName = findTestObject('NewUser/firstName')
+
+WebUI.click(firstName)
+
+WebUI.setText(firstName, 'Bogdan Author')
+
+lastName = findTestObject('NewUser/lastName')
+
+WebUI.click(lastName)
+
+WebUI.setText(lastName, 'Test')
+
+affiliation = findTestObject('NewUser/affiliation')
+
+WebUI.click(affiliation)
+
+WebUI.setText(affiliation, 'College')
+
+title = findTestObject('NewUser/titleDropDown')
+
+WebUI.click(title)
+
+dr = findTestObject('NewUser/Dr')
+
+WebUI.click(dr)
+
+save = findTestObject('NewUser/save')
+
+WebUI.click(save)
+
diff --git a/automation/Scripts/Add a new user/Edit new user/Script1521147575383.groovy b/automation/Scripts/Add a new user/Edit new user/Script1521147575383.groovy
new file mode 100644
index 0000000000000000000000000000000000000000..fc39b005f064450c360cbe989bd9a164ea33400f
--- /dev/null
+++ b/automation/Scripts/Add a new user/Edit new user/Script1521147575383.groovy
@@ -0,0 +1,85 @@
+import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint
+import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase
+import static com.kms.katalon.core.testdata.TestDataFactory.findTestData
+import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject
+import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint
+import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory
+import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as MobileBuiltInKeywords
+import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile
+import com.kms.katalon.core.model.FailureHandling as FailureHandling
+import com.kms.katalon.core.testcase.TestCase as TestCase
+import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory
+import com.kms.katalon.core.testdata.TestData as TestData
+import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory
+import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository
+import com.kms.katalon.core.testobject.TestObject as TestObject
+import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WSBuiltInKeywords
+import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS
+import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUiBuiltInKeywords
+import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI
+import internal.GlobalVariable as GlobalVariable
+
+WebUI.openBrowser(null)
+WebUI.navigateToUrl('https://xpub-faraday.now.sh')
+
+username = findTestObject("NewUser/username")
+WebUI.click(username)
+WebUI.setText(username, 'admin')
+
+password = findTestObject("NewUser/password")
+WebUI.click(password)
+WebUI.setText(password, 'admin123')
+
+login = findTestObject("NewUser/login")
+WebUI.click(login)
+
+admin = findTestObject("NewUser/admin")
+WebUI.click(admin)
+
+adminDashboard = findTestObject("NewUser/adminDashboard")
+WebUI.click(adminDashboard)
+
+users = findTestObject("NewUser/users")
+WebUI.waitForElementVisible(users, 2)
+WebUI.click(users)
+
+editUserVlad = findTestObject("NuewUser/td_vlad.stegarunewuserthinslic")
+WebUI.mouseOver(editUserVlad)
+WebUI.waitForElementVisible(edit, 2)
+
+edit = findTestObject("NewUSer/a_Edit")
+WebUI.click(edit)
+
+firstName = findTestObject("NewUser/firstName")
+WebUI.click(firstName)
+WebUI.setText(firstName, 'John')
+
+lastName = findTestObject("NewUser/lastName")
+WebUI.click(lastName)
+WebUI.setText(lastName, 'Smith')
+
+affiliation = findTestObject("NewUser/affiliation")
+WebUI.click(affiliation)
+WebUI.setText(affiliation, 'University')
+
+title = findTestObject("NewUser/titleDropDown")
+WebUI.click(title)
+
+dr = findTestObject("NewUser/dr")
+WebUI.click(dr)
+
+editorInChief = findTestObject("NewUser/editorInChief")
+WebUI.click(editorInChief)
+
+save = findTestObject("NewUser/save")
+WebUI.click(save)
+
+
+
+
+
+
+
+
+
+
diff --git a/automation/Scripts/Add new manuscript/Add a new manuscript/Script1520433593112.groovy b/automation/Scripts/Add new manuscript/Add a new manuscript/Script1520433593112.groovy
index f48875d6f73388e67258bfe31093ccf16bf047b9..de38d51f58d176fe41cb72d88137550c9cd7d9ba 100644
--- a/automation/Scripts/Add new manuscript/Add a new manuscript/Script1520433593112.groovy
+++ b/automation/Scripts/Add new manuscript/Add a new manuscript/Script1520433593112.groovy
@@ -23,7 +23,7 @@ import org.openqa.selenium.Keys as Keys
WebUI.openBrowser(null)
-WebUI.navigateToUrl('http://localhost:3000')
+WebUI.navigateToUrl('https://xpub-faraday.now.sh')
username = findTestObject('SignIn/usernameField')
@@ -57,8 +57,6 @@ WebUI.waitForElementVisible(newButton, 2)
WebUI.click(hindawiFaraday)
-WebUI.click(hindawiFaraday)
-
issue = findTestObject('NewManuscript/journalfFieldSelection/Issue')
WebUI.click(issue)
diff --git a/automation/Scripts/Resume submission Redirect/Script1520866853834.groovy b/automation/Scripts/Resume submission Redirect/Script1520866853834.groovy
index 4c915e92dc984af5ce22e5693a31a941a704bc36..1f5ad7619f9f37b7e25bc210c013f3d43e6042be 100644
--- a/automation/Scripts/Resume submission Redirect/Script1520866853834.groovy
+++ b/automation/Scripts/Resume submission Redirect/Script1520866853834.groovy
@@ -36,8 +36,11 @@ WebUI.setText(password, '123123123')
loginButton = findTestObject('SignIn/LoginButton')
WebUI.click(loginButton)
+New = findTestObject("NewManuscript/journalFieldSelection/New")
+WebUI.click(New)
+
resumeSubmission = findTestObject('Resume/resumeSubmission')
WebUI.click(resumeSubmission)
-Cancel = findTestObject('Object Repository/NewManuscript/journalfFieldSelection/Cancel')
-WebUI.click(Cancel)
\ No newline at end of file
+cancel = findTestObject("NewManuscript/journalFieldSelection/Cancel")
+WebUI.click(cancel)
diff --git a/automation/Test Cases/Add a new user/Add a new user.tc b/automation/Test Cases/Add a new user/Add a new user.tc
new file mode 100644
index 0000000000000000000000000000000000000000..90ffcdbf6a659e5b6ee4bf35fe0ec6ca828e6f05
--- /dev/null
+++ b/automation/Test Cases/Add a new user/Add a new user.tc
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestCaseEntity>
+ <description></description>
+ <name>Add a new user</name>
+ <tag></tag>
+ <comment></comment>
+ <testCaseGuid>4fb461a2-86c3-481b-bdab-82f1038de954</testCaseGuid>
+</TestCaseEntity>
diff --git a/automation/Test Cases/Add a new user/Edit new user.tc b/automation/Test Cases/Add a new user/Edit new user.tc
new file mode 100644
index 0000000000000000000000000000000000000000..ff1df9a36c00423131cdfde3cb6b4221ec7418a1
--- /dev/null
+++ b/automation/Test Cases/Add a new user/Edit new user.tc
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestCaseEntity>
+ <description></description>
+ <name>Edit new user</name>
+ <tag></tag>
+ <comment></comment>
+ <testCaseGuid>8834effa-adeb-4c54-829d-0f79db5f7d4f</testCaseGuid>
+</TestCaseEntity>
diff --git a/packages/component-aws-download/index.js b/packages/component-aws-download/index.js
deleted file mode 100644
index 140b65ac0183438e989b7e7f552b3498baa32820..0000000000000000000000000000000000000000
--- a/packages/component-aws-download/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-require('dotenv').config()
-
-module.exports = {
- backend: () => app => require('./src/FileBackend')(app),
-}
diff --git a/packages/component-aws-download/package.json b/packages/component-aws-download/package.json
deleted file mode 100644
index 4d54d2c1d945d705640586d78e3b8cace92fd724..0000000000000000000000000000000000000000
--- a/packages/component-aws-download/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "name": "component-aws-download",
- "version": "0.0.1",
- "main": "index.js",
- "license": "MIT",
- "dependencies": {
- "archiver": "^2.1.1",
- "aws-sdk": "^2.185.0",
- "body-parser": "^1.17.2",
- "multer": "^1.3.0",
- "multer-s3": "^2.7.0",
- "node-mocks-http": "^1.6.6"
- },
- "peerDependencies": {
- "@pubsweet/logger": "^0.0.1",
- "pubsweet-server": "^1.0.1"
- }
-}
diff --git a/packages/component-aws-download/src/FileBackend.js b/packages/component-aws-download/src/FileBackend.js
deleted file mode 100644
index 74c4a5a76f1d952ccc1405dcd90ac39b52e26718..0000000000000000000000000000000000000000
--- a/packages/component-aws-download/src/FileBackend.js
+++ /dev/null
@@ -1,62 +0,0 @@
-const AWS = require('aws-sdk')
-const _ = require('lodash')
-const util = require('util')
-const config = require('config')
-const archiver = require('archiver')
-// const logger = require('@pubsweet/logger')
-
-const s3Config = _.get(config, 'pubsweet-component-aws-s3')
-
-const FileBackend = app => {
- const authBearer = app.locals.passport.authenticate('bearer', {
- session: false,
- })
- AWS.config.update({
- secretAccessKey: s3Config.secretAccessKey,
- accessKeyId: s3Config.accessKeyId,
- region: s3Config.region,
- })
- const s3 = new AWS.S3()
-
- app.get('/api/fileZip/:fragmentId', authBearer, async (req, res) => {
- const archive = archiver('zip')
- const { fragmentId } = req.params
- const getObject = util.promisify(s3.getObject.bind(s3))
- const listObjects = util.promisify(s3.listObjects.bind(s3))
-
- try {
- archive.pipe(res)
- res.attachment(`${fragmentId}-archive.zip`)
-
- const params = {
- Bucket: s3Config.bucket,
- Prefix: `${fragmentId}`,
- }
-
- const s3Items = await listObjects(params)
- const s3Files = await Promise.all(
- s3Items.Contents.map(content =>
- getObject({
- Bucket: s3Config.bucket,
- Key: content.Key,
- }),
- ),
- )
-
- s3Files.forEach(f => {
- archive.append(f.Body, {
- name: `${_.get(f, 'Metadata.filetype') || 'supplementary'}/${_.get(
- f,
- 'Metadata.filename',
- ) || f.ETag}`,
- })
- })
-
- archive.finalize()
- } catch (err) {
- res.status(err.statusCode).json({ error: err.message })
- }
- })
-}
-
-module.exports = FileBackend
diff --git a/packages/component-invite/src/controllers/inviteGlobalRole.js b/packages/component-invite/src/controllers/inviteGlobalRole.js
index 82558319506f30622daa03130ead2ee25f2cb92a..4cf92182fd3a3b8a52abc9081d3a043a5ad589ed 100644
--- a/packages/component-invite/src/controllers/inviteGlobalRole.js
+++ b/packages/component-invite/src/controllers/inviteGlobalRole.js
@@ -47,7 +47,8 @@ module.exports = async (body, models, res, url) => {
return res.status(200).json(newUser)
} catch (e) {
- return res.status(500).json({ error: e.message })
+ logger.error(e.message)
+ return res.status(500).json({ error: 'Email could not be sent.' })
}
}
}
diff --git a/packages/component-local-aws/index.js b/packages/component-local-aws/index.js
deleted file mode 100644
index 140b65ac0183438e989b7e7f552b3498baa32820..0000000000000000000000000000000000000000
--- a/packages/component-local-aws/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-require('dotenv').config()
-
-module.exports = {
- backend: () => app => require('./src/FileBackend')(app),
-}
diff --git a/packages/component-local-aws/package.json b/packages/component-local-aws/package.json
deleted file mode 100644
index b38c67c0a3e07d5a3d4596db3ad356a20eb1c2ca..0000000000000000000000000000000000000000
--- a/packages/component-local-aws/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "name": "component-local-aws",
- "version": "1.0.0",
- "main": "index.js",
- "license": "MIT",
- "dependencies": {
- "aws-sdk": "^2.185.0",
- "body-parser": "^1.17.2",
- "multer": "^1.3.0",
- "multer-s3": "^2.7.0",
- "node-mocks-http": "^1.6.6",
- "nodemailer": "^4.4.2"
- },
- "peerDependencies": {
- "@pubsweet/logger": "^0.0.1",
- "pubsweet-server": "^1.0.1"
- }
-}
diff --git a/packages/component-local-aws/src/FileBackend.js b/packages/component-local-aws/src/FileBackend.js
deleted file mode 100644
index b7866aa58574c21c3773ca443041bda361270cfe..0000000000000000000000000000000000000000
--- a/packages/component-local-aws/src/FileBackend.js
+++ /dev/null
@@ -1,45 +0,0 @@
-const _ = require('lodash')
-const AWS = require('aws-sdk')
-const config = require('config')
-
-const s3Config = _.get(config, 'pubsweet-component-aws-s3')
-
-const FileBackend = app => {
- const authBearer = app.locals.passport.authenticate('bearer', {
- session: false,
- })
- AWS.config.update({
- secretAccessKey: s3Config.secretAccessKey,
- accessKeyId: s3Config.accessKeyId,
- region: s3Config.region,
- })
- const s3 = new AWS.S3()
- const upload = require('./middeware/upload').setupMulter(s3)
-
- app.post(
- '/api/files',
- authBearer,
- upload.single('file'),
- require('./routeHandlers/postFile'),
- )
-
- app.get(
- '/api/files/:fragmentId/:fileId',
- authBearer,
- require('./routeHandlers/getSignedUrl')(s3, s3Config),
- )
-
- app.get(
- '/api/files/:fragmentId',
- authBearer,
- require('./routeHandlers/zipFiles')(s3, s3Config),
- )
-
- app.delete(
- '/api/files/:fragmentId/:fileId',
- authBearer,
- require('./routeHandlers/deleteFile')(s3, s3Config),
- )
-}
-
-module.exports = FileBackend
diff --git a/packages/component-local-aws/src/FileBackend.test.js b/packages/component-local-aws/src/FileBackend.test.js
deleted file mode 100644
index 95a026ff5866440953da6c75cee6042589d1abe1..0000000000000000000000000000000000000000
--- a/packages/component-local-aws/src/FileBackend.test.js
+++ /dev/null
@@ -1,188 +0,0 @@
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
-process.env.SUPPRESS_NO_CONFIG_WARNING = true
-
-const httpMocks = require('node-mocks-http')
-
-const zipHandler = require('./routeHandlers/zipFiles')
-
-describe('ValidateFile for multer fileFilter', () => {
- it('should return TRUE when fileType is supplementary', () => {
- const validateFile = require('./middeware/upload').validateFile(
- ...buildValidateFileParams('supplementary', 'image/png'),
- )
- expect(validateFile).toBe(true)
- })
- it('should return TRUE when fileType is manuscripts or coverLetter and the file is either Word Doc or PDF', () => {
- const randFileType = getRandValueFromArray(['manuscripts', 'coverLetter'])
- const randMimeType = getRandValueFromArray([
- 'application/pdf',
- 'application/msword',
- 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
- ])
-
- const validateFile = require('./middeware/upload').validateFile(
- ...buildValidateFileParams(randFileType, randMimeType),
- )
- expect(validateFile).toBe(true)
- })
- it('should return FALSE when fileType is manuscripts or coverLetter and the file is neither Word Doc or PDF', () => {
- const randFileType = getRandValueFromArray(['manuscripts', 'coverLetter'])
- const randMimeType = getRandValueFromArray([
- 'text/plain',
- 'text/html',
- 'image/jpeg',
- 'image/png',
- ])
-
- const validateFile = require('./middeware/upload').validateFile(
- ...buildValidateFileParams(randFileType, randMimeType),
- )
- expect(validateFile).toBe(false)
- })
-})
-
-describe('Upload file route handler', () => {
- it('should return success when the file passed validation', async () => {
- const file = {
- key: '123abc',
- originalname: 'file.txt',
- size: 128,
- }
- const req = httpMocks.createRequest({
- file,
- })
- const res = httpMocks.createResponse()
- await require('./routeHandlers/postFile')(req, res)
- expect(res.statusCode).toBe(200)
- const data = JSON.parse(res._getData())
- expect(data.id).toEqual(file.key)
- expect(data.name).toEqual(file.originalname)
- expect(data.size).toEqual(file.size)
- })
- it('should return an error when the file failed validation', async () => {
- const req = httpMocks.createRequest({
- fileValidationError: 'Only Word documents and PDFs are allowed',
- })
- const res = httpMocks.createResponse()
- await require('./routeHandlers/postFile')(req, res)
- expect(res.statusCode).toBe(400)
- const data = JSON.parse(res._getData())
- expect(data.error).toEqual(req.fileValidationError)
- })
-})
-
-describe('Zip files endpoint', () => {
- const testObject = {
- Key: 'KeyToMyHeart',
- Body: Buffer.alloc(10),
- Metadata: {
- filetype: 'manuscripts',
- filename: 'test.txt',
- },
- }
- const mockBucket = {
- RandomKey: {
- Contents: [testObject, testObject],
- },
- }
-
- const s3 = {}
- const mocks = {}
- let mockArchiver = null
- const s3Config = {
- bucket: 'TestBucket',
- }
- beforeAll(() => {
- s3.getObject = jest.fn((params, cb) => {
- cb(null, testObject)
- })
-
- s3.listObjects = jest.fn((params, cb) => {
- cb(null, mockBucket[params.Prefix])
- })
- mocks.pipe = jest.fn()
- mocks.append = jest.fn()
- mocks.finalize = jest.fn()
- mocks.attachment = jest.fn()
-
- mockArchiver = jest.fn(p => ({
- pipe: mocks.pipe,
- append: mocks.append,
- finalize: mocks.finalize,
- }))
- })
- afterEach(() => {
- s3.getObject.mockClear()
- s3.listObjects.mockClear()
- mocks.pipe.mockClear()
- mocks.append.mockClear()
- mocks.attachment.mockClear()
- })
- it(`no zipping if no files found`, async () => {
- const zipFiles = zipHandler(s3, s3Config, mockArchiver)
- const request = httpMocks.createRequest({
- method: 'GET',
- params: {
- fragmentId: 'NotFoundKey',
- },
- })
- const response = httpMocks.createResponse()
- response.attachment = mocks.attachment
-
- await zipFiles(request, response)
-
- expect(s3.listObjects.mock.calls).toHaveLength(1)
- expect(s3.getObject.mock.calls).toHaveLength(0)
- expect(mocks.attachment.mock.calls).toHaveLength(0)
- expect(mocks.append.mock.calls).toHaveLength(0)
- expect(mocks.pipe.mock.calls).toHaveLength(0)
-
- const responseData = JSON.parse(response._getData())
-
- expect(responseData.message).toEqual(
- `No files found for the requested manuscript.`,
- )
- expect(response._getStatusCode()).toEqual(204)
- })
- it('zips all the files', async () => {
- const zipFiles = zipHandler(s3, s3Config, mockArchiver)
-
- const request = httpMocks.createRequest({
- method: 'GET',
- params: {
- fragmentId: 'RandomKey',
- },
- })
- const response = httpMocks.createResponse()
- response.attachment = mocks.attachment
-
- await zipFiles(request, response)
-
- expect(s3.listObjects.mock.calls).toHaveLength(1)
- expect(s3.getObject.mock.calls).toHaveLength(2)
- expect(mocks.attachment.mock.calls).toHaveLength(1)
- expect(mocks.attachment.mock.calls[0][0]).toEqual('RandomKey-archive.zip')
- expect(mocks.append.mock.calls).toHaveLength(2)
- expect(mocks.pipe.mock.calls).toHaveLength(1)
- expect(response._getStatusCode()).toEqual(200)
- })
-})
-
-const getRandValueFromArray = arr => arr[Math.floor(Math.random() * arr.length)]
-
-const buildValidateFileParams = (fileType, mimetype) => {
- const req = {
- body: {
- fileType,
- },
- }
- const file = {
- mimetype,
- }
- const cb = (p1, p2) => {
- if (p2 === true) return true
- return false
- }
-
- return [req, file, cb]
-}
diff --git a/packages/component-local-aws/src/middeware/upload.js b/packages/component-local-aws/src/middeware/upload.js
deleted file mode 100644
index f46f4176621cfb62e3cfec3598a3ae0219b588e2..0000000000000000000000000000000000000000
--- a/packages/component-local-aws/src/middeware/upload.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const Joi = require('joi')
-const uuid = require('uuid')
-const config = require('config')
-const multer = require('multer')
-const { get } = require('lodash')
-const multerS3 = require('multer-s3')
-
-const s3Config = get(config, 'pubsweet-component-aws-s3')
-const uploadValidations = require(s3Config.validations)
-
-const setupMulter = s3 => {
- const upload = multer({
- storage: multerS3({
- s3,
- bucket: s3Config.bucket,
- contentType: (req, file, cb) => {
- cb(null, file.mimetype)
- },
- metadata: (req, file, cb) => {
- cb(null, {
- FileType: get(req, 'body.fileType'),
- FileName: get(file, 'originalname'),
- })
- },
- key: (req, file, cb) => {
- const fileKey = `${req.body.fragmentId}/${uuid.v4()}`
- cb(null, fileKey)
- },
- }),
- fileFilter: (req, file, cb) => validateFile(req, file, cb),
- })
-
- return upload
-}
-
-const validateFile = (req, file, cb) => {
- const { fileType } = req.body
- const { mimetype } = file
-
- const valid = Joi.validate({ [fileType]: mimetype }, uploadValidations)
-
- if (valid.error) {
- req.fileValidationError = valid.error.message
- return cb(null, false)
- }
-
- return cb(null, true)
-}
-
-module.exports = {
- setupMulter,
- validateFile,
-}
diff --git a/packages/component-local-aws/src/routeHandlers/deleteFile.js b/packages/component-local-aws/src/routeHandlers/deleteFile.js
deleted file mode 100644
index 9aa8974b76a053f0ea4229464c1f8ec9830c8fa3..0000000000000000000000000000000000000000
--- a/packages/component-local-aws/src/routeHandlers/deleteFile.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const { promisify } = require('util')
-const logger = require('@pubsweet/logger')
-
-const deleteFile = (s3, s3Config) => {
- const asyncDeleteObject = promisify(s3.deleteObject.bind(s3))
- return async (req, res) => {
- const params = {
- Bucket: s3Config.bucket,
- Key: `${req.params.fragmentId}/${req.params.fileId}`,
- }
-
- try {
- await asyncDeleteObject(params)
- res.status(204)
- } catch (err) {
- logger.error(err.message)
- res.status(err.statusCode).json({ error: err.message })
- }
- }
-}
-
-module.exports = deleteFile
diff --git a/packages/component-local-aws/src/routeHandlers/getSignedUrl.js b/packages/component-local-aws/src/routeHandlers/getSignedUrl.js
deleted file mode 100644
index edbad710242df2428920f69405c4313bd9f6c452..0000000000000000000000000000000000000000
--- a/packages/component-local-aws/src/routeHandlers/getSignedUrl.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const { promisify } = require('util')
-const logger = require('@pubsweet/logger')
-
-const getSignedUrl = (s3, s3Config) => {
- const asyncGetSignedUrl = promisify(s3.getSignedUrl.bind(s3))
- return async (req, res) => {
- const params = {
- Bucket: s3Config.bucket,
- Key: `${req.params.fragmentId}/${req.params.fileId}`,
- }
-
- try {
- const signedUrl = await asyncGetSignedUrl(params)
- res.status(200).json({
- signedUrl,
- })
- } catch (err) {
- logger.error(err.message)
- res.status(err.statusCode).json({ error: err.message })
- }
- }
-}
-
-module.exports = getSignedUrl
diff --git a/packages/component-local-aws/src/routeHandlers/postFile.js b/packages/component-local-aws/src/routeHandlers/postFile.js
deleted file mode 100644
index 228c78fed2d5914cf1134453255053d7524c63d0..0000000000000000000000000000000000000000
--- a/packages/component-local-aws/src/routeHandlers/postFile.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const logger = require('@pubsweet/logger')
-
-module.exports = async (req, res) => {
- if (req.fileValidationError !== undefined) {
- logger.error(req.fileValidationError)
- return res.status(400).json({ error: req.fileValidationError })
- }
- logger.debug(`${req.file.originalname} has been uploaded`)
-
- return res.status(200).json({
- id: req.file.key,
- name: req.file.originalname,
- size: req.file.size,
- })
-}
diff --git a/packages/component-local-aws/src/routeHandlers/zipFiles.js b/packages/component-local-aws/src/routeHandlers/zipFiles.js
deleted file mode 100644
index 272eccbfb8e93b7a96b6c573259c047d613f0a06..0000000000000000000000000000000000000000
--- a/packages/component-local-aws/src/routeHandlers/zipFiles.js
+++ /dev/null
@@ -1,55 +0,0 @@
-const { get } = require('lodash')
-const { promisify } = require('util')
-const nodeArchiver = require('archiver')
-const logger = require('@pubsweet/logger')
-
-const zipFiles = (s3, s3Config, archiver = nodeArchiver) => {
- const asyncGetObject = promisify(s3.getObject.bind(s3))
- const asyncListObjects = promisify(s3.listObjects.bind(s3))
- return async (req, res) => {
- const { fragmentId } = req.params
- try {
- const params = {
- Bucket: s3Config.bucket,
- Prefix: `${fragmentId}`,
- }
- const s3Items = await asyncListObjects(params)
-
- if (s3Items) {
- const s3Files = await Promise.all(
- s3Items.Contents.map(content =>
- asyncGetObject({
- Bucket: s3Config.bucket,
- Key: content.Key,
- }),
- ),
- )
-
- if (s3Files) {
- const archive = archiver('zip')
- archive.pipe(res)
- res.attachment(`${fragmentId}-archive.zip`)
-
- s3Files.forEach(f => {
- archive.append(f.Body, {
- name: `${get(f, 'Metadata.filetype') || 'supplementary'}/${get(
- f,
- 'Metadata.filename',
- ) || f.ETag}`,
- })
- })
- archive.finalize()
- }
- } else {
- res.status(204).json({
- message: `No files found for the requested manuscript.`,
- })
- }
- } catch (err) {
- logger.error(err.message)
- res.status(err.statusCode).json({ error: err.message })
- }
- }
-}
-
-module.exports = zipFiles
diff --git a/packages/component-wizard/src/redux/conversion.js b/packages/component-wizard/src/redux/conversion.js
index b41a93f5d376e38a42425b6d54db367fc67d898b..a290931bb5c244bf166523909cf1c2a1fa3cb228 100644
--- a/packages/component-wizard/src/redux/conversion.js
+++ b/packages/component-wizard/src/redux/conversion.js
@@ -69,7 +69,7 @@ export const createDraftSubmission = history => (dispatch, getState) => {
// redirect after a short delay
window.setTimeout(() => {
history.push(route)
- }, 1000)
+ }, 10)
})
})
}
diff --git a/packages/components-faraday/src/components/Admin/AddEditUser.js b/packages/components-faraday/src/components/Admin/AddEditUser.js
index fa5a61a9b74dcd7775b08038897a0cb894f07227..45454fbd8e06f202d4776d3ad3f6c51c68cad6d7 100644
--- a/packages/components-faraday/src/components/Admin/AddEditUser.js
+++ b/packages/components-faraday/src/components/Admin/AddEditUser.js
@@ -19,13 +19,13 @@ const onSubmit = (values, dispatch, { isEdit, history }) => {
if (!isEdit) {
const newValues = setAdmin(values)
return create('/users/invite', newValues)
- .then(r => history.push('/admin/users'))
+ .then(() => history.push('/admin/users'))
.catch(error => {
const err = get(error, 'response')
if (err) {
const errorMessage = get(JSON.parse(err), 'error')
throw new SubmissionError({
- email: errorMessage || 'Something went wrong',
+ _error: errorMessage || 'Something went wrong',
})
}
})
@@ -40,23 +40,35 @@ const onSubmit = (values, dispatch, { isEdit, history }) => {
if (err) {
const errorMessage = get(JSON.parse(err), 'error')
throw new SubmissionError({
- roles: errorMessage || 'Something went wrong',
+ _error: errorMessage || 'Something went wrong',
})
}
})
}
-const AddEditUser = ({ handleSubmit, journal, isEdit, user, history }) => (
+const AddEditUser = ({
+ handleSubmit,
+ journal,
+ isEdit,
+ user,
+ history,
+ error,
+}) => (
<Root>
<FormContainer onSubmit={handleSubmit}>
{isEdit ? (
<EditUserForm
+ error={error}
journal={journal}
roles={getRoleOptions(journal)}
user={user}
/>
) : (
- <AddUserForm journal={journal} roles={getRoleOptions(journal)} />
+ <AddUserForm
+ error={error}
+ journal={journal}
+ roles={getRoleOptions(journal)}
+ />
)}
<Row>
<Button onClick={history.goBack}>Back</Button>
diff --git a/packages/components-faraday/src/components/Admin/AddUserForm.js b/packages/components-faraday/src/components/Admin/AddUserForm.js
index 4317c2c4fbd0d4444bc9be8d203c86726670a388..df8e96e0561b86d1748a70932322d396b0c5668b 100644
--- a/packages/components-faraday/src/components/Admin/AddUserForm.js
+++ b/packages/components-faraday/src/components/Admin/AddUserForm.js
@@ -1,10 +1,17 @@
import React from 'react'
import styled from 'styled-components'
-import { ValidatedField, TextField, Menu } from '@pubsweet/ui'
+import { ValidatedField, TextField, Menu, th } from '@pubsweet/ui'
import { required } from 'xpub-validators'
-const AddUserForm = ({ roles, journal }) => {
+const emailRegex = new RegExp(
+ /^(([^<>()\[\]\.,;:\s@\"]+(\.[^<>()\[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i, //eslint-disable-line
+)
+
+const emailValidator = value =>
+ emailRegex.test(value) ? undefined : 'Invalid email'
+
+const AddUserForm = ({ roles, journal, error }) => {
const roleOptions = roles.filter(r =>
['editorInChief', 'author', 'admin'].includes(r.value),
)
@@ -17,10 +24,10 @@ const AddUserForm = ({ roles, journal }) => {
<ValidatedField
component={TextField}
name="email"
- validate={[required]}
+ validate={[emailValidator]}
/>
</RowItem>
- <RowItem>
+ <RowItem data-test="role-selector">
<Label> Role*</Label>
<ValidatedField
component={input => <Menu {...input} options={roleOptions} />}
@@ -44,7 +51,7 @@ const AddUserForm = ({ roles, journal }) => {
<Label> Affiliation </Label>
<ValidatedField component={TextField} name="affiliation" />
</RowItem>
- <RowItem>
+ <RowItem data-test="title-selector">
<Label> Title </Label>
<ValidatedField
component={input => <Menu {...input} options={journal.title} />}
@@ -52,6 +59,9 @@ const AddUserForm = ({ roles, journal }) => {
/>
</RowItem>
</Row>
+ <Row>
+ <RowItem>{error && <ErrorMessage>{error}</ErrorMessage>}</RowItem>
+ </Row>
</div>
)
}
@@ -63,22 +73,27 @@ export default AddUserForm
const Row = styled.div`
display: flex;
flex-direction: row;
- margin: 20px 0;
+ margin: calc(${th('subGridUnit')}*3) 0;
`
const RowItem = styled.div`
flex: 1;
- margin-right: 20px;
+ margin-right: calc(${th('subGridUnit')}*3);
`
const Title = styled.h4`
- font-size: ${({ theme }) => theme.fontSizeHeading4};
- color: ${({ theme }) => theme.colorPrimary};
- margin: 10px 0;
+ font-size: ${th('fontSizeHeading4')};
+ color: ${th('colorPrimary')};
+ margin: calc(${th('subGridUnit')}*2) 0;
`
const Label = styled.div`
- font-size: ${({ theme }) => theme.fontSizeBase};
+ font-size: ${th('fontSizeBase')};
text-transform: uppercase;
`
+
+const ErrorMessage = styled.div`
+ color: ${th('colorError')};
+`
+
// #endregion
diff --git a/packages/components-faraday/src/components/Admin/AdminDashboard.js b/packages/components-faraday/src/components/Admin/AdminDashboard.js
index b36d692ea13982415d60c8355ff33d8293b159c8..5b138406023bf787f602ed026686d3e47d32a5fe 100644
--- a/packages/components-faraday/src/components/Admin/AdminDashboard.js
+++ b/packages/components-faraday/src/components/Admin/AdminDashboard.js
@@ -12,7 +12,7 @@ const AdminDashboard = ({ history, theme }) => (
</Icon>
<span>Journal configuration</span>
</Card>
- <Card onClick={() => history.push('/admin/users')}>
+ <Card data-test="card-users" onClick={() => history.push('/admin/users')}>
<Icon color={theme.colorPrimary} size={6}>
users
</Icon>
diff --git a/packages/components-faraday/src/components/Admin/AdminUsers.js b/packages/components-faraday/src/components/Admin/AdminUsers.js
index 01fcf26ab469c26c4c9d3b9aec37118554f613cc..4185c022c7a6c704fdacb35f20039c4d29690789 100644
--- a/packages/components-faraday/src/components/Admin/AdminUsers.js
+++ b/packages/components-faraday/src/components/Admin/AdminUsers.js
@@ -1,5 +1,5 @@
import React from 'react'
-import { get } from 'lodash'
+import { get, isEqual } from 'lodash'
import { connect } from 'react-redux'
import styled, { withTheme } from 'styled-components'
import { Icon, Menu, th } from '@pubsweet/ui'
@@ -23,6 +23,8 @@ const TableRow = ({
lastName = '',
affiliation,
isConfirmed,
+ editorInChief,
+ admin,
roleOptions,
}) => (
<Row>
@@ -33,12 +35,9 @@ const TableRow = ({
<td>{`${firstName} ${lastName}`}</td>
<td>{affiliation}</td>
<td>
- {roles &&
- roles.map((r, i, arr) => (
- <Role key={r}>{`${roleOptions[r]}${
- i !== arr.length - 1 ? ', ' : ''
- }`}</Role>
- ))}
+ <Role>{`Author${isEqual(editorInChief, true) ? ', Editor in Chief' : ''}${
+ isEqual(admin, true) ? ', Admin' : ''
+ }`}</Role>
</td>
<td>
<Tag>{isConfirmed ? 'Confirmed' : 'Invited'}</Tag>
@@ -72,7 +71,10 @@ const Users = ({
<span>Admin Dashboard</span>
<span>Users</span>
</BreadCrumbs>
- <AddButton onClick={() => history.push('/admin/users/add')}>
+ <AddButton
+ data-test="button-add-user"
+ onClick={() => history.push('/admin/users/add')}
+ >
<Icon color={theme.colorPrimary} size={3}>
plus-circle
</Icon>
@@ -129,7 +131,7 @@ const Users = ({
<td>Email</td>
<td>Full name</td>
<td>Affiliation</td>
- <td width="200">Roles</td>
+ <td width="220">Roles</td>
<td>Status</td>
<td width="50" />
</tr>
@@ -297,12 +299,12 @@ const Tag = styled.span`
margin-right: calc(${th('subGridUnit')});
`
-const Role = styled.span`
- height: 17px;
+const Role = styled.div`
font-size: ${th('fontSizeBaseSmall')};
text-align: left;
color: ${th('colorPrimary')};
text-transform: uppercase;
+ line-height: 1.5;
`
const Action = styled(Link)`
diff --git a/packages/components-faraday/src/components/Admin/EditUserForm.js b/packages/components-faraday/src/components/Admin/EditUserForm.js
index 1f908b0a589e2c1b32d9d7e36a107511355a84c0..ecbef0d9aff2bc5ad41ab4706a3da6cf313e5d95 100644
--- a/packages/components-faraday/src/components/Admin/EditUserForm.js
+++ b/packages/components-faraday/src/components/Admin/EditUserForm.js
@@ -1,66 +1,92 @@
import React from 'react'
import styled from 'styled-components'
-import { ValidatedField, TextField, Menu, CheckboxGroup } from '@pubsweet/ui'
+import { ValidatedField, TextField, Menu, Checkbox, th } from '@pubsweet/ui'
import { required } from 'xpub-validators'
-const EditUserForm = ({ roles, journal, user }) => {
- const roleOptions = roles.filter(r =>
- ['editorInChief', 'author', 'admin'].includes(r.value),
- )
- return (
- <div>
- <Title>Edit user</Title>
- <Subtitle>{user.email}</Subtitle>
- <Row>
- <RowItem>
- <Label> First name* </Label>
- <ValidatedField
- component={TextField}
- name="firstName"
- validate={[required]}
- />
- </RowItem>
- <RowItem>
- <Label> Last name* </Label>
- <ValidatedField
- component={TextField}
- name="lastName"
- validate={[required]}
- />
- </RowItem>
- </Row>
- <Row>
- <RowItem>
- <Label> Affiliation* </Label>
- <ValidatedField
- component={TextField}
- name="affiliation"
- validate={[required]}
- />
- </RowItem>
- <RowItem>
- <Label> Title* </Label>
- <ValidatedField
- component={input => <Menu {...input} options={journal.title} />}
- name="title"
- />
- </RowItem>
- </Row>
- <Row>
- <RowItem>
- <Label> Roles*</Label>
- <ValidatedField
- component={input => (
- <CheckboxGroup {...input} options={roleOptions} />
- )}
- name="roles"
- />
- </RowItem>
- </Row>
- </div>
- )
-}
+const EditUserForm = ({ roles, journal, user, error }) => (
+ <div>
+ <Title>Edit user</Title>
+ <Subtitle>{user.email}</Subtitle>
+ <Row>
+ <RowItem>
+ <Label> First name* </Label>
+ <ValidatedField
+ component={TextField}
+ name="firstName"
+ validate={[required]}
+ />
+ </RowItem>
+ <RowItem>
+ <Label> Last name* </Label>
+ <ValidatedField
+ component={TextField}
+ name="lastName"
+ validate={[required]}
+ />
+ </RowItem>
+ </Row>
+ <Row>
+ <RowItem>
+ <Label> Affiliation* </Label>
+ <ValidatedField
+ component={TextField}
+ name="affiliation"
+ validate={[required]}
+ />
+ </RowItem>
+ <RowItem>
+ <Label> Title* </Label>
+ <ValidatedField
+ component={input => <Menu {...input} options={journal.title} />}
+ name="title"
+ />
+ </RowItem>
+ </Row>
+ <Row>
+ <RowItem>
+ <Label> Roles*</Label>
+ <ValidatedField
+ component={input => (
+ <Checkbox
+ checked
+ readonly
+ type="checkbox"
+ {...input}
+ label="Author"
+ />
+ )}
+ name="author"
+ />
+ <ValidatedField
+ component={input => (
+ <Checkbox
+ checked={input.value}
+ type="checkbox"
+ {...input}
+ label="Editor in Chief"
+ />
+ )}
+ name="editorInChief"
+ />
+ <ValidatedField
+ component={input => (
+ <Checkbox
+ checked={input.value}
+ type="checkbox"
+ {...input}
+ label="Admin"
+ />
+ )}
+ name="admin"
+ />
+ </RowItem>
+ </Row>
+ <Row>
+ <RowItem>{error && <ErrorMessage>{error}</ErrorMessage>}</RowItem>
+ </Row>
+ </div>
+)
export default EditUserForm
@@ -69,29 +95,33 @@ export default EditUserForm
const Row = styled.div`
display: flex;
flex-direction: row;
- margin: 20px 0;
- background-color: ${({ theme }) => theme.backgroundColorReverse};
+ margin: calc(${th('subGridUnit')}*3) 0;
+ background-color: ${th('backgroundColorReverse')};
`
const RowItem = styled.div`
flex: 1;
- margin-right: 20px;
+ margin-right: calc(${th('subGridUnit')}*3);
`
const Title = styled.h4`
- font-size: ${({ theme }) => theme.fontSizeHeading4};
- color: ${({ theme }) => theme.colorPrimary};
- margin: 10px 0;
+ font-size: ${th('fontSizeHeading4')};
+ color: ${th('colorPrimary')};
+ margin: calc(${th('subGridUnit')}*2) 0;
`
const Subtitle = styled.div`
- font-size: ${({ theme }) => theme.fontSizeBase};
- color: ${({ theme }) => theme.colorPrimary};
+ font-size: ${th('fontSizeBase')};
+ color: ${th('colorPrimary')};
margin: 0;
`
const Label = styled.div`
- font-size: ${({ theme }) => theme.fontSizeBase};
+ font-size: ${th('fontSizeBase')};
text-transform: uppercase;
`
+const ErrorMessage = styled.div`
+ color: ${th('colorError')};
+`
+
// #endregion
diff --git a/packages/components-faraday/src/components/Admin/utils.js b/packages/components-faraday/src/components/Admin/utils.js
index de7049e4123d0e4ef6ef174a757da7024a4fae50..18d68678757f353480e592d49f094e0e98129b11 100644
--- a/packages/components-faraday/src/components/Admin/utils.js
+++ b/packages/components-faraday/src/components/Admin/utils.js
@@ -23,8 +23,8 @@ export const parseUpdateUser = values => {
'title',
'roles',
'rev',
+ 'editorInChief',
]
- const newValues = setAdmin(values)
- return pick(newValues, valuesToSave)
+ return pick(values, valuesToSave)
}
diff --git a/packages/components-faraday/src/components/AuthorList/AuthorAdder.js b/packages/components-faraday/src/components/AuthorList/AuthorAdder.js
index 2cb1d3258fbd47afa1004fa0fb6af36b29a46314..aef24acfa0d5657ceebb00eaf8bbc2f03b915895 100644
--- a/packages/components-faraday/src/components/AuthorList/AuthorAdder.js
+++ b/packages/components-faraday/src/components/AuthorList/AuthorAdder.js
@@ -110,9 +110,11 @@ export default compose(
fragmentId,
).then(author => {
const newAuthors = [...authors, author]
- setFormAuthors(newAuthors)
- reset()
setEditMode(false)()
+ setTimeout(() => {
+ setFormAuthors(newAuthors)
+ }, 1000)
+ reset()
})
},
}),
diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
index 007ee79b890e6de705d5b8e1946d2311682920ed..6337b777a46e2fc6c42d694799bdee42972ce38c 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
@@ -24,6 +24,7 @@ const SignUpInvitation = ({
{error && <Err>Token expired or Something went wrong.</Err>}
{step === 0 && (
<Step0
+ error={error}
initialValues={initialValues}
journal={journal}
onSubmit={nextStep}
@@ -31,6 +32,7 @@ const SignUpInvitation = ({
)}
{step === 1 && (
<Step1
+ error={error}
initialValues={initialValues}
journal={journal}
onSubmit={submitConfirmation}
diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
index 6dcd11f46d9ed9d331c718c5a52d37e22095102f..5699888919716ae1dca12dc72f1984ac073be373 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
@@ -42,7 +42,7 @@ const confirmUser = (email, token, history) => (values, dispatch) => {
if (err) {
const errorMessage = get(JSON.parse(err), 'error')
throw new SubmissionError({
- password: errorMessage || 'Something went wrong',
+ _error: errorMessage || 'Something went wrong',
})
}
})
diff --git a/packages/components-faraday/src/components/SignUp/SignUpStep0.js b/packages/components-faraday/src/components/SignUp/SignUpStep0.js
index e14fd717c1e26caece81c55f4061bc8904e7061f..2fb7bb2fd62e2331474c866ec81d46dfabc27457 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpStep0.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpStep0.js
@@ -5,7 +5,7 @@ import { isUndefined } from 'lodash'
import { required } from 'xpub-validators'
import { Button, ValidatedField, TextField, Menu } from '@pubsweet/ui'
-const Step0 = ({ journal, handleSubmit, initialValues }) =>
+const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
!isUndefined(initialValues) ? (
<FormContainer onSubmit={handleSubmit}>
<Row>
@@ -18,23 +18,24 @@ const Step0 = ({ journal, handleSubmit, initialValues }) =>
/>
</RowItem>
<RowItem>
- <Label> Affiliation* </Label>
+ <Label> Last name* </Label>
<ValidatedField
component={TextField}
- name="affiliation"
+ name="lastName"
validate={[required]}
/>
</RowItem>
</Row>
<Row>
<RowItem>
- <Label> Last name* </Label>
+ <Label> Affiliation* </Label>
<ValidatedField
component={TextField}
- name="lastName"
+ name="affiliation"
validate={[required]}
/>
</RowItem>
+
<RowItem>
<Label> Title* </Label>
<ValidatedField
@@ -51,7 +52,7 @@ const Step0 = ({ journal, handleSubmit, initialValues }) =>
</Row>
</FormContainer>
) : (
- <div>Loading...</div>
+ <div>{!isUndefined(error) && 'Loading...'}</div>
)
export default reduxForm({
diff --git a/packages/components-faraday/src/components/SignUp/SignUpStep1.js b/packages/components-faraday/src/components/SignUp/SignUpStep1.js
index 7109f6c581422a6499788836fa9b40df01988acd..260aa47d1854ca5ceb793cceb0d3e2ba43a648e8 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpStep1.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpStep1.js
@@ -2,9 +2,9 @@ import React from 'react'
import styled from 'styled-components'
import { reduxForm } from 'redux-form'
import { required } from 'xpub-validators'
-import { Button, ValidatedField, TextField } from '@pubsweet/ui'
+import { Button, ValidatedField, TextField, th } from '@pubsweet/ui'
-const Step1 = ({ journal, handleSubmit }) => (
+const Step1 = ({ journal, handleSubmit, error }) => (
<FormContainer onSubmit={handleSubmit}>
<Row>
<RowItem>
@@ -16,6 +16,13 @@ const Step1 = ({ journal, handleSubmit }) => (
/>
</RowItem>
</Row>
+ {error && (
+ <Row>
+ <RowItem>
+ <Err>{error}</Err>
+ </RowItem>
+ </Row>
+ )}
<Row>
<Button primary type="submit">
CONFIRM
@@ -35,18 +42,23 @@ const FormContainer = styled.form``
const Row = styled.div`
display: flex;
flex-direction: row;
- margin: 20px 0;
+ margin: ${th('gridUnit')} 0;
align-items: center;
justify-content: space-evenly;
`
const RowItem = styled.div`
flex: 1;
- margin-right: 20px;
+ margin-right: ${th('gridUnit')};
`
const Label = styled.div`
- font-size: ${({ theme }) => theme.fontSizeBaseSmall};
- font-family: ${({ theme }) => theme.fontReading};
+ font-size: ${th('fontSizeBaseSmall')};
+ font-family: ${th('fontReading')};
text-transform: uppercase;
`
+const Err = styled.div`
+ color: ${th('colorError')};
+ text-align: left;
+ margin-top: calc(${th('gridUnit')}*-1);
+`
diff --git a/packages/components-faraday/src/redux/authors.js b/packages/components-faraday/src/redux/authors.js
index c9a863d768a3efe1a824667ef4e8f52528c0a859..a4219d6ae9872ef33d02364f2371bc01531bc1bd 100644
--- a/packages/components-faraday/src/redux/authors.js
+++ b/packages/components-faraday/src/redux/authors.js
@@ -1,5 +1,4 @@
import { get } from 'lodash'
-import * as api from 'pubsweet-client/src/helpers/api'
// constants
const REQUEST = 'authors/REQUEST'
@@ -20,19 +19,8 @@ export const authorSuccess = () => ({
type: SUCCESS,
})
-export const addAuthor = (author, collectionId, fragmentId) => dispatch => {
- dispatch(authorRequest())
- return api
- .create(
- `/collections/${collectionId}/fragments/${fragmentId}/authors`,
- author,
- )
- .then(author => {
- dispatch(authorSuccess())
- return author
- })
- .catch(err => dispatch(authorFaiure(err)))
-}
+export const addAuthor = (author, collectionId, fragmentId) => dispatch =>
+ Promise.resolve(author)
// selectors
export const getFragmentAuthors = (state, fragmentId) =>
diff --git a/packages/xpub-faraday/app/config/journal/submit-wizard.js b/packages/xpub-faraday/app/config/journal/submit-wizard.js
index 5f3ff6b7461f3526f7c487009da1b8b02d0d5e61..ab50d4ab1c3067a9977febbb0ae7444d80880189 100644
--- a/packages/xpub-faraday/app/config/journal/submit-wizard.js
+++ b/packages/xpub-faraday/app/config/journal/submit-wizard.js
@@ -1,9 +1,7 @@
import React from 'react'
import styled from 'styled-components'
import uploadFileFn from 'xpub-upload'
-// TODO: Add back abstract when xpub-edit is published
-// import { AbstractEditor, TitleEditor } from 'xpub-edit'
-import { TitleEditor } from 'xpub-edit'
+import { AbstractEditor, TitleEditor } from 'xpub-edit'
import { Menu, YesOrNo, TextField, CheckboxGroup } from '@pubsweet/ui'
import { required, minChars, minSize } from 'xpub-validators'
import { AuthorList, Files } from 'pubsweet-components-faraday/src/components'
@@ -140,7 +138,7 @@ export default {
},
{
fieldId: 'metadata.abstract',
- renderComponent: TitleEditor,
+ renderComponent: AbstractEditor,
title: 'Abstract',
placeholder: 'Write an abstract',
validate: [requiredBasedOnType],
diff --git a/packages/xpub-faraday/app/config/journal/wizard-validators.js b/packages/xpub-faraday/app/config/journal/wizard-validators.js
index 8504e61f02765ae8e83a9f2f43063801258e2d10..bec3371d1699e67c3ef81688f26205bee7328b46 100644
--- a/packages/xpub-faraday/app/config/journal/wizard-validators.js
+++ b/packages/xpub-faraday/app/config/journal/wizard-validators.js
@@ -30,9 +30,9 @@ export const editModeEnabled = value => {
return undefined
}
-export const requiredFiles = (valus, formValues) => {
+export const requiredFiles = (values, formValues) => {
const manuscripts = get(formValues, 'files.manuscripts')
- if (manuscripts && manuscripts.length === 0) {
+ if (!manuscripts || manuscripts.length === 0) {
return 'At least one main manuscript file is needed.'
}
return undefined
diff --git a/packages/xpub-faraday/config/components.json b/packages/xpub-faraday/config/components.json
index 7a1555ce9bc5d36ac95e3eca4e33f466e66511e4..4f60ab58b80cd788c524e30b0cce9b010c05fe7a 100644
--- a/packages/xpub-faraday/config/components.json
+++ b/packages/xpub-faraday/config/components.json
@@ -6,7 +6,5 @@
"pubsweet-component-modal",
"pubsweet-components-faraday",
"@pubsweet/component-aws-s3",
- "pubsweet-component-invite",
- "component-aws-download",
- "component-local-aws"
+ "pubsweet-component-invite"
]
diff --git a/packages/xpub-faraday/package.json b/packages/xpub-faraday/package.json
index ea94799bfadc6b0d79c9ceff8afbd55d0ba0ad62..177fd1eb708fc8cc9d7dde29c095fcb5a872061e 100644
--- a/packages/xpub-faraday/package.json
+++ b/packages/xpub-faraday/package.json
@@ -8,8 +8,8 @@
"url": "https://gitlab.coko.foundation/xpub/xpub-faraday"
},
"dependencies": {
- "@pubsweet/component-aws-s3": "^0.1.1",
- "@pubsweet/ui": "^3.0.0",
+ "@pubsweet/ui": "^3.2.0",
+ "@pubsweet/component-aws-s3": "^1.0.0",
"aws-sdk": "^2.197.0",
"babel-core": "^6.26.0",
"config": "^1.26.2",
@@ -42,7 +42,8 @@
"typeface-ubuntu-mono": "^0.0.54",
"winston": "^2.4.0",
"xpub-connect": "^0.0.3",
- "xpub-edit": "^0.0.3",
+ "xpub-edit": "^0.0.4",
+ "xpub-faraday-server": "^0.0.1",
"xpub-journal": "^0.0.3",
"xpub-selectors": "^0.0.3",
"xpub-styleguide": "^0.0.3",
diff --git a/yarn.lock b/yarn.lock
index 85ae4cc4c525ed3719b948afa6bd8be99f92df01..8ffb522b4d849f6b522ee7d55e86bb0a682a39e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -78,10 +78,11 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"
-"@pubsweet/component-aws-s3@^0.1.1":
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/@pubsweet/component-aws-s3/-/component-aws-s3-0.1.1.tgz#2faa379c1b8c12dbc6573a5627b09f536a484cc3"
+"@pubsweet/component-aws-s3@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@pubsweet/component-aws-s3/-/component-aws-s3-1.0.0.tgz#5cb1715709ba5ad7b8ad79d1ef42d6818d17ca3e"
dependencies:
+ archiver "^2.1.1"
aws-sdk "^2.185.0"
body-parser "^1.17.2"
multer "^1.3.0"
@@ -171,7 +172,7 @@
redux-form "^7.0.3"
styled-components "^2.4.0"
-"@pubsweet/ui@^3.0.0", "@pubsweet/ui@^3.1.0":
+"@pubsweet/ui@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@pubsweet/ui/-/ui-3.1.0.tgz#24c25c29fc36e34b9f654fe4378502232f8204fa"
dependencies:
@@ -193,6 +194,28 @@
redux-form "^7.0.3"
styled-components "^2.4.0"
+"@pubsweet/ui@^3.2.0":
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/@pubsweet/ui/-/ui-3.2.0.tgz#b787f1bb53fa818aade863c221bf47e2929e669e"
+ dependencies:
+ babel-jest "^21.2.0"
+ classnames "^2.2.5"
+ enzyme "^3.2.0"
+ enzyme-adapter-react-16 "^1.1.1"
+ humps "^2.0.1"
+ lodash "^4.17.4"
+ prop-types "^15.5.10"
+ react "^16.2.0"
+ react-dom "^16.2.0"
+ react-feather "^1.0.8"
+ react-redux "^5.0.2"
+ react-router-dom "^4.2.2"
+ react-tag-autocomplete "^5.5.0"
+ recompose "^0.26.0"
+ redux "^3.6.0"
+ redux-form "^7.0.3"
+ styled-components "^2.4.0"
+
"@types/node@*":
version "9.4.6"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e"
@@ -3034,7 +3057,19 @@ enzyme-adapter-react-15@^1.0.5:
object.values "^1.0.4"
prop-types "^15.5.10"
-enzyme-adapter-utils@^1.1.0:
+enzyme-adapter-react-16@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.1.tgz#a8f4278b47e082fbca14f5bfb1ee50ee650717b4"
+ dependencies:
+ enzyme-adapter-utils "^1.3.0"
+ lodash "^4.17.4"
+ object.assign "^4.0.4"
+ object.values "^1.0.4"
+ prop-types "^15.6.0"
+ react-reconciler "^0.7.0"
+ react-test-renderer "^16.0.0-0"
+
+enzyme-adapter-utils@^1.1.0, enzyme-adapter-utils@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.3.0.tgz#d6c85756826c257a8544d362cc7a67e97ea698c7"
dependencies:
@@ -7686,6 +7721,15 @@ react-proxy@^3.0.0-alpha.0:
dependencies:
lodash "^4.6.1"
+react-reconciler@^0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d"
+ dependencies:
+ fbjs "^0.8.16"
+ loose-envify "^1.1.0"
+ object-assign "^4.1.1"
+ prop-types "^15.6.0"
+
react-redux@^5.0.2, react-redux@^5.0.6, react-redux@^5.0.7:
version "5.0.7"
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8"
@@ -7728,10 +7772,18 @@ react-router@^4.2.0:
prop-types "^15.5.4"
warning "^3.0.0"
-react-tag-autocomplete@^5.4.1:
+react-tag-autocomplete@^5.4.1, react-tag-autocomplete@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/react-tag-autocomplete/-/react-tag-autocomplete-5.5.0.tgz#49841388b88323f6bccb0c10039bd0252875b49f"
+react-test-renderer@^16.0.0-0:
+ version "16.2.0"
+ resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211"
+ dependencies:
+ fbjs "^0.8.16"
+ object-assign "^4.1.1"
+ prop-types "^15.6.0"
+
react-transition-group@^2.0.0, react-transition-group@^2.2.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.2.1.tgz#e9fb677b79e6455fd391b03823afe84849df4a10"
@@ -9835,11 +9887,11 @@ xpub-connect@^0.0.3:
redux "^3.6.0"
styled-components "^2.4.0"
-xpub-edit@^0.0.3:
- version "0.0.3"
- resolved "https://registry.yarnpkg.com/xpub-edit/-/xpub-edit-0.0.3.tgz#76947a18140d1b61c460fcd96127569d322e0da7"
+xpub-edit@^0.0.4:
+ version "0.0.4"
+ resolved "https://registry.yarnpkg.com/xpub-edit/-/xpub-edit-0.0.4.tgz#2d20d4ab0ba83ac0b4b3d3f273a74da1518b55d1"
dependencies:
- "@pubsweet/ui" "3.0.0"
+ "@pubsweet/ui" "^3.2.0"
prosemirror-commands "^1.0.1"
prosemirror-dropcursor "^1.0.0"
prosemirror-gapcursor "^1.0.0"
@@ -9849,8 +9901,6 @@ xpub-edit@^0.0.3:
prosemirror-model "^1.0.0"
prosemirror-state "^1.0.1"
prosemirror-view "^1.0.0"
- react "^16.2.0"
- react-dom "^16.2.0"
xpub-journal@^0.0.3:
version "0.0.3"