diff --git a/README-DEV.md b/README-DEV.md deleted file mode 100644 index 2e79f6fd2..000000000 --- a/README-DEV.md +++ /dev/null @@ -1,22 +0,0 @@ -## Prepare installation - -**in config/ create** -- datacollectors.yml -- database.yml -- storage.yml - -**write temporary in run-ruby-dev.sh** -- rake db:create -- rake db:schema:load - -## Installation - -docker-compose -f docker-compose.dev.yml up - -OR - -docker-compose -f docker-compose.dev.yml up postgres app webpacker - -## Working inside app container - -docker exec -it chemotion_eln-app-1 /bin/bash diff --git a/app/api/api.rb b/app/api/api.rb index e0c1e64bd..f00b28859 100644 --- a/app/api/api.rb +++ b/app/api/api.rb @@ -62,7 +62,7 @@ def authenticate! def is_public_request? request.path.start_with?( '/api/v1/public/', - '/api/v1/labimotion_hub/', ### TODO: Paggy + '/api/v1/labimotion_hub/', '/api/v1/public_chemscanner/', '/api/v1/chemspectra/', '/api/v1/ketcher/layout', diff --git a/app/assets/stylesheets/attachment-list.scss b/app/assets/stylesheets/attachment-list.scss index b32d237c7..9dac9938b 100644 --- a/app/assets/stylesheets/attachment-list.scss +++ b/app/assets/stylesheets/attachment-list.scss @@ -95,6 +95,12 @@ visibility: visible; transition-delay: 0s; } +.attachment-row-image:hover { + transform: scale(6) translateX(20px); + z-index: 1000; + transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.275); +} + .attachment-row-text { flex: 0.7; diff --git a/app/packs/src/apps/mydb/elements/details/researchPlans/ResearchPlanDetails.js b/app/packs/src/apps/mydb/elements/details/researchPlans/ResearchPlanDetails.js index 81fc28481..c05987173 100644 --- a/app/packs/src/apps/mydb/elements/details/researchPlans/ResearchPlanDetails.js +++ b/app/packs/src/apps/mydb/elements/details/researchPlans/ResearchPlanDetails.js @@ -43,6 +43,11 @@ import UserStore from 'src/stores/alt/stores/UserStore'; import MatrixCheck from 'src/components/common/MatrixCheck'; import { commentActivation } from 'src/utilities/CommentHelper'; +// For REPO +import UserStore from 'src/stores/alt/stores/UserStore'; +import MatrixCheck from 'src/components/common/MatrixCheck'; +import { commentActivation } from 'src/utilities/CommentHelper'; + export default class ResearchPlanDetails extends Component { constructor(props) { super(props); diff --git a/app/packs/src/apps/mydb/elements/details/samples/SampleDetails.js b/app/packs/src/apps/mydb/elements/details/samples/SampleDetails.js index 0aad31fbb..b71806b15 100644 --- a/app/packs/src/apps/mydb/elements/details/samples/SampleDetails.js +++ b/app/packs/src/apps/mydb/elements/details/samples/SampleDetails.js @@ -78,6 +78,7 @@ import { formatTimeStampsOfElement } from 'src/utilities/timezoneHelper'; import { commentActivation } from 'src/utilities/CommentHelper'; // For REPO +import { commentActivation } from 'src/utilities/CommentHelper'; import RepositoryActions from 'src/stores/alt/repo/actions/RepositoryActions'; import PublishSampleModal from 'src/components/chemrepo/PublishSampleModal'; import MolViewerBtn from 'src/components/viewer/MolViewerBtn'; diff --git a/app/packs/src/apps/mydb/elements/details/samples/analysesTab/SampleDetailsContainersAux.js b/app/packs/src/apps/mydb/elements/details/samples/analysesTab/SampleDetailsContainersAux.js index c5f936b3f..e70168cdb 100644 --- a/app/packs/src/apps/mydb/elements/details/samples/analysesTab/SampleDetailsContainersAux.js +++ b/app/packs/src/apps/mydb/elements/details/samples/analysesTab/SampleDetailsContainersAux.js @@ -391,9 +391,6 @@ const headerBtnGroup = ( toggleNMRDisplayerModal={toggleNMRDisplayerModal} hasNMRium={hasNMRium} isReviewer={isReviewer} - confirmRegenerateEdited={confirmRegenerateEdited} - toggleNMRDisplayerModal={toggleNMRDisplayerModal} - hasNMRium={hasNMRium} /> diff --git a/app/packs/src/stores/alt/repo/stores/PublicStore.js b/app/packs/src/stores/alt/repo/stores/PublicStore.js index 62f6044dc..0265e4a41 100644 --- a/app/packs/src/stores/alt/repo/stores/PublicStore.js +++ b/app/packs/src/stores/alt/repo/stores/PublicStore.js @@ -206,7 +206,6 @@ class PublicStore { const listType = reactionList.reactionData.publication.taggable_data.scheme_only ? RepoNavListTypes.SCHEME : RepoNavListTypes.REACTION; let cb = () => PublicActions.getReactions(); - if (this.reactions.length > 0) { cb = () => {}; this.setState({ reactions: this.reactions }); diff --git a/lib/reporter/docx/detail_sample.rb b/lib/reporter/docx/detail_sample.rb index 868404fc6..8937d1747 100644 --- a/lib/reporter/docx/detail_sample.rb +++ b/lib/reporter/docx/detail_sample.rb @@ -73,7 +73,7 @@ def literatures end output end - + def init_item item = [] need_rxn_desc = @spl_settings[:reaction_description]