Skip to content
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

[Search page] : Make filters configurable #97

Merged
merged 11 commits into from
Jul 17, 2024
Merged

[Search page] : Make filters configurable #97

merged 11 commits into from
Jul 17, 2024

Conversation

cmoinier
Copy link
Contributor

@cmoinier cmoinier commented Jul 11, 2024

Description

This PR creates a configuration file and a config (copied from gn-ui) to define additional fields to refine the filtering.
It also updates the docker entrypoint to handle the config.
As fields from gn-ui might now be used, some translations keys were also added.

Copy link
Member

@tkohr tkohr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @cmoinier ! Just had a quick look. To not forget about it, I think we'll still need to adapt https://github.com/camptocamp/mel-dataplatform/blob/main/tools/docker/Dockerfile#L15 since our appnames and directory names are not matching. The config will only be needed for the catalogue app I think.

apps/datahub/src/main.ts Outdated Show resolved Hide resolved
@tkohr
Copy link
Member

tkohr commented Jul 12, 2024

Thanks, @cmoinier ! Just had a quick look. To not forget about it, I think we'll still need to adapt https://github.com/camptocamp/mel-dataplatform/blob/main/tools/docker/Dockerfile#L15 since our appnames and directory names are not matching. The config will only be needed for the catalogue app I think.

Sorry, I spoke too fast here, what I meant were the necessary changes in the docker-entrypoint.sh, but you're already aware of it :-)

@cmoinier cmoinier force-pushed the configure-filters branch 3 times, most recently from d436891 to 1371ec6 Compare July 16, 2024 11:08
Copy link

@rcaplier rcaplier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !

@cmoinier cmoinier merged commit d50edea into main Jul 17, 2024
7 checks passed
@cmoinier cmoinier deleted the configure-filters branch July 17, 2024 08:50
Comment on lines +17 to +31
else
# no conf file; use env variables to tweak app config
echo "[INFO] No custom configuration file found at ${CONFIG_OVERRIDE_FILE_PATH}"
# Modify the GN4 url and proxy path based on env variables (if defined)
if [ ! -z "${GN4_API_URL}" ]
then
echo "[INFO] Replacing GN4 url in conf with: ${GN4_API_URL}..."
sed -i "s%geonetwork4_api_url = \".*\"%geonetwork4_api_url = \"${GN4_API_URL}\"%" ${APP_FILES_PATH}${CONFIG_FILE_PATH}${CONFIG_FILE_NAME}
fi
if [ ! -z "${PROXY_PATH}" ]
then
echo "[INFO] Replacing proxy path in conf with: ${PROXY_PATH}..."
sed -i "s%proxy_path = \".*\"%proxy_path = \"${PROXY_PATH}\"%" ${APP_FILES_PATH}${CONFIG_FILE_PATH}${CONFIG_FILE_NAME}
fi
fi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is superfluous in MEL, I think, but it should not bother it from working.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants