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.

Sign up for GitHub

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

Jump to bottom

Sync staging prod 2025 03 27 #660

Merged
merged 128 commits into from
Mar 27, 2025
Merged

Sync staging prod 2025 03 27 #660

merged 128 commits into from
Mar 27, 2025

Conversation

mpolidori
Copy link
Collaborator

Pull request checklist

Please check if your PR fulfills the following requirements:

  • Make sure you are requesting to pull a topic/feature/bugfix branch (right side). Don't request your master!
  • Make sure you are making a pull request against the develop branch (left side). Also you should start your branch off our develop.
  • Check the commit's or even all commits' message styles matches our requested structure.
  • Check your code additions will fail neither code linting checks nor unit test.

Pull request type

Please check the type of change your PR introduces:

  • Bugfix
  • Feature
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • Documentation content changes
  • Other (please describe):

What is the current behavior?

Issue Number: N/A

What is the new behavior?

Does this introduce a breaking change?

  • Yes
  • No

Other information

steveoni and others added 30 commits October 23, 2024 12:46
@steveoni
[sitemap]: remove diallow all from sitemap
b9880a1
@steveoni
Merge branch 'dev' of https://github.com/wri/wri-odp into dev
d631f49
@steveoni
Merge branch 'dev' of https://github.com/wri/wri-odp into dev
fcd12d7
@steveoni
Merge branch 'dev' of https://github.com/wri/wri-odp into dev
562a244
@steveoni
Merge branch 'dev' of https://github.com/wri/wri-odp into dev
eefd6d9
@mpolidori
Add harvest configs and supervisorctl
f80457c
@steveoni
Merge branch 'dev' of https://github.com/wri/wri-odp into dev
81484dc
@mpolidori
Force rerun deployment
6faf557
@steveoni
Merge branch 'dev' of https://github.com/wri/wri-odp into dev
447359a
@mpolidori
Force rerun deployment
4397209
@mpolidori
Merge branch 'dev' of github.com:wri/wri-odp into add-harvest-configs
1f98003
@steveoni
Merge branch 'dev' of https://github.com/wri/wri-odp into dev
fdaf7e3
@steveoni
empty
d260f43
@mpolidori
Fix supervisord file permissions
d9b21de
@mpolidori
Add harvester to initial plugins
5934805
@mpolidori
Merge pull request #600 from wri/add-harvest-configs
21108c0 
Add harvest configs and supervisorctl
@luccasmmg
Trigger CI
889a0f0
@steveoni
Searchcard (#605)
54ceef4 
* [sitemap]: remove diallow all from sitemap

* update searchcard style

* add aria-label to the footer

* update test

* update

* update dataset card
@mpolidori
Fix supervisord.conf path
e2603cb
@mpolidori
Merge branch 'dev' of github.com:wri/wri-odp into add-harvest-configs
b383498
@mpolidori
Fix supervisord file path in Dockerfile.dev
d1db3c6
@mpolidori @luccasmmg
Revert "Merge branch 'dev' of https://github.com/wri/wri-odp into dev" (
9f8b1ab 
#608)

This reverts commit 09e0761, reversing
changes made to c54ef01.

Co-authored-by: Luccas Mateus <[email protected]>
@mpolidori @luccasmmg
Re apply multiple applications (#609)
7100f40 
* Revert "Merge branch 'dev' of https://github.com/wri/wri-odp into dev"

This reverts commit 09e0761, reversing
changes made to c54ef01.

* Reapply "Merge branch 'dev' of https://github.com/wri/wri-odp into dev"

This reverts commit 9399810.

---------

Co-authored-by: Luccas Mateus <[email protected]>
@steveoni
Merge branch 'dev' of https://github.com/wri/wri-odp into dev
d08a34a
@mpolidori
Merge branch 'dev' of github.com:wri/wri-odp into add-harvest-configs
d8c345d
@mpolidori
Force rerun deployment
68d46fe
@mpolidori
Add log output after unit tests
3270279
@mpolidori
Move error logs in GitHub Actions
046b4e0
@steveoni
Improve group package count api call (#611)
34b8cf5 
* [sitemap]: remove diallow all from sitemap

* empty

* improve groups package count fetch
@mpolidori
Move log print; Fix timeout
ac59f1a
MuhammadIsmailShahzad and others added 27 commits January 31, 2025 17:15
@MuhammadIsmailShahzad
[supervisor.harvest.conf] Temp. run harvester as root
aeca810
@MuhammadIsmailShahzad
[main.yml] Run the build and push the images
ac8fede
@MuhammadIsmailShahzad
[docker-compose.test.yml] Revert changes
1888e51
@MuhammadIsmailShahzad
[main.yml] Run tests
587215e
@mpolidori
Merge pull request #607 from wri/add-harvest-configs
5edc863 
Fix harvest configs path
@mpolidori
[supervisor.*.conf] Use env variable to dynamically set user based on…
b51ae00 
… user running CKAN
@steveoni
update filter scrolltop (#633)
4da54a2
@luccasmmg
Kim requests(Download id, new fomratting date)
d1686f9
@luccasmmg
Fix fonts
a1d3156
@luccasmmg
Merge branch 'dev' into sync-dev-staging-feb-3
611d528
@mpolidori
Merge pull request #634 from wri/harvest-config-jan-31-2025
7fe11c9 
Dynamically set harvest job user
@luccasmmg
Fix timezone
77fb2d4
@luccasmmg
Merge branch 'dev' of https://github.com/wri/wri-odp into dev
6c07711
@luccasmmg
Ortto forms
1728197
@luccasmmg
Fix timezone
4c55584
@luccasmmg
Fix font size
b3e28b7
@luccasmmg
Fix typo
e6cfdd1
@luccasmmg
Trigger CI
3db53ab
@luccasmmg
Merge branch 'dev' into sync-dev-staging-feb-3-2
b8c65f2
@luccasmmg
Fix build
68c5423
@luccasmmg
Merge branch 'dev' into sync-dev-staging-feb-4
2cbd839
@mpolidori @luccasmmg @steveoni
Sync dev staging 02 17 25 (#639)
5adf41d 
* Harvest dynamic configs pt. 2 (#635)

* Update ckanext-s3filestore branch

* Fix typo

* Update layer manager to use wri release

* Fix Dockerfile

* [ODP-235] Allow private and hidden teams (#537)

* update teams create and edit form

* update organization list api

* update schema

* update api

* remove extras

* fix type errors

* update user_list_wri to support private teams

* fix api call

* remove chained action

* add visibility

* fix breaking changes

* update env

* update env plugin

* fix test

* update test

* add visibility to org during dataset edit

* add test for private teams

* remove logs

* update private team functionality

* Merge branch 'priveateams' of https://github.com/wri/wri-odp into priveateams

* Merge branch 'priveateams' of https://github.com/wri/wri-odp into priveateams

* resolve conflict

* undo changes

* update organization patch and create

* add private attribute to fetched orgs

* update organization_list sql logic

* improve team visbility

* improve error message

* update private team test

* update failing test

* update test

* update settings

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update docker compose

* add tooltip

* update test

* add padlock to private teams

* add back auth plugin

* Harvest config feb 03 2025 (#637)

* Fix variable replacement in harvest worker configs and switch from /tmp path to /srv/app

* Add whoami output to start_ckan.sh

* [download_event.py] Add missing closing parenthesis

* Set supervisor home by variable

* Fix harvest config permissions

* Use CKAN_IMAGE variable instead of local image name

* Handle sed supervisor changes as root; Add start_ckan sub-script

* Revert sub-script; Always use user ckan for supervisor

* Fix sed commands

* Use root user with ckan home for supervisord

* Revert "Harvest config feb 03 2025 (#637)"

This reverts commit e68155a.

* Harvest dynamic configs pt. 3 (#638)

* Add supercronic for harvest run command (#640)

---------

Co-authored-by: Luccas Mateus <[email protected]>
Co-authored-by: Stephen Oni <[email protected]>
@mpolidori @luccasmmg @steveoni
Sync dev staging 03 03 25 (#644)
6356c6b 
* Sync dev to Staging Mar 3, 2025

* Fix typo

* [ODP-235] Allow private and hidden teams (#537)

* update teams create and edit form

* update organization list api

* update schema

* update api

* remove extras

* fix type errors

* update user_list_wri to support private teams

* fix api call

* remove chained action

* add visibility

* fix breaking changes

* update env

* update env plugin

* fix test

* update test

* add visibility to org during dataset edit

* add test for private teams

* remove logs

* update private team functionality

* Merge branch 'priveateams' of https://github.com/wri/wri-odp into priveateams

* Merge branch 'priveateams' of https://github.com/wri/wri-odp into priveateams

* resolve conflict

* undo changes

* update organization patch and create

* add private attribute to fetched orgs

* update organization_list sql logic

* improve team visbility

* improve error message

* update private team test

* update failing test

* update test

* update settings

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update docker compose

* add tooltip

* update test

* add padlock to private teams

* add back auth plugin

* Harvest config feb 03 2025 (#637)

* Fix variable replacement in harvest worker configs and switch from /tmp path to /srv/app

* Add whoami output to start_ckan.sh

* [download_event.py] Add missing closing parenthesis

* Set supervisor home by variable

* Fix harvest config permissions

* Use CKAN_IMAGE variable instead of local image name

* Handle sed supervisor changes as root; Add start_ckan sub-script

* Revert sub-script; Always use user ckan for supervisor

* Fix sed commands

* Use root user with ckan home for supervisord

* Revert "Harvest config feb 03 2025 (#637)"

This reverts commit e68155a.

* Harvest dynamic configs pt. 3 (#638)

* Add supercronic for harvest run command (#640)

* Fix alignment

* Fix build

* Fix build

* [ODP-414] add email notification when download-flow fails (#641)

* add email notification when flow fails

* update error notification

* empty

* remove pgclient version

* update libpq

---------

Co-authored-by: Michael Polidori <[email protected]>

* Update Members permission to team form + ODP-370 (#642)

* members can not

* update role: Editor can create sub-team and admin moving subteam from public to private should not throw error

* disabled Public option if parent is private

* Trigger CI

---------

Co-authored-by: Luccas Mateus <[email protected]>

* Fix shapely imports

---------

Co-authored-by: Luccas Mateus <[email protected]>
Co-authored-by: Stephen Oni <[email protected]>
@luccasmmg @mpolidori @steveoni
Sync dev staging mar 19 (#653)
bcb11f3 
* Harvest dynamic configs pt. 2 (#635)

* Update ckanext-s3filestore branch

* Fix typo

* Update layer manager to use wri release

* Fix Dockerfile

* [ODP-235] Allow private and hidden teams (#537)

* update teams create and edit form

* update organization list api

* update schema

* update api

* remove extras

* fix type errors

* update user_list_wri to support private teams

* fix api call

* remove chained action

* add visibility

* fix breaking changes

* update env

* update env plugin

* fix test

* update test

* add visibility to org during dataset edit

* add test for private teams

* remove logs

* update private team functionality

* Merge branch 'priveateams' of https://github.com/wri/wri-odp into priveateams

* Merge branch 'priveateams' of https://github.com/wri/wri-odp into priveateams

* resolve conflict

* undo changes

* update organization patch and create

* add private attribute to fetched orgs

* update organization_list sql logic

* improve team visbility

* improve error message

* update private team test

* update failing test

* update test

* update settings

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update docker compose

* add tooltip

* update test

* add padlock to private teams

* add back auth plugin

* Harvest config feb 03 2025 (#637)

* Fix variable replacement in harvest worker configs and switch from /tmp path to /srv/app

* Add whoami output to start_ckan.sh

* [download_event.py] Add missing closing parenthesis

* Set supervisor home by variable

* Fix harvest config permissions

* Use CKAN_IMAGE variable instead of local image name

* Handle sed supervisor changes as root; Add start_ckan sub-script

* Revert sub-script; Always use user ckan for supervisor

* Fix sed commands

* Use root user with ckan home for supervisord

* Revert "Harvest config feb 03 2025 (#637)"

This reverts commit e68155a.

* Harvest dynamic configs pt. 3 (#638)

* Add supercronic for harvest run command (#640)

* Fix alignment

* Fix build

* Fix build

* [ODP-414] add email notification when download-flow fails (#641)

* add email notification when flow fails

* update error notification

* empty

* remove pgclient version

* update libpq

---------

Co-authored-by: Michael Polidori <[email protected]>

* Upgrade to CKAN 2.11 (#632)

* Update setup.py

* Update Members permission to team form + ODP-370 (#642)

* members can not

* update role: Editor can create sub-team and admin moving subteam from public to private should not throw error

* disabled Public option if parent is private

* Trigger CI

---------

Co-authored-by: Luccas Mateus <[email protected]>

* Change setup.py and setup.cfg

* Fix ckanext-wri install (#643)

* Improve resource location design (#646)

* Trigger CI

* [odp-426]: Add edit icon to dashboard entities (#648)

* [odp-426]: Add edit icon to dashboard entities

* update schema

* Add bulk purge collaborator issue patch (#645)

* Increase UWSGI timeouts; Extract URLs from markdown links in learn_more (#649)

* Resource location search improvements (#650)

* add authorized check to group/teams last node (#651)

* Trigger CI

* Rm global from DatafileLocation

* Trigger CI

* enable edit icon for collaborators (#652)

* Fix typo

* Remove dev helm config values and GH Actions file

---------

Co-authored-by: Michael Polidori <[email protected]>
Co-authored-by: Stephen Oni <[email protected]>
@luccasmmg @mpolidori @steveoni
Sync dev staging mar 26 (#659)
5b29a5e 
* Harvest dynamic configs pt. 2 (#635)

* Update ckanext-s3filestore branch

* Fix typo

* Update layer manager to use wri release

* Fix Dockerfile

* [ODP-235] Allow private and hidden teams (#537)

* update teams create and edit form

* update organization list api

* update schema

* update api

* remove extras

* fix type errors

* update user_list_wri to support private teams

* fix api call

* remove chained action

* add visibility

* fix breaking changes

* update env

* update env plugin

* fix test

* update test

* add visibility to org during dataset edit

* add test for private teams

* remove logs

* update private team functionality

* Merge branch 'priveateams' of https://github.com/wri/wri-odp into priveateams

* Merge branch 'priveateams' of https://github.com/wri/wri-odp into priveateams

* resolve conflict

* undo changes

* update organization patch and create

* add private attribute to fetched orgs

* update organization_list sql logic

* improve team visbility

* improve error message

* update private team test

* update failing test

* update test

* update settings

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update docker compose

* add tooltip

* update test

* add padlock to private teams

* add back auth plugin

* Harvest config feb 03 2025 (#637)

* Fix variable replacement in harvest worker configs and switch from /tmp path to /srv/app

* Add whoami output to start_ckan.sh

* [download_event.py] Add missing closing parenthesis

* Set supervisor home by variable

* Fix harvest config permissions

* Use CKAN_IMAGE variable instead of local image name

* Handle sed supervisor changes as root; Add start_ckan sub-script

* Revert sub-script; Always use user ckan for supervisor

* Fix sed commands

* Use root user with ckan home for supervisord

* Revert "Harvest config feb 03 2025 (#637)"

This reverts commit e68155a.

* Harvest dynamic configs pt. 3 (#638)

* Add supercronic for harvest run command (#640)

* Fix alignment

* Fix build

* Fix build

* [ODP-414] add email notification when download-flow fails (#641)

* add email notification when flow fails

* update error notification

* empty

* remove pgclient version

* update libpq

---------

Co-authored-by: Michael Polidori <[email protected]>

* Upgrade to CKAN 2.11 (#632)

* Update setup.py

* Update Members permission to team form + ODP-370 (#642)

* members can not

* update role: Editor can create sub-team and admin moving subteam from public to private should not throw error

* disabled Public option if parent is private

* Trigger CI

---------

Co-authored-by: Luccas Mateus <[email protected]>

* Change setup.py and setup.cfg

* Fix ckanext-wri install (#643)

* Improve resource location design (#646)

* Trigger CI

* [odp-426]: Add edit icon to dashboard entities (#648)

* [odp-426]: Add edit icon to dashboard entities

* update schema

* Add bulk purge collaborator issue patch (#645)

* Increase UWSGI timeouts; Extract URLs from markdown links in learn_more (#649)

* Resource location search improvements (#650)

* add authorized check to group/teams last node (#651)

* Trigger CI

* Rm global from DatafileLocation

* Trigger CI

* enable edit icon for collaborators (#652)

* Fix typo

* intgration test for collaborator permission (#654)

* enable edit icon for collaborators

* add intergration test  for dashboard collaborator permission

* Improve speed

* Improve js

* Fix prefetching

* Change color of area select tool

* Improvements map

* Remove edit icon on teams/topic page for editor (#656)

* enable edit icon for collaborators

* remove editor permision

* empty

* Fix tests

* Fix tests

* Fix tests

* Fix test

* Clear all session storage

* Fix tests

* Fix tests

* Fix private teams tests

* Fix cypress.config.js

* Fix tests

* Fix tests

* Fix tests

* Fix tests

* Rm test-main

---------

Co-authored-by: Michael Polidori <[email protected]>
Co-authored-by: Stephen Oni <[email protected]>
@mpolidori
Merge branch 'staging' of github.com:wri/wri-odp into sync-staging-pr…
63fbb75 
…od-2025-03-27
@mpolidori
Fix merge conflict leftovers
d4eff53
@mpolidori mpolidori requested a review from steveoni March 27, 2025 20:10
steveoni
steveoni approved these changes Mar 27, 2025
View reviewed changes
Copy link
Collaborator

@steveoni steveoni left a comment

Choose a reason for hiding this comment

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

lgtm

@mpolidori mpolidori merged commit dd973fc into prod Mar 27, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@steveoni steveoni steveoni approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mpolidori @steveoni @luccasmmg @MuhammadIsmailShahzad