Skip to content

Feat/test framework merged #777

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 122 commits into from
Mar 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
1b8ee7c
add condition to searchBASE.php
Nov 15, 2023
67622b1
add condition to searchBASE.php about exclude_date_filters
Nov 16, 2023
fd61571
backend changes for exclude_date_filters param
chreman Nov 23, 2023
7a649eb
backend changes for exclude_date_filters param
chreman Nov 23, 2023
27e6df8
backend changes for exclude_date_filters param
chreman Nov 23, 2023
0a4bc10
restructure local docker env
chreman Oct 18, 2023
180d34a
cleanup
chreman Nov 26, 2023
6aac924
deployment bugfix
chreman Nov 27, 2023
0c1dabf
deployment bugfix
chreman Nov 27, 2023
3b7e247
hide timeframe from contextLine if excludedDateFilters is true
Nov 28, 2023
56c94d0
hide timeframe from contextLine if excludedDateFilters is true
Nov 28, 2023
910a088
hide timeframe from contextLine if excludedDateFilters is true
Nov 28, 2023
8638ae6
hide timeframe from contextLine if excludedDateFilters is true
Nov 28, 2023
ac488f3
hide timeframe from contextLine if excludedDateFilters is true
Nov 28, 2023
ce14236
Merge branch 'docker-env-rework' into exclude-date-filters-param
chreman Nov 30, 2023
97ef85b
Merge remote-tracking branch 'upstream/exclude-date-filters-param' in…
chreman Nov 30, 2023
91659e2
error log fixes
Dec 5, 2023
8b1f0db
update request validation; some lgging cleanup
chreman Dec 5, 2023
d07d6ff
bugfix
chreman Dec 6, 2023
6d0fc29
bugfix
chreman Dec 6, 2023
9e24a75
bugfix
chreman Dec 7, 2023
a0ac7e1
bugfix
chreman Dec 7, 2023
2284f50
add sanitize_year
Dec 14, 2023
ee81bfb
cleanup prints and logs
Dec 14, 2023
353af2f
dependency updates
chreman Dec 18, 2023
4f24766
Merge remote-tracking branch 'upstream/exclude-date-filters-param' in…
chreman Dec 18, 2023
3b215f5
Merge remote-tracking branch 'upstream/master' into exclude-date-filt…
chreman Mar 19, 2024
489be17
ID creation bugfix
chreman Mar 25, 2024
258bc00
handle additional date formats
chreman Mar 26, 2024
b0f84c0
streamgraph no pubdate failsafe
chreman Mar 27, 2024
e92b431
streamgraph bugfix
chreman Apr 18, 2024
ef8b42f
update supported browsers warning
chreman Apr 18, 2024
369da53
update supported browsers warning
chreman Apr 18, 2024
2081e89
revert update supported browsers warning
chreman Apr 18, 2024
69df93a
wip
chreman Apr 19, 2024
e625f2d
Merge pull request #758 from OpenKnowledgeMaps/exclude-date-filters-p…
chreman Apr 28, 2024
fa92d2a
generalize dateparsing
chreman Apr 28, 2024
0e9a25a
Merge pull request #759 from OpenKnowledgeMaps/dev
chreman Apr 28, 2024
5cb9046
Merge pull request #760 from OpenKnowledgeMaps/exclude-date-filters-p…
chreman Apr 28, 2024
c14c0e8
temporary logging statements
chreman Nov 3, 2024
6a0791f
feat: metrics sorting
modsen-hedgehog Dec 5, 2024
249caf7
metrics rework
chreman Dec 5, 2024
60d3169
Merge branch 'visconnect-prototype-biography-and-mentoring' of github…
modsen-hedgehog Dec 6, 2024
440275e
add missing ","
chreman Dec 6, 2024
9f70e87
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
chreman Dec 6, 2024
cecfa4a
feat: update pyorcid
modsen-hedgehog Dec 9, 2024
114e005
feat: update python from 3.8 to 3.9 and pandas to from 1.3.1 to 1.3.5
modsen-hedgehog Dec 9, 2024
af36a25
fix: pyorcid and models
modsen-hedgehog Dec 9, 2024
a28c215
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
chreman Dec 9, 2024
bc4af91
fix: social metrics in list entry
modsen-hedgehog Dec 10, 2024
a3a788d
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
chreman Dec 10, 2024
a75ab13
fix: sorting for scaled by documents
modsen-hedgehog Dec 11, 2024
3a25962
test params cleanup
chreman Dec 11, 2024
21d4f74
fix: priority order rework and almetrics update
modsen-hedgehog Dec 11, 2024
39827af
fix: sorting only for orcid
modsen-hedgehog Dec 11, 2024
c688a0b
logging and error handling wip
chreman Dec 11, 2024
19eff8e
fix typos in metrics popup
chreman Dec 11, 2024
b349d4e
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
chreman Dec 11, 2024
7dba8dc
fixes: and typescript improvements
modsen-hedgehog Dec 13, 2024
58c56c5
Merge branch 'visconnect-prototype-biography-and-mentoring' of github…
modsen-hedgehog Dec 13, 2024
e57f9f8
database error handling bugfixes and logging
chreman Dec 15, 2024
1b5dab7
fix: identify_relations
modsen-hedgehog Dec 16, 2024
2d270f8
clean up problematic changes
chreman Dec 16, 2024
91eb13b
TomChris thoughts from 2024-12-16 working session
Dec 16, 2024
82facbb
add some more comments
chreman Dec 17, 2024
ec2f668
Merge remote-tracking branch 'upstream/db-connection-errorhandling' i…
chreman Dec 17, 2024
838e82b
fix: author image
modsen-hedgehog Dec 17, 2024
07dd70c
php services cleanup
chreman Dec 17, 2024
1963fec
first draft of getContextResultBuilder
chreman Dec 17, 2024
f135059
first working draft of convoluted error handling logic in search.php
chreman Dec 17, 2024
561b3e9
fix: highlights and text wrapping for dropdown
modsen-hedgehog Dec 18, 2024
7a8fa7f
fix: highlights and text wrapping for dropdown
modsen-hedgehog Dec 18, 2024
9759964
Merge branch 'visconnect-prototype-biography-and-mentoring' of github…
modsen-hedgehog Dec 18, 2024
ae8c635
fix: biography
modsen-hedgehog Jan 7, 2025
f7b427c
run phpunit82 --migrate-configuration
Dec 16, 2024
e9d4c73
refactor common testSetup
Dec 16, 2024
86f14a3
PHP test updates; getContext refactoring
chreman Jan 10, 2025
b851199
fix: metric description placement and audit
modsen-hedgehog Jan 14, 2025
8b92e5e
rename ORCiD to ORCId
modsen-hedgehog Jan 14, 2025
8caaaf2
feat: add author tooltip
modsen-hedgehog Jan 15, 2025
3b5e9d0
requirements updates
chreman Jan 17, 2025
65a550d
add missing file
chreman Jan 21, 2025
13ef35f
bugfix for metadata processing
chreman Jan 28, 2025
a9e9907
bugfix for parameter processing
chreman Jan 28, 2025
9713bd8
bugfix for parameter processing
chreman Jan 28, 2025
240cf7c
pubmed query bugfix
chreman Jan 28, 2025
3a345e2
feat: update doc types
modsen-hedgehog Jan 30, 2025
d594ebf
feat: push config type
modsen-hedgehog Jan 30, 2025
8197d52
searchBASE parameter updates
chreman Jan 31, 2025
38d2105
fix: resolve issues
modsen-hedgehog Jan 31, 2025
d256ae0
fix: minor
modsen-hedgehog Jan 31, 2025
a0ebd8a
fix: minor
modsen-hedgehog Jan 31, 2025
f9f6e9e
Merge pull request #774 from OpenKnowledgeMaps/master
chreman Jan 31, 2025
dbe9e10
Merge pull request #773 from OpenKnowledgeMaps/db-connection-errorhan…
chreman Jan 31, 2025
c05188d
Merge pull request #775 from OpenKnowledgeMaps/dev
chreman Feb 1, 2025
6e44cee
Update search.php
chreman Feb 2, 2025
49b9594
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
chreman Feb 2, 2025
6b6cb38
untrack env file
chreman Feb 2, 2025
3905acc
fix: dropdown positioning
modsen-hedgehog Feb 3, 2025
cbcff1d
revert dev env parameter
chreman Feb 4, 2025
765646b
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
chreman Feb 4, 2025
2e979d5
fix: pubmed citations
modsen-hedgehog Feb 5, 2025
bce7d55
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
chreman Feb 5, 2025
acaf425
fix: headstart bugs before release
modsen-hedgehog Feb 14, 2025
5eb2778
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
chreman Feb 17, 2025
0818bbf
fix: citation sorting
modsen-hedgehog Feb 19, 2025
3292aec
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
chreman Feb 20, 2025
31f54f0
fix: paper
modsen-hedgehog Feb 20, 2025
ad412b3
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
chreman Feb 20, 2025
d5562b0
vis_id bugfix BASE
chreman Feb 24, 2025
f883813
Merge remote-tracking branch 'upstream/master' into visconnect-protot…
chreman Feb 24, 2025
6e921da
vis_id bugfix BASE
chreman Feb 24, 2025
1a3bd94
fix bug in cite knowledge map modal
chreman Feb 27, 2025
656f3a6
increase timeouts
chreman Mar 3, 2025
b7c08a2
bugfix: project setup debugging
andreishket Mar 3, 2025
fb42896
local dev deployment updates
chreman Mar 4, 2025
c6a79ff
refactor: move script that checks config.js to separate file
andreishket Mar 4, 2025
a79f3be
feat: script that checks and creates .htaccess file
andreishket Mar 4, 2025
848127f
Merge pull request #776 from OpenKnowledgeMaps/deployment-bugfixes
chreman Mar 4, 2025
c604560
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
chreman Mar 5, 2025
824a459
Merge remote-tracking branch 'upstream/feat/test-framework' into feat…
chreman Mar 10, 2025
0c7006e
deployment and build cleanup
chreman Mar 11, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ server/workers/tests/*.csv
server/workers/tests/*.txt
server/workers/tests/testutils/
local_dev/renv/*
local_dev/dev.env

# php files
/server/classes/headstart/vendor
Expand Down
7 changes: 7 additions & 0 deletions checks/config-js.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

# Checks that config.js file exists in the root of the project
CONFIG_FILE="$(dirname "$0")/config.js"
if [ ! -f "$CONFIG_FILE" ]; then
echo "\033[1;33m Warning: config.js not found in the project root! See the config.example.js file.\033[0m"
fi
14 changes: 14 additions & 0 deletions checks/ht-access.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# !/bin/bash
# Checks that .htaccess file exists in the project-website folder and creates one if if it is not

cd .. || exit
cd project-website || exit

if [ ! -f .htaccess ]; then
echo "\033[1;33m Warning: .htaccess not found in the project-website folder. It will be created automatically."
cp settings.htaccess .htaccess
echo ".htaccess file created."
fi

cd .. || exit
cd Headstart || exit
4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ services:
command: ["python", "app.py"]
volumes:
- ./server/workers/persistence/src:/api
depends_on:
- redis
networks:
- headstart

Expand Down Expand Up @@ -248,7 +250,7 @@ services:
build: local_dev/searchflow-container
volumes:
- ../project-website:/var/www/html
- ./local_dev/config_local_projectwebsite.php:/var/www/html/config_local.php
- ./local_dev/config_local_projectwebsite.php:/var/www/html/config.php
- ../search-flow/:/var/www/html/search-flow
- ./local_dev/config_local_searchflow.ini:/var/www/html/search-flow/config_local.ini
- ../Headstart:/var/www/html/headstart
Expand Down
8 changes: 5 additions & 3 deletions examples/project_website/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
//title: "fake news",
//title: "dotcom",
//title: "cognitive dissonance",
// title: "custom_title",
title: "custom_clustering",
// title: "exclude_date_filters",
title: "philosophy_no_dates",
// file: "./data/digital-education.json",
// file: "./data/digital-education-lang.json",
// file: "./data/digital-education-lang[].json",
Expand All @@ -100,7 +100,9 @@
//file: "./data/fake-news-sg.json",
//file: "./data/dotcom-sg.json",
//file: "./data/cognitive-dissonance.json"
file: "./data/custom_clustering.json",
// file: "./data/custom_title.json",
// file: "./data/exclude_date_filters.json",
file: "./data/philosophy_no_dates.json",
// other attributes:
is_streamgraph: false, // set true for streamgraph data
show_area: true, // set false for streamgraph data
Expand Down
10 changes: 10 additions & 0 deletions examples/project_website/data/exclude_date_filters.json

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions examples/project_website/data/philosophy_no_dates.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions local-hotreload.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
#!/bin/bash

chmod a+x checks/config-js.sh
source ./checks/config-js.sh

chmod a+x checks/ht-access.sh
source ./checks/ht-access.sh

npm run prod -- --mode=development
docker compose --env-file ./local_dev/dev.env stop
docker compose --env-file ./local_dev/dev.env up -d --build
Expand Down
24 changes: 0 additions & 24 deletions local_dev/dev.env

This file was deleted.

Loading
Loading