3818 - Migrate missing total land area for 2020 #3820
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
sorja
commented
May 22, 2024
sorja
commented
Closed
|
I noticed for some reason, for FRA 2020 we only had total land areas from 1980 onwards |
minotogna
approved these changes
May 22, 2024
mergify bot
added a commit
that referenced
this pull request
May 29, 2024
* 3797 - ODP - edit page allow 3 decimal digits to all percentage input fields (#3801) * 3797 - Refactor PercentInput & add precision prop * 3797 - Sanitizer: add precision prop for decimals * 3797 - Revert PercentInput changes & add precision prop * 3797 - Revert sanitizer changes * 3797 - Add precision param to acceptNextDecimal * 3797 - Allow input and paste with precision in odp percent fields * 3797 - Fix deleting natural regenerating forest percent crashing the app * 3797 - Add InputPercent component * 3797 - Remove ramda from useOnChange * 3807 - Fix tooltip not showing (#3808) * 3804 - add MetadataController.addColumn + add 2023 col to fra 2025 tables 5a and 5b (#3806) * v3.4.1 * 3802 - Enable and fix bulk download for 2025 (#3805) * 3802 - Enable and fix bulk download for 2025 * 3802 - special case for degradedForest * 3802 - fix 2020 annualreforestation * 3802 - fix degradedForest, otherLandWithTreeCover, specificForestCategoriesVariables, forestCharacteristicsVariables * 3802 - fix growingStockComposition * 3802 - fix primaryDesignatedManagementObjectiveVariables, forestOwnershipVariables * 3802 - fix 4a_individ * 3802 - fix 4b_unknown * 3802 - fix 4b_individuals * 3802 - fix forestpolicy * 3802 - fix areaofpermanentforestestate * hotfix translations (#3814) * Migrate missing total land area for 2020 (#3820) * 3690 - User pictures to public.file (#3819) * 3690 - Migrate user profile pictures to public.file * 3690 - file cleanup: Don't remove user avatars * 3690 - update user repository and related * update user meta * Fix user avatar update logic * add migration foru ser table --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Graph title issue in FRA 2020 dashboard #3815 (#3817) * en * es * ar * zh * ru * fr --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * fix migration (#3826) * fix style (#3828) --------- Co-authored-by: Yhoan Alejandro Guzmán García <41337901+yaguzmang@users.noreply.github.com> Co-authored-by: Mino Togna <minotogna@users.noreply.github.com> Co-authored-by: minotogna <mino.togna@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
mergify bot
added a commit
that referenced
this pull request
Jun 13, 2024
* 3797 - ODP - edit page allow 3 decimal digits to all percentage input fields (#3801) * 3797 - Refactor PercentInput & add precision prop * 3797 - Sanitizer: add precision prop for decimals * 3797 - Revert PercentInput changes & add precision prop * 3797 - Revert sanitizer changes * 3797 - Add precision param to acceptNextDecimal * 3797 - Allow input and paste with precision in odp percent fields * 3797 - Fix deleting natural regenerating forest percent crashing the app * 3797 - Add InputPercent component * 3797 - Remove ramda from useOnChange * 3807 - Fix tooltip not showing (#3808) * 3804 - add MetadataController.addColumn + add 2023 col to fra 2025 tables 5a and 5b (#3806) * v3.4.1 * 3802 - Enable and fix bulk download for 2025 (#3805) * 3802 - Enable and fix bulk download for 2025 * 3802 - special case for degradedForest * 3802 - fix 2020 annualreforestation * 3802 - fix degradedForest, otherLandWithTreeCover, specificForestCategoriesVariables, forestCharacteristicsVariables * 3802 - fix growingStockComposition * 3802 - fix primaryDesignatedManagementObjectiveVariables, forestOwnershipVariables * 3802 - fix 4a_individ * 3802 - fix 4b_unknown * 3802 - fix 4b_individuals * 3802 - fix forestpolicy * 3802 - fix areaofpermanentforestestate * hotfix translations (#3814) * Migrate missing total land area for 2020 (#3820) * 3690 - User pictures to public.file (#3819) * 3690 - Migrate user profile pictures to public.file * 3690 - file cleanup: Don't remove user avatars * 3690 - update user repository and related * update user meta * Fix user avatar update logic * add migration foru ser table --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Graph title issue in FRA 2020 dashboard #3815 (#3817) * en * es * ar * zh * ru * fr --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * fix migration (#3826) * fix style (#3828) * 3781 - Restore Print tables Toolbar link (#3831) * v3.4.2 * 3835: Data table UI: hide E flag to null value cells (#3836) * 3743 - Broken Links (#3811) * 3743 - Broken Links - Add cycle link tables (#3791) * 3743 - Add link tables * 3743 - Reorder link types * 3743 - Update link table * 3743 - Update link type * 3743 - Add locations and unique country/link constraint * 3743 - Update link type * 3743 - Broken links - Get all links to visit (#3812) * 3743 - Get Descriptions and ODPs with links * 3743 - Add Link controller -> get all links to visit * 3743 - Broken Links - Add visit cycle links worker (#3813) * 3743 - Add Link -> getMany * 3743 - Add Link -> upsertMany * 3743 - Add visit cycle links worker * 3743 - Close worker connections * 3743 - Fix update props * 3743 - Broken links - Add API endpoints & activity logs (#3823) * 3743 - Add Link api endpoints * 3743 - Add worker activity logs * 3743 - Rename Link to Links * 3743 - Rename Link type folder to Links * 3743 - Rename Link repository folder to Links * 3743 - Rename Link api folder to Links * 3743 - Rename Link controller folder to Links * 3743 - Update tests Links import * 3743 - Update activity log messages * 3743 - Broken Links - Add sockets events and Get verification job status (#3830) * 3743 - Add socket events * 3743 - Add endpoint to get if the verification job is in progress * 3743 Move getActiveVerifyJobs function * 3743 - Add local emit event function * 3743 - Add redux state and actions (#3832) * 3743 - Add admin links route * 3743 - Add translations * 3743 - Add Admin links table * 3743 - Update table with event listeners * Revert "3743 - Update table with event listeners" This reverts commit 66806e7. * Revert "3743 - Add Admin links table" This reverts commit d8f63fc. * Revert "3743 - Add translations" This reverts commit 24bbf33. * Revert "3743 - Add admin links route" This reverts commit 8f71842. * 3743 - Broken Links - UI Table (#3833) * 3743 - Add admin links route * 3743 - Add translations * 3743 - Add Admin links table * 3743 - Update table with event listeners * 3743 - Broken Links - Delete unused links and disable approve button (#3834) * 3743 - Disable approve button when the verify job is running * 3743 - Delete unused links * 3743 - Soft delete unused links * 3743 - Hide deleted links in the UI * 3743 - Remove visits column * 3743 - Update count on links table update * 3743 - Add excludeDeleted default value * 3743 - Remove visits count translation --------- Co-authored-by: Yhoan Alejandro Guzmán García <41337901+yaguzmang@users.noreply.github.com> Co-authored-by: Mino Togna <minotogna@users.noreply.github.com> Co-authored-by: minotogna <mino.togna@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
mergify bot
added a commit
that referenced
this pull request
Aug 28, 2024
* 3645 - introduce new CountryHome/Dashboard, deprecate old pages/Dashboard (#3705) * 3645 - Dashboard: component flow/hierarchy (#3710) * 3645 - initial component flow for Dashboard * fix metadata dashboard import * use div over React.Fragment for Dashboard * use div over React.Fragment for Dashboard * 3645 - Dashboard: Render table component pt.1 (#3725) * 3706 - CountryHome/Dashboard rename CountryHome/Overview to correspond UI * 3706 - Table: SectionAnchor optional * 3706 - Dashboard/Table: Render table metadata * 3645 - Dashboard: Forest growing stock and carbon (table) (#3726) * initial commit for table metadata * separate hooks * cleanup * cleanup and divide dashboard table metadata * cleanup optional props * use cols for columnNames * remove redundant cyclename * cleanup meta * remove any * 3645 - Dashboard: Primary Designated Management Objective (#3733) * minimal styling and primaryDesignatedManagementObjectiveDashboard * remove comment * remove comments * add laptop bp * 3645 - Dashboard: PieChart (#3740) * 3645 - Deprecate chartjs chart component * 3645 - add rechart * 3645 - PieChart meta * 3645 - PieChart component * 3645 - dashboard Table: relative import for hooks * 3645 - Dashboard: PieChart component * 3645 - move common hooks to Dashboard/hooks * 3645 - metadata: forestAreaPercentOfLandArea * fix import * 3645 - PieChart -> Pie * 3645 - Chart: Pass prop RecordAssessmentData * 3645 - PieChart -> Pie * 3645 - useChartData higher level * Primary forest percent of forest area (#3744) * 3645 - forestAreaWithinProtectedAreas (#3746) * 3645 - Dashboard: Forest ownership (#3747) * 3645 - use ResponsiveContainer * 3645 - get data from RecordColumnData with correct key (columnName) * 3645 - move grid-gap to breakpoint * 3645 - add forestOwnership chart * 3645 - add columnName to cell * 3645 - Dashboard: Forest Area Bar Chart (#3755) * 3645 - add component BarChart * 3645 - add component Dashboard/BarChart * 3645 - forest area bar chart meta * deepscan --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * 3645 - naturally regenerating forest area (#3757) * 3645 - Dashboard: Check sections exist to avoid crash (#3758) * Check sections loaded before rendering overview * fix table ids, fix missing uuids --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * 3645 - Dashboard: Titles show correct year (#3759) * Titles show correct year * ar * es * fr * ru * zh * 3645 - Dashboard: Axis labels (#3760) * axis labels * 3645 - xAxis and yAxis object type --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * 3645 - Dashboard: Translate labels (#3763) * 3645 - update bar chart labels * 3645 - update pie chart labels * 3645 - update translations * pie chart unit * 3645 - Dashboard: Fix bar chart label spacings (#3766) * fix alignment and spacing for bar chart * table readonly * Pie: Hide tiny values labeL (#3769) * Fix Primary forest % of forest area variable label (#3773) * Dashboard: Support only countries (#3775) * 3645 - Dashboard: update item/legend/tooltip styles (#3778) * 3645 - Dashboard: No data placeholder (#3761) * Initial commit for No Data placeholder * center no data * 3645 - update translation * 3645 - Dashboard: add spacing to bottom * 3645 - Dashboard: top level NoData component * 3645 - useHasData: check correct table data is fetched * code quality * _data -> data * add consistent style for dashboard items, remove NoData.scss * Dashboard/table: return null if data is still fetching * Dashboard/Items: Return null if data is still fetching * NoData: check data is not fetching * Top level check for isFetchig, hasData * 3645 - add translations * Update imports and fix No data display logic * Remove redundant check * reset style * remove styling --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * 3821 - Global Region (#3822) * 3821 - Migrate global 'WO' to regions * 3821 - CountryList: include globals by default as region * 3821 - Toolbar: Pass includeRegions as an array of regions to include * 3821 - Introduction: Only show fra2020 and secondary regions in region selector * Include all countries per global region (#3824) * 3645 - Dashboard: Merge development (translations) (#3829) * 3797 - ODP - edit page allow 3 decimal digits to all percentage input fields (#3801) * 3797 - Refactor PercentInput & add precision prop * 3797 - Sanitizer: add precision prop for decimals * 3797 - Revert PercentInput changes & add precision prop * 3797 - Revert sanitizer changes * 3797 - Add precision param to acceptNextDecimal * 3797 - Allow input and paste with precision in odp percent fields * 3797 - Fix deleting natural regenerating forest percent crashing the app * 3797 - Add InputPercent component * 3797 - Remove ramda from useOnChange * 3807 - Fix tooltip not showing (#3808) * 3804 - add MetadataController.addColumn + add 2023 col to fra 2025 tables 5a and 5b (#3806) * v3.4.1 * 3802 - Enable and fix bulk download for 2025 (#3805) * 3802 - Enable and fix bulk download for 2025 * 3802 - special case for degradedForest * 3802 - fix 2020 annualreforestation * 3802 - fix degradedForest, otherLandWithTreeCover, specificForestCategoriesVariables, forestCharacteristicsVariables * 3802 - fix growingStockComposition * 3802 - fix primaryDesignatedManagementObjectiveVariables, forestOwnershipVariables * 3802 - fix 4a_individ * 3802 - fix 4b_unknown * 3802 - fix 4b_individuals * 3802 - fix forestpolicy * 3802 - fix areaofpermanentforestestate * hotfix translations (#3814) * Migrate missing total land area for 2020 (#3820) * 3690 - User pictures to public.file (#3819) * 3690 - Migrate user profile pictures to public.file * 3690 - file cleanup: Don't remove user avatars * 3690 - update user repository and related * update user meta * Fix user avatar update logic * add migration foru ser table --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Graph title issue in FRA 2020 dashboard #3815 (#3817) * en * es * ar * zh * ru * fr --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * fix migration (#3826) * fix style (#3828) --------- Co-authored-by: Yhoan Alejandro Guzmán García <41337901+yaguzmang@users.noreply.github.com> Co-authored-by: Mino Togna <minotogna@users.noreply.github.com> Co-authored-by: minotogna <mino.togna@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * 3645 - Dashboard: Merge dev (#3838) * 3797 - ODP - edit page allow 3 decimal digits to all percentage input fields (#3801) * 3797 - Refactor PercentInput & add precision prop * 3797 - Sanitizer: add precision prop for decimals * 3797 - Revert PercentInput changes & add precision prop * 3797 - Revert sanitizer changes * 3797 - Add precision param to acceptNextDecimal * 3797 - Allow input and paste with precision in odp percent fields * 3797 - Fix deleting natural regenerating forest percent crashing the app * 3797 - Add InputPercent component * 3797 - Remove ramda from useOnChange * 3807 - Fix tooltip not showing (#3808) * 3804 - add MetadataController.addColumn + add 2023 col to fra 2025 tables 5a and 5b (#3806) * v3.4.1 * 3802 - Enable and fix bulk download for 2025 (#3805) * 3802 - Enable and fix bulk download for 2025 * 3802 - special case for degradedForest * 3802 - fix 2020 annualreforestation * 3802 - fix degradedForest, otherLandWithTreeCover, specificForestCategoriesVariables, forestCharacteristicsVariables * 3802 - fix growingStockComposition * 3802 - fix primaryDesignatedManagementObjectiveVariables, forestOwnershipVariables * 3802 - fix 4a_individ * 3802 - fix 4b_unknown * 3802 - fix 4b_individuals * 3802 - fix forestpolicy * 3802 - fix areaofpermanentforestestate * hotfix translations (#3814) * Migrate missing total land area for 2020 (#3820) * 3690 - User pictures to public.file (#3819) * 3690 - Migrate user profile pictures to public.file * 3690 - file cleanup: Don't remove user avatars * 3690 - update user repository and related * update user meta * Fix user avatar update logic * add migration foru ser table --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Graph title issue in FRA 2020 dashboard #3815 (#3817) * en * es * ar * zh * ru * fr --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * fix migration (#3826) * fix style (#3828) * 3781 - Restore Print tables Toolbar link (#3831) * v3.4.2 * 3835: Data table UI: hide E flag to null value cells (#3836) * 3743 - Broken Links (#3811) * 3743 - Broken Links - Add cycle link tables (#3791) * 3743 - Add link tables * 3743 - Reorder link types * 3743 - Update link table * 3743 - Update link type * 3743 - Add locations and unique country/link constraint * 3743 - Update link type * 3743 - Broken links - Get all links to visit (#3812) * 3743 - Get Descriptions and ODPs with links * 3743 - Add Link controller -> get all links to visit * 3743 - Broken Links - Add visit cycle links worker (#3813) * 3743 - Add Link -> getMany * 3743 - Add Link -> upsertMany * 3743 - Add visit cycle links worker * 3743 - Close worker connections * 3743 - Fix update props * 3743 - Broken links - Add API endpoints & activity logs (#3823) * 3743 - Add Link api endpoints * 3743 - Add worker activity logs * 3743 - Rename Link to Links * 3743 - Rename Link type folder to Links * 3743 - Rename Link repository folder to Links * 3743 - Rename Link api folder to Links * 3743 - Rename Link controller folder to Links * 3743 - Update tests Links import * 3743 - Update activity log messages * 3743 - Broken Links - Add sockets events and Get verification job status (#3830) * 3743 - Add socket events * 3743 - Add endpoint to get if the verification job is in progress * 3743 Move getActiveVerifyJobs function * 3743 - Add local emit event function * 3743 - Add redux state and actions (#3832) * 3743 - Add admin links route * 3743 - Add translations * 3743 - Add Admin links table * 3743 - Update table with event listeners * Revert "3743 - Update table with event listeners" This reverts commit 66806e7. * Revert "3743 - Add Admin links table" This reverts commit d8f63fc. * Revert "3743 - Add translations" This reverts commit 24bbf33. * Revert "3743 - Add admin links route" This reverts commit 8f71842. * 3743 - Broken Links - UI Table (#3833) * 3743 - Add admin links route * 3743 - Add translations * 3743 - Add Admin links table * 3743 - Update table with event listeners * 3743 - Broken Links - Delete unused links and disable approve button (#3834) * 3743 - Disable approve button when the verify job is running * 3743 - Delete unused links * 3743 - Soft delete unused links * 3743 - Hide deleted links in the UI * 3743 - Remove visits column * 3743 - Update count on links table update * 3743 - Add excludeDeleted default value * 3743 - Remove visits count translation --------- Co-authored-by: Yhoan Alejandro Guzmán García <41337901+yaguzmang@users.noreply.github.com> Co-authored-by: Mino Togna <minotogna@users.noreply.github.com> Co-authored-by: minotogna <mino.togna@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Introduce hidden variables: carbon_stock_biomass_total, carbon_stock_total (#3839) * 3645 - Dashbaord: Subticket 3785 - Value aggregate: Region Data fetching (#3825) * initial commit for region view * migration: creat fao estimates mat views * 3645 - Allow region dashboard * 3785 - canEditData: Check country exists and countryIso is not region * 3785 - getTableData: region data * dont exclude data * rename refreshMaterializedView to refreshMaterilizedFaoEstimateView * 3785 - cycle init: create faoEstimate views * remove aggregateProp * faoEstimate only fra * getFaoEstimateViewName * fix typo * 3785 - remove and deprecate value_aggregate * 3785 - add todo to migration, fix null values * 3785 - remove and deprecate value_aggregate * 3785 - remove unused faoEstimate view related code * 3785 - fix extent of forest total land area (use node_ext) * 3785 - initial commit for node ext table data * 3785 - meta/mergeRecordTableData, sumCountryValues * 3785 - API/getTableData: separate region * 3785 - createCycle: remove fao estimate * 3785 - getTableData: extract common code * 3785 - introduce getAggregatedTableData * 3785 - CountryRegionRepository.getManyRegionCountries * 3785 - getAggregatedTableData: countryISOs -> regionCode * 3785 - sumCountryValues: skip originalDataPointValue * 3785 - merged data param variables * 3785 - getAggregatedTableData: add debug variable type: node_ext * 3785 - fix migration * dont migrate forestArea * 3785 - fix totalLandArea merge * remove naturalForestArea migration * deepscaN * remove unused code * useDependencies: remove staticDependencies * createCycle: Add returned * generateMetacache: remove redundant promise.all * get only fao estimates * 3785 - update getAggregatedTableData logic * deepscan * CountryRegionRepository.getManyRegionCountries -> CountryRepository.getCountryIsos --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * 3645 - Dashboard: Forest growing stock and carbon (#3843) * fix carbon stock in biomass, carbon stock total * migrate growing stock * 3645 - Dashboard: Fix units (#3844) * units carbon/growing * Primary designated management objective unit * 3645 - Dashboard: Compare data (#3846) * initial commit for csv compare * 3785 - API Util return countries, regionGroups * 3785 - tool utils: CSV.write * 3785 - compare dashboard data * Show real values for pie chart (#3847) * 3645 - Dashboard: Show units in tables (#3848) * unit for carbon/growing stock * unit prim des mgmnt obj * unit ar * es fr ru zh units * Add missing units for pei charts (#3849) * deprecate value_aggregate (#3865) * add missing untis for 2025 (#3867) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * 3785 - use recharts for geo (#3866) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * fix barchart label spacing (#3868) * delete chartjs and old dashboard (#3869) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * 3645 - Dashboard: Pie chart label on top with percentage (#3870) * Pie chart label on right * pie chart label top * 3645 - Dashboard: Use only value aggregate (#3873) * initial commit * get region data fix * remove comments --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * 3645 - Dashboard: Hide overview for unpublished regions (#3874) * Hide regions for unpublished regions * check for fra 2025 * Show percentage in tooltip (#3875) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * fix units for regions (#3876) * minor cleanup (#3877) * fix spacing for barchart (#3881) * 3645 - Dashboard: Update tooltip style (#3880) * 3785 - consistent label between pie and barchart * 3785 - clean up code * fix import --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * 3882 - Global and Regions pages accessed only to admin (#3886) * Bar,PieChart: Update tooltip label (#3895) Pie chart: Remove label, show only name Bar chart: Show name and column label Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --------- Co-authored-by: Mino Togna <minotogna@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Yhoan Alejandro Guzmán García <41337901+yaguzmang@users.noreply.github.com> Co-authored-by: minotogna <mino.togna@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.