diff --git a/.gitlab-ci.coko.yml b/.gitlab-ci.aperture.yml
similarity index 89%
rename from .gitlab-ci.coko.yml
rename to .gitlab-ci.aperture.yml
index f8689c2fedbce146070e783e3982e67099498887..c168b2d7d7d8a2b2f948f3fed0371b4247417895 100644
--- a/.gitlab-ci.coko.yml
+++ b/.gitlab-ci.aperture.yml
@@ -18,12 +18,12 @@ build:
- docker:20.10.5-dind
stage: build
before_script:
- - cp app/brand-instances-configs/coko.json app/brandConfig.json
+ - cp app/brand-instances-configs/aperture.json app/brandConfig.json
script:
- |
if [ -z "$DOCKERHUB_USERNAME" ] || [ -z "$DOCKERHUB_PASSWORD" ]; then echo "Not pushing" && exit 0; fi
docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
- docker build --build-arg instance_name=coko --file ./Dockerfile-ci --cache-from $IMAGE_ORG/$IMAGE_NAME:latest --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA --tag $IMAGE_ORG/$IMAGE_NAME:latest .
+ docker build --build-arg instance_name=aperture --file ./Dockerfile-ci --cache-from $IMAGE_ORG/$IMAGE_NAME:latest --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA --tag $IMAGE_ORG/$IMAGE_NAME:latest .
docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
docker push $IMAGE_ORG/$IMAGE_NAME:latest
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6193f59aa7349b670c552e08b95cf4c0036a8b6..8665c332d30fc729353ada3214f26e28c8c3364b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,9 +21,9 @@ ncrc-pipeline:
- local: .gitlab-ci.ncrc.yml
strategy: depend
-coko-pipeline:
+aperture-pipeline:
stage: run-pipeline
trigger:
include:
- - local: .gitlab-ci.coko.yml
+ - local: .gitlab-ci.aperture.yml
strategy: depend
diff --git a/app/brand-instances-configs/coko.json b/app/brand-instances-configs/coko.json
deleted file mode 100644
index ccdf176bcfc96002b7dd5a3b03969dd7c040e5ac..0000000000000000000000000000000000000000
--- a/app/brand-instances-configs/coko.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "logoPath": "/public/logo-kotahi.png",
- "primaryColor": "red",
- "secondaryColor": "blue",
- "brandName": "Coko"
-}
diff --git a/app/components/AdminPage.js b/app/components/AdminPage.js
index aa9d7ac781500ef24df157b5d51a6b79e0515a61..e5d5356c6c63b8a7ce0d3f69c015615fb01df1eb 100644
--- a/app/components/AdminPage.js
+++ b/app/components/AdminPage.js
@@ -138,7 +138,7 @@ const AdminPage = () => {
: null
}
- if (currentUser && process.env.INSTANCE_NAME === 'coko') {
+ if (currentUser && process.env.INSTANCE_NAME === 'aperture') {
links.push({ link: homeLink, name: 'Dashboard', icon: 'home' })
}
@@ -234,14 +234,14 @@ const AdminPage = () => {
path={`${urlFrag}/admin/manuscripts`}
redirectLink={redirectLink}
/>
- {['elife', 'ncrc'].includes(process.env.INSTANCE_NAME) &&
+ {['elife', 'ncrc'].includes(process.env.INSTANCE_NAME) && (
<PrivateRoute
component={SubmitPage}
exact
path={`${urlFrag}/versions/:version/evaluation`}
redirectLink={redirectLink}
/>
- }
+ )}
</Switch>
<RolesUpdater />
</Root>
diff --git a/app/components/component-manuscripts/src/Manuscript.js b/app/components/component-manuscripts/src/Manuscript.js
index 3cc32f56f8cd2502e77aed4211c69607098205d8..ee9edd4f8bf0756d99fb3dd03ffd71ec9c668009 100644
--- a/app/components/component-manuscripts/src/Manuscript.js
+++ b/app/components/component-manuscripts/src/Manuscript.js
@@ -65,7 +65,7 @@ const User = ({ manuscriptId, manuscript, submitter }) => {
return (
<Row>
- {process.env.INSTANCE_NAME === 'coko' && (
+ {process.env.INSTANCE_NAME === 'aperture' && (
<Cell>{manuscript.meta && manuscript.meta.title}</Cell>
)}
{['elife', 'ncrc'].includes(process.env.INSTANCE_NAME) && (
@@ -119,7 +119,7 @@ const User = ({ manuscriptId, manuscript, submitter }) => {
Evaluation
</Action>
)}
- {process.env.INSTANCE_NAME === 'coko' && (
+ {process.env.INSTANCE_NAME === 'aperture' && (
<Action to={`${urlFrag}/versions/${manuscriptId}/decision`}>
Control
</Action>
diff --git a/app/components/component-manuscripts/src/Manuscripts.jsx b/app/components/component-manuscripts/src/Manuscripts.jsx
index d0a38bb55ad72250547e4006f72300a2cafeaf0e..dc98be42b91cd0d8d47b1a6ae3967a07b8947490 100644
--- a/app/components/component-manuscripts/src/Manuscripts.jsx
+++ b/app/components/component-manuscripts/src/Manuscripts.jsx
@@ -80,13 +80,10 @@ const GET_MANUSCRIPTS = gql`
const Manuscripts = ({ history, ...props }) => {
const SortHeader = ({ thisSortName, children }) => {
- if(!thisSortName) {
- return (
- <th>
- {children}
- </th>
- )
+ if (!thisSortName) {
+ return <th>{children}</th>
}
+
const changeSort = () => {
if (sortName !== thisSortName) {
setSortName(thisSortName)
@@ -135,11 +132,11 @@ const Manuscripts = ({ history, ...props }) => {
if (loading) return <Spinner />
if (error) return `Error! ${error.message}`
-
+
const manuscripts = data.paginatedManuscripts.manuscripts.map(el => {
return { ...el, submission: JSON.parse(el.submission) }
})
-
+
const { totalCount } = data.paginatedManuscripts
return (
@@ -156,27 +153,31 @@ const Manuscripts = ({ history, ...props }) => {
</HeadingWithAction>
)}
- {process.env.INSTANCE_NAME === 'coko' && <Heading>Manuscripts</Heading>}
+ {process.env.INSTANCE_NAME === 'aperture' && (
+ <Heading>Manuscripts</Heading>
+ )}
<Content>
<Table>
<Header>
<tr>
- {process.env.INSTANCE_NAME === 'coko' && (
+ {process.env.INSTANCE_NAME === 'aperture' && (
<SortHeader thisSortName="meta:title">Title</SortHeader>
)}
{['elife', 'ncrc'].includes(process.env.INSTANCE_NAME) && (
- <SortHeader thisSortName="submission:articleId">Article Id</SortHeader>
+ <SortHeader thisSortName="submission:articleId">
+ Article Id
+ </SortHeader>
)}
<SortHeader thisSortName="created">Created</SortHeader>
<SortHeader thisSortName="updated">Updated</SortHeader>
- {process.env.INSTANCE_NAME === 'ncrc' &&
+ {process.env.INSTANCE_NAME === 'ncrc' && (
<SortHeader>Topic</SortHeader>
- }
+ )}
<SortHeader thisSortName="status">Status</SortHeader>
- {process.env.INSTANCE_NAME === 'ncrc' &&
+ {process.env.INSTANCE_NAME === 'ncrc' && (
<SortHeader thisSortName="submission:labels">Label</SortHeader>
- }
+ )}
<SortHeader thisSortName="submitterId">Author</SortHeader>
<th />
</tr>
diff --git a/app/components/component-submit/src/components/FormTemplate.js b/app/components/component-submit/src/components/FormTemplate.js
index 114851b81c86754fe896c8010a4633e4735bb37d..ef225c4093b2c775c8340c52770b457a1cc2b057 100644
--- a/app/components/component-submit/src/components/FormTemplate.js
+++ b/app/components/component-submit/src/components/FormTemplate.js
@@ -159,7 +159,11 @@ const FormTemplate = ({
// If there are errors, do a fake submit
// to focus on the error
- if (hasErrors || values.status === articleStatuses.evaluated || values.status === articleStatuses.submitted) {
+ if (
+ hasErrors ||
+ values.status === articleStatuses.evaluated ||
+ values.status === articleStatuses.submitted
+ ) {
handleSubmit()
} else {
toggleConfirming()
@@ -274,7 +278,7 @@ const FormTemplate = ({
</Section>
) : null}
- {process.env.INSTANCE_NAME === 'coko' &&
+ {process.env.INSTANCE_NAME === 'aperture' && (
<>
{!['submitted', 'revise'].includes(values.status) &&
form.haspopup === 'false' && (
@@ -287,22 +291,27 @@ const FormTemplate = ({
form.haspopup === 'true' &&
submitButton('Submit your research object')}
</>
- }
+ )}
- {['elife', 'ncrc'].includes(process.env.INSTANCE_NAME) &&
+ {['elife', 'ncrc'].includes(process.env.INSTANCE_NAME) && (
<>
- {!['revise'].includes(values.status) &&
- form.haspopup === 'false' && (
- <Button onClick={() => handleSubmit()} primary type="submit">
- {match.url.includes('/evaluation') ? 'Submit Evaluation' : 'Submit your research object'}
- </Button>
- )}
+ {!['revise'].includes(values.status) && form.haspopup === 'false' && (
+ <Button onClick={() => handleSubmit()} primary type="submit">
+ {match.url.includes('/evaluation')
+ ? 'Submit Evaluation'
+ : 'Submit your research object'}
+ </Button>
+ )}
{!['revise'].includes(values.status) &&
form.haspopup === 'true' &&
- submitButton(match.url.includes('/evaluation') ? 'Submit Evaluation' : 'Submit your research object')}
+ submitButton(
+ match.url.includes('/evaluation')
+ ? 'Submit Evaluation'
+ : 'Submit your research object',
+ )}
</>
- }
+ )}
{values.status === 'revise' && submitButton('Submit your revision')}
diff --git a/app/components/component-submit/src/components/SubmitPage.js b/app/components/component-submit/src/components/SubmitPage.js
index a0d87a47f3fec77a190971d6618f96420baa7aaa..9b0eae25c0188201a6d34e17013633963ddaaedf 100644
--- a/app/components/component-submit/src/components/SubmitPage.js
+++ b/app/components/component-submit/src/components/SubmitPage.js
@@ -217,7 +217,9 @@ const SubmitPage = ({ match, history }) => {
}
const onSubmit = async versionId => {
- const delta = { status: match.url.includes('/evaluation') ? 'evaluated' : 'submitted' }
+ const delta = {
+ status: match.url.includes('/evaluation') ? 'evaluated' : 'submitted',
+ }
await submit({
variables: {
@@ -226,11 +228,11 @@ const SubmitPage = ({ match, history }) => {
},
})
- if(process.env.INSTANCE_NAME === 'coko') {
+ if (process.env.INSTANCE_NAME === 'aperture') {
history.push(`${urlFrag}/dashboard`)
}
- if(['elife', 'ncrc'].includes(process.env.INSTANCE_NAME)) {
+ if (['elife', 'ncrc'].includes(process.env.INSTANCE_NAME)) {
history.push(`${urlFrag}/admin/manuscripts`)
}
}
@@ -242,12 +244,12 @@ const SubmitPage = ({ match, history }) => {
confirming={confirming}
createNewVersion={createNewVersion}
form={cloneDeep(form)}
+ match={match}
onChange={handleChange}
onSubmit={onSubmit}
parent={manuscript}
toggleConfirming={toggleConfirming}
versions={versions}
- match={match}
/>
)
}
diff --git a/app/storage/forms-coko/submit.json b/app/storage/forms-aperture/submit.json
similarity index 100%
rename from app/storage/forms-coko/submit.json
rename to app/storage/forms-aperture/submit.json
diff --git a/config/default.js b/config/default.js
index 7b759dcfcd47c8282f237256a306af21dad74e8c..f8df809a6107d21b27b7851a82291f3fc13bd948 100644
--- a/config/default.js
+++ b/config/default.js
@@ -45,7 +45,7 @@ module.exports = {
path: deferConfig(cfg => {
const formTemplatePath = {
elife: '../app/storage/forms',
- coko: '../app/storage/forms-coko',
+ aperture: '../app/storage/forms-aperture',
ncrc: '../app/storage/forms-ncrc',
}
// eslint-disable-next-line
diff --git a/server/auth-orcid/orcid.js b/server/auth-orcid/orcid.js
index aef284320f6dd0e6650160c0cbf184669779abec..e983d7c0d76ee87efbc2b3c55a14423dcc29aca9 100644
--- a/server/auth-orcid/orcid.js
+++ b/server/auth-orcid/orcid.js
@@ -102,7 +102,7 @@ module.exports = app => {
let redirectionURL
- if (process.env.INSTANCE_NAME === 'coko') {
+ if (process.env.INSTANCE_NAME === 'aperture') {
redirectionURL = '/kotahi/dashboard'
if (req.user.firstLogin) {
diff --git a/server/model-manuscript/src/graphql.js b/server/model-manuscript/src/graphql.js
index c7db2ce8a2c7af827bd42c057300e28cdd43e4cc..c1e24b5b200a7b6dd93c20206fc5039f05511b0c 100644
--- a/server/model-manuscript/src/graphql.js
+++ b/server/model-manuscript/src/graphql.js
@@ -267,29 +267,37 @@ const resolvers = {
const requestBody = {
uri: manuscript.submission.articleURL,
text: manuscript.submission.evaluationContent,
- tags: [
- manuscript.submission.evalType
- ],
+ tags: [manuscript.submission.evalType],
// group: "q5X6RWJ6",
}
try {
- const response = await axios.post('https://api.hypothes.is/api/annotations', requestBody, {
- headers: {
- 'Authorization': 'Bearer 6879-C9eSHATI6gsjTD0GmZ9NIojOPDnntsdt76iE1AKlyzA'
- }
- })
- const updatedManuscript = await ctx.models.Manuscript.query().updateAndFetchById(id, {
- published: new Date(),
- status: 'published',
- })
+ const response = await axios.post(
+ 'https://api.hypothes.is/api/annotations',
+ requestBody,
+ {
+ headers: {
+ Authorization:
+ 'Bearer 6879-C9eSHATI6gsjTD0GmZ9NIojOPDnntsdt76iE1AKlyzA',
+ },
+ },
+ )
+
+ const updatedManuscript = await ctx.models.Manuscript.query().updateAndFetchById(
+ id,
+ {
+ published: new Date(),
+ status: 'published',
+ },
+ )
+
return updatedManuscript
} catch {
return
}
}
- if (!manuscript.published && process.env.INSTANCE_NAME === 'coko') {
+ if (!manuscript.published && process.env.INSTANCE_NAME === 'aperture') {
manuscript = ctx.models.Manuscript.query().updateAndFetchById(id, {
published: new Date(),
})