Skip to content

Merging bug fixes and banner message from main #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4db73eb
fix(deps): Upgrading invenio-rdm-records to match upgraded invenio-ap…
monotasker Jan 11, 2025
5a5d326
fix(cli): Minor import fix in users service cli
monotasker Jan 11, 2025
2b4e5fc
Update metadata.md
bjr70 Jan 14, 2025
706cb71
fix(deps, testing): Dependency updates, including adding pytest-mock …
monotasker Jan 14, 2025
b8c6ead
fix(notifications): Minor tweak to email template for new comments
monotasker Jan 14, 2025
bb1f3a3
fix(testing): Updates to notification integration tests--now all pass…
monotasker Jan 14, 2025
9f4c30e
updated resource types and creator/contributor
bjr70 Jan 14, 2025
4b72771
Merge branch 'main' of https://github.com/MESH-Research/knowledge-com…
bjr70 Jan 14, 2025
973f346
fixed typo in resource types section.
bjr70 Jan 14, 2025
ebcdff5
Merge branch 'main' of github.com:MESH-Research/knowledge-commons-works
monotasker Jan 14, 2025
c10a7fe
Merge branch 'main' of https://github.com/MESH-Research/knowledge-com…
bjr70 Jan 14, 2025
779d44e
Updated ISSN and ISBN sections.
bjr70 Jan 16, 2025
6abb0dc
fix(testing): Added workflow for automated test run on github
monotasker Jan 17, 2025
8ea61c7
fix(testing): Major work on backend integration tests; all passing so…
monotasker Jan 17, 2025
11e88be
fix(user-data): Fixes to user data sync errors when affiliation missi…
monotasker Jan 17, 2025
2b5839c
fix(search-provisioning): WIP changes to get search provisioning test…
monotasker Jan 17, 2025
df9b917
Merge branch 'main' of github.com:MESH-Research/knowledge-commons-works
monotasker Jan 17, 2025
c921f9f
fix(docs): Fleshed out resource type docs
monotasker Jan 17, 2025
0b9f2e1
fix(docs): Fleshed out creator role docs
monotasker Jan 17, 2025
aff2fcd
fix(docs): Header level tweak
monotasker Jan 17, 2025
410db4a
fix(testing): Corrected python version for test run
monotasker Jan 17, 2025
cb19319
fix(testing): Updates to test runner workflow
monotasker Jan 17, 2025
7e0ec50
fix(testing): Updates to test runner workflow
monotasker Jan 17, 2025
0c9f6ce
fix(testing): Updates to test runner workflow
monotasker Jan 17, 2025
6e5df02
fix(testing, search-provisioning): Significant work on integration te…
monotasker Jan 18, 2025
49ee7fa
fix(theme): Adding focus group banner
monotasker Jan 20, 2025
ada9b45
fix(search-provisioning): Fixes to search provisioning
monotasker Jan 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 103 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
name: Run Tests

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
schedule:
# * is a special character in YAML so you have to quote this string
- cron: "0 3 * * 6"
workflow_dispatch:
inputs:
reason:
description: "Reason"
required: false
default: "Manual trigger"

jobs:
test:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true

- name: Set up Python 3.9
uses: actions/setup-python@v5
with:
python-version: '3.9'

- name: Install prerequisites
run: |
sudo apt-get install -y pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl

- name: set up docker
uses: docker/setup-buildx-action@v3

- name: Set up Docker Compose
run: |
sudo apt-get update
sudo apt-get install -y docker-compose

- name: Install pipenv
run: |
python -m pip install --upgrade pip
pip install pipenv

- name: Install python dependencies
run: pipenv install --dev

- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 20.x

- name: Create config files
run: |
echo "[cli]" >> .invenio.private && \
echo "services_setup=False" >> .invenio.private && \
echo "instance_path=/opt/invenio/var/instance" >> .invenio.private
touch site/tests/.env

- name: Run tests
env:
COMMONS_API_TOKEN: ${{ secrets.TEST_COMMONS_API_TOKEN }}
COMMONS_API_TOKEN_PROD: ${{ secrets.TEST_COMMONS_API_TOKEN_PROD }}
COMMONS_SEARCH_API_TOKEN: ${{ secrets.TEST_COMMONS_SEARCH_API_TOKEN }}
INVENIO_SEARCH_DOMAIN: ${{ vars.INVENIO_SEARCH_DOMAIN }}
INVENIO_ADMIN_EMAIL: ${{ secrets.TEST_INVENIO_ADMIN_EMAIL }}
SQLALCHEMY_DATABASE_URI: ${{ vars.TEST_SQLALCHEMY_DATABASE_URI }}
INVENIO_SQLALCHEMY_DATABASE_URI: ${{ vars.TEST_SQLALCHEMY_DATABASE_URI }}
POSTGRESQL_USER: ${{ vars.POSTGRES_USER }}
POSTGRESQL_PASSWORD: ${{ vars.POSTGRES_DB }}
POSTGRESQL_DB: ${{ vars.POSTGRES_DB }}
INVENIO_COMMONS_API_REQUEST_PROTOCOL: https
INVENIO_MAIL_SUPPRESS_SEND: False
SPARKPOST_API_KEY: ${{ secrets.TEST_SPARKPOST_API_KEY }}
SPARKPOST_USERNAME: ${{ secrets.TEST_SPARKPOST_USERNAME }}
run: |
chmod +x site/run_tests.sh
cd site
bash run_tests.sh

# TODO: Add frontend tests
# - name: Run eslint test
# run: ./run-js-linter.sh -i

# - name: Run translations test
# run: ./run-i18n-tests.sh

# - name: Install deps for frontend tests
# working-directory: ./site/kcworks/assets/semantic-ui/js/kcworks
# run: npm install

# - name: Install deps for frontend tests - translations
# working-directory: ./translations/kcworks
# run: npm install

# - name: Run frontend tests
# working-directory: ./site/kcworks/assets/semantic-ui/js/kcworks
# run: npm test
6 changes: 4 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ docker-services-cli = "*"
sphinx = "*"
myst-parser = "*"
furo = "*"
pytest-mock = "*"

[packages]
aiohttp = "*"
Expand Down Expand Up @@ -44,7 +45,7 @@ isbnlib = "*"
langdetect = "*"
numpy = "*"
pip = "*"
pytest-invenio = "*"
pytest-invenio = {version = "<3.0.0"}
python-dotenv = "*"
python-iso639 = "*"
python-stdnum = "*"
Expand All @@ -59,9 +60,10 @@ uwsgi-tools = ">=1.1.1"
uwsgitop = ">=0.11"
xmlsec = "<1.3.14"
kcworks = {file = "site", editable = true}
flask-iiif = "*"

[requires]
python_version = "3.9"

[pipenv]
allow_prereleases = true
allow_prereleases = false
500 changes: 237 additions & 263 deletions Pipfile.lock

Large diffs are not rendered by default.

25 changes: 21 additions & 4 deletions assets/less/site/globals/site.overrides
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,9 @@ html.cover-page {

.theme.header {
box-shadow: none;
.beta-banner {
background-color: @mint50;
background-image: url("../../../../static/images/textured_bgs/KCommons_assets_Seafoam_800.png");
color: @verdigrisDark;

.banner {

padding: 0.5rem 1rem;
text-align: center;
font-size: 16px;
Expand All @@ -116,6 +115,24 @@ html.cover-page {
a {
text-decoration: underline;
}
&.primary {
background-color: @mint50;
background-image: url("../../../../static/images/textured_bgs/KCommons_assets_Seafoam_800.png");
color: @verdigrisDark;
border-bottom: 1px solid @verdigris50;
}
&.secondary {
background-color: @verdigrisDark;
background-image: none;
color: @white;
padding: 0.5rem 1rem;
text-align: center;
font-weight: bold;
// text-shadow: 0 0 0.5rem 000;
a {
color: @white;
}
}
}
}

Expand Down
Loading
Loading