fixing tests

oarepo · Jan 18, 2025 · a014fb1 · a014fb1
1 parent 713e9d3
commit a014fb1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/oarepo_requests/ui/components/custom_fields.py b/oarepo_requests/ui/components/custom_fields.py
@@ -31,7 +31,6 @@ def form_config(
         form: dict | list = getattr(type_, "form", None)  # type: ignore
         if not form:
             return
-
         if isinstance(form, dict):
             # it is just a single field
             form = [{"section": "", "fields": [form]}]

diff --git a/.../theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestCustomFields.jsx b/.../theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/RequestCustomFields.jsx
@@ -13,10 +13,11 @@ export const RequestCustomFields = ({
   // Only applies to RequestModalContent component:
   // READ ONLY modal type contains Accept, Decline, and/or Cancel actions OR contains Cancel action only => only ReadOnlyCustomFields are rendered
   // SUBMIT FORM modal type contains Submit and/or Save, Create, CreateAndSubmit action => Form is rendered
-  const customFieldsType =
-    request.status_code === "created"
-      ? REQUEST_MODAL_TYPE.SUBMIT_FORM
-      : REQUEST_MODAL_TYPE.READ_ONLY;
+  const customFieldsType = actions.some(
+    ({ name }) => name === REQUEST_TYPE.ACCEPT || name === REQUEST_TYPE.CANCEL
+  )
+    ? REQUEST_MODAL_TYPE.READ_ONLY
+    : REQUEST_MODAL_TYPE.SUBMIT_FORM;
 
   const renderSubmitForm =
     customFieldsType === REQUEST_MODAL_TYPE.SUBMIT_FORM &&

diff --git a/run-tests.sh b/run-tests.sh
@@ -6,11 +6,13 @@ PYTHON="${PYTHON:-python3.12}"
 
 MODEL="thesis"
 
+export PIP_EXTRA_INDEX_URL=https://gitlab.cesnet.cz/api/v4/projects/1408/packages/pypi/simple
+export UV_EXTRA_INDEX_URL=https://gitlab.cesnet.cz/api/v4/projects/1408/packages/pypi/simple
+
 BUILDER_VENV=.venv-builder
 BUILD_TEST_DIR="tests"
 CODE_TEST_DIR="tests"
 
-curl -L -o forked_install.sh https://github.com/oarepo/nrp-devtools/raw/main/tests/forked_install.sh
 
 if test -d $BUILDER_VENV ; then
 	rm -rf $BUILDER_VENV
@@ -53,10 +55,9 @@ find oarepo_requests -name '*.py' | grep -v '__init__.py' | sed 's/.py$//' | tr
 done | python
 
 # now install the tests (might bring more dependencies, that's why we have checked the imports before)
+
 pip install -e ".[tests]"
+pip install "oarepo[tests, rdm]==${OAREPO_VERSION}.*"
 
-sh forked_install.sh invenio-records-resources
-sh forked_install.sh invenio-requests
-sh forked_install.sh invenio-drafts-resources
 pytest $BUILD_TEST_DIR/test_requests
 pytest $BUILD_TEST_DIR/test_ui