Skip to content

Commit 5b29a5e

Browse files
luccasmmgmpolidoristeveoni
authored
Sync dev staging mar 26 (#659)
* 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]>
1 parent bcb11f3 commit 5b29a5e

File tree

16 files changed

+1625
-1647
lines changed

16 files changed

+1625
-1647
lines changed

‎deployment/frontend/public/sitemap-0.xml

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">
3-
<url><loc>http://localhost:3000</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
4-
<url><loc>http://localhost:3000/applications</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
5-
<url><loc>http://localhost:3000/applications/404</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
6-
<url><loc>http://localhost:3000/auth/password-reset</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
7-
<url><loc>http://localhost:3000/datasets/404</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
8-
<url><loc>http://localhost:3000/search</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
9-
<url><loc>http://localhost:3000/teams</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
10-
<url><loc>http://localhost:3000/teams/404</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
11-
<url><loc>http://localhost:3000/topics</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
12-
<url><loc>http://localhost:3000/topics/404</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
13-
<url><loc>http://localhost:3000/user-guide</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
14-
<url><loc>http://localhost:3000/user-guide/basic-definition</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
15-
<url><loc>http://localhost:3000/user-guide/dataset-view-pages</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
16-
<url><loc>http://localhost:3000/user-guide/search-page</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
17-
<url><loc>http://localhost:3000/user-guide/teams-topics</loc><lastmod>2025-02-06T11:08:58.777Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
3+
<url><loc>http://localhost:3000</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
4+
<url><loc>http://localhost:3000/applications</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
5+
<url><loc>http://localhost:3000/applications/404</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
6+
<url><loc>http://localhost:3000/auth/password-reset</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
7+
<url><loc>http://localhost:3000/datasets/404</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
8+
<url><loc>http://localhost:3000/search</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
9+
<url><loc>http://localhost:3000/teams</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
10+
<url><loc>http://localhost:3000/teams/404</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
11+
<url><loc>http://localhost:3000/topics</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
12+
<url><loc>http://localhost:3000/topics/404</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
13+
<url><loc>http://localhost:3000/user-guide</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
14+
<url><loc>http://localhost:3000/user-guide/basic-definition</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
15+
<url><loc>http://localhost:3000/user-guide/dataset-view-pages</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
16+
<url><loc>http://localhost:3000/user-guide/search-page</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
17+
<url><loc>http://localhost:3000/user-guide/teams-topics</loc><lastmod>2025-03-23T20:54:07.812Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
1818
</urlset>

‎deployment/frontend/src/components/_shared/map/controls/Legends.tsx

+26-12
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,23 @@ import {
1313
// @ts-ignore
1414
} from 'vizzuality-components'
1515

16-
// @ts-ignore
17-
import { LegendItemTimeline } from 'old-vizzuality-components'
1816
import { type ActiveLayerGroup } from '@/interfaces/state.interface'
1917
import LegendItemButtonThreshold from '@/components/vizzuality/components/legend/components/legend-item-toolbar/LegendItemButtonThreshold'
2018
import LegendItemTypesList from '@/components/vizzuality/components/legend/components/legend-item-types/LegendItemTypesList'
2119
import LegendItemButtonRemoveLayer from '@/components/vizzuality/components/legend/components/legend-item-toolbar/LegendItemButtonRemoveLayer'
20+
import dynamic from 'next/dynamic'
21+
22+
// @ts-ignore
23+
const LegendItemTimeline = dynamic(
24+
() =>
25+
// @ts-ignore
26+
import('old-vizzuality-components').then(
27+
(mod) => mod.LegendItemTimeline
28+
),
29+
{
30+
ssr: false,
31+
}
32+
)
2233

2334
export function Legends() {
2435
const { data: layerGroups } = useLayerGroupsFromRW()
@@ -58,18 +69,20 @@ export function Legends() {
5869
key={`legend-list-item-${i}`}
5970
layerGroup={{
6071
...lg,
61-
visibility: !currentLayers.size || lg.layers
62-
.map((l: APILayerSpec) => {
63-
const layerState =
64-
currentLayers.get(l.id)
72+
visibility:
73+
!currentLayers.size ||
74+
lg.layers
75+
.map((l: APILayerSpec) => {
76+
const layerState =
77+
currentLayers.get(l.id)
6578

66-
if (layerState?.active) {
67-
return layerState.visibility
68-
}
79+
if (layerState?.active) {
80+
return layerState.visibility
81+
}
6982

70-
return false
71-
})
72-
.some((l: boolean) => l),
83+
return false
84+
})
85+
.some((l: boolean) => l),
7386
layers: lg.layers.map((l: APILayerSpec) => {
7487
const layerState = currentLayers.get(
7588
l.id
@@ -187,6 +200,7 @@ export function Legends() {
187200
) => !!l.timelineParams
188201
) && (
189202
<LegendItemTimeline
203+
// @ts-ignore
190204
onChangeLayer={(
191205
layer: APILayerSpec
192206
) => {

0 commit comments

Comments
 (0)