Release November 2nd, 2022 by mariahosfeld · Pull Request #1597 · Plant-for-the-Planet-org/planet-webapp

mariahosfeld · 2022-10-26T08:36:40Z

Includes:
Features
#1579 Feature/change route plant location
#1592 Feature/add giftfund

Other
#1585 Dashboard maintenace refactor
#1594 add notion link
#1598 Language Update
#1601 Release cleanup

- update BulkCodeSteps to string values - set up tabConfig and enable/disable conditions - use common CenteredContainer - allow BulkCodesForm to occupy full container width

…y param

1. Add translation 2. Add box shadow

add notion link

vercel · 2022-10-26T08:36:42Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Updated
planet-webapp	✅ Ready (Inspect)	Visit Preview	Nov 2, 2022 at 2:19PM (UTC)

Project Name: Planet Webapp Project Link: https://translate.lingohub.com/plant-for-the-planet/dashboard/planet-webapp User: Norbert Schuler Easy language translations with LingoHub 🚀

…age_update_2022-10-26Z Language update from LingoHub 🤖 on 2022-10-26Z

- along with 77126b5 - uses a common InlineFormDisplayGroup where needed - fix alignment in groups not containing only text fields with type prop - update min text field width to 180px

- reason > lighter API call - also update types/interfaces a. rename `APISingleProject` > `MapSingleProject` to reflect API resp. b. use `MapSingleProject` instead of `SingleProject` in DonationLinkForm c. remove unused APISingleProject/SingleProject interfaces d. move `MapSingleProject` to project type file

…ftfund Feature/add giftfund

sagararyal · 2022-10-31T14:18:20Z

📝 Changed routes:

/[p]	/profile/giftfund
^{(view full size)}	^{(view full size)}

Commit d852d6c (https://planet-webapp-gn31vt9er-planetapp.vercel.app).

…ard-maintenance-refactor Dashboard maintenance refactor

…Route_plantLocation Feature/change route plant location

mohitb35 · 2022-11-02T11:51:03Z

 import { getAllPlantLocations } from '../src/utils/maps/plantLocations';
 import i18next from '../i18n';
+import { SingleProjectGeojson } from '../src/features/common/types/project';
+import { Treemapper } from '../src/features/user/TreeMapper/Treemapper';


It is not necessary to import a namespace. The namespace Treemapper can be referenced within the application without importing it.

Addressed here - #1601

mohitb35 · 2022-11-02T11:51:33Z

@@ -1,4 +1,4 @@
-declare namespace Treemapper {
+export declare namespace Treemapper {


You do not need to export a namespace. Once declared it is accessible throughout the application.

Addressed here - #1601

mohitb35 · 2022-11-02T11:55:06Z

@@ -28,11 +29,15 @@ export default function Donate({
  const [internalCurrencyCode, setInternalCurrencyCode] = React.useState('');
  const [internalLanguage, setInternalLanguage] = React.useState('');
  const [open, setOpen] = React.useState(false);


open is not an unused variable, so we can precede it with _ to remove the TS warning.

Addressed here - #1601

mohitb35 · 2022-11-02T13:01:56Z

    : '';

-  const { selectedPl, hoveredPl } = React.useContext(ProjectPropsContext);
+  const { selectedPl, hoveredPl, selectedSite } =


We don't seem to be using selectedSite here.

Addressed here - #1601

mohitb35 · 2022-11-02T13:07:47Z

+      <Head>
+        <title>{t('giftFund')}</title>
+      </Head>
+      <GiftFunds />


Perhaps this TS warning should be addressed.

Its return type 'false | Element' is not a valid JSX element. Type 'boolean' is not assignable to type 'ReactElement<any, any>'.```

Addressed here - #1601

mohitb35 · 2022-11-02T13:11:38Z

+        {user.planetCash.giftFunds
+          .filter((gift) => gift.openUnits !== 0)
+          .map((gift, index) => (
+            //Not displaying details for gift fund where open units = 0
+            <div className={styles.container} key={index}>
+              <div className={styles.container_heading}>
+                <b>
+                  {user.planetCash?.country}/{user.planetCash?.currency}{' '}
+                  {t('title')}
+                </b>
+              </div>
+              <hr />
+              <div className={styles.container_details}>
+                <div className={styles.project}>
+                  <b>{t('project')}</b>
+                  <p>{gift.project}</p>
+                </div>
+
+                <div className={styles.unit}>
+                  <b>{t('units')}</b>
+                  <p>{Number(gift.openUnits / 100).toFixed(2)}</p>
+                </div>
+              </div>
+            </div>
+          ))}


It may make sense to clean this up by separating the render logic into a different function. Also, address the TS errors in this file. - Noted in #1600

mohitb35 · 2022-11-02T13:13:16Z

+    ready && (
+      <DashboardView
+        title={t('title')}
+        subtitle={
+          <p>
+            {t('description1')}
+            <br />
+            {t('description2')}
+          </p>
+        }
+      >
+        <Details />
+      </DashboardView>
+    )
+  );
+};


It may make sense to refactor this at a later time to use common components like SingleColumnView - Noted in #1600

mohitb35 · 2022-11-02T13:15:17Z

+    hr {
+        border: 1px solid #DDDBDA;
+    }
+}


It may be good to refactor this slightly to use styled css in a similar manner to the other features added to the dashboard recently. (At a later date) - Noted in #1600

> as namespaces do not need to exported/imported

- due to unused state variable `open` - unused context parameter `selectedSite`

- explicitly define return types for functional component `Details` - component was implicitly returning `JSX.Element` or `false` - refactor code to return `ReactElement` | `null`

…e-cleanup-2-nov-22 Release cleanup

Shreyaschorge

LGTM

sunilsabatp and others added 20 commits October 2, 2022 09:38

added site and ploc router

feaf930

vercel error

1c0516d

defined types

9cefb99

eslint error

12506a3

deleted node module

268bc88

downgraded @type/react package

bcec489

refactor: update bulk codes to common TabbedView

75fa147

- update BulkCodeSteps to string values - set up tabConfig and enable/disable conditions - use common CenteredContainer - allow BulkCodesForm to occupy full container width

temp: use InlineFormDisplayGroup where poss.

77126b5

fix the route for project site

3437da2

redirect to correct site if wrong site name passed into for site quer…

4d176d5

…y param

zoom to planting location based on query param ploc value

7cbc71f

change ploc query param value when select to any plantlocation

36de0e9

add menu item + add route

e391ed1

display gift funds

2d89406

add notion link

9d07b6e

[CodeFactor] Apply fixes to commit 9d07b6e

a674208

Changes made:

838acd4

1. Add translation 2. Add box shadow

add condition for open units=0

296a4cb

add condition to not display gift funds for non planet cash accounts

1215ab9

Merge pull request #1594 from Plant-for-the-Planet-org/feature/add-link

77883a4

add notion link

pr-triage Bot added the PR: unreviewed label Oct 26, 2022

vercel Bot deployed to Preview October 26, 2022 08:37 View deployment

prachigarg19 and others added 4 commits October 26, 2022 14:59

remove menu item for empty gift fund or 0 open units in all gift funds

61ac7c6

Language update from LingoHub 🤖

e7b943a

Project Name: Planet Webapp Project Link: https://translate.lingohub.com/plant-for-the-planet/dashboard/planet-webapp User: Norbert Schuler Easy language translations with LingoHub 🚀

Merge branch 'develop' into feature/dashboard-maintenance-refactor

b947ccc

Merge pull request #1598 from Plant-for-the-Planet-org/lingohub_langu…

a382a50

…age_update_2022-10-26Z Language update from LingoHub 🤖 on 2022-10-26Z

vercel Bot deployed to Preview October 27, 2022 07:17 View deployment

mohitb35 and others added 2 commits October 27, 2022 16:49

refactor: use InlineFormDisplayGroup

ec86c7b

- along with 77126b5 - uses a common InlineFormDisplayGroup where needed - fix alignment in groups not containing only text fields with type prop - update min text field width to 180px

resolved conflicts

90c0d96

mohitb35 and others added 7 commits October 31, 2022 11:33

refactor: move SingleColumnView to separate dir

4e9a5f5

redirect user

a403465

docs: add docs for common layout components

053bc4e

improve condition for redirecting user

166c866

improve condition to redirect user

7e4a8b1

Merge pull request #1592 from Plant-for-the-Planet-org/feature/add-gi…

0d2da63

…ftfund Feature/add giftfund

vercel Bot deployed to Preview October 31, 2022 14:18 View deployment

sunilsabatp and others added 3 commits November 1, 2022 21:33

fix: typescript

36ae3cb

fix: the route for invalid hid

31ec851

Merge pull request #1585 from Plant-for-the-Planet-org/feature/dashbo…

b1152ce

…ard-maintenance-refactor Dashboard maintenance refactor

vercel Bot deployed to Preview November 2, 2022 07:39 View deployment

Merge pull request #1579 from Plant-for-the-Planet-org/feature/change…

4f2fc54

…Route_plantLocation Feature/change route plant location

vercel Bot deployed to Preview November 2, 2022 08:01 View deployment

mariahosfeld changed the title ~~Release November 2022~~ Release November 2nd, 2022 Nov 2, 2022

mohitb35 self-requested a review November 2, 2022 10:48

mohitb35 reviewed Nov 2, 2022

View reviewed changes

mohitb35 mentioned this pull request Nov 2, 2022

Minor Code Refactors/Cleanup for Gift Funds #1600

Closed

3 tasks

mohitb35 and others added 4 commits November 2, 2022 19:09

fix: remove export of namespace Treemapper

dbc6c37

> as namespaces do not need to exported/imported

fix: remove TS errors

a06a7ed

- due to unused state variable `open` - unused context parameter `selectedSite`

fix: refactor render code to remove TS error

217c2f1

- explicitly define return types for functional component `Details` - component was implicitly returning `JSX.Element` or `false` - refactor code to return `ReactElement` | `null`

Merge pull request #1601 from Plant-for-the-Planet-org/feature/releas…

d852d6c

…e-cleanup-2-nov-22 Release cleanup

vercel Bot deployed to Preview November 2, 2022 14:20 View deployment

Shreyaschorge approved these changes Nov 2, 2022

View reviewed changes

pr-triage Bot added PR: reviewed-approved and removed PR: unreviewed labels Nov 2, 2022

mariahosfeld merged commit 82b3c46 into main Nov 2, 2022

pr-triage Bot added PR: merged and removed PR: reviewed-approved labels Nov 2, 2022

		@@ -1,4 +1,4 @@
		declare namespace Treemapper {
		export declare namespace Treemapper {

Conversation

mariahosfeld commented Oct 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vercel Bot commented Oct 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sagararyal commented Oct 31, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📝 Changed routes:

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mohitb35 Nov 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mohitb35 Nov 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mohitb35 Nov 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Shreyaschorge left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

mariahosfeld commented Oct 26, 2022 •

edited

Loading

vercel Bot commented Oct 26, 2022 •

edited

Loading

sagararyal commented Oct 31, 2022 •

edited

Loading

mohitb35 Nov 2, 2022 •

edited

Loading

mohitb35 Nov 2, 2022 •

edited

Loading

mohitb35 Nov 2, 2022 •

edited

Loading