Custom Labels Step 2 #1120

jiji14 · 2023-12-29T21:37:17Z

Related Issue

What I added

Manage Custom Labels on Profile Tab.
Add Insert / Delete Functions

Result

Please check out to `customize-modes` branch in the `Server` repository for testing.

increase new mode frequency and decrease old mode frequency

…setup

… tab and the 'Profile' tab

TODO : handling custom purpose label

…replaced_mode ...) functions to em

codecov · 2024-01-12T18:30:28Z

Codecov Report

Attention: Patch coverage is 0% with 76 lines in your changes missing coverage. Please review.

Project coverage is 30.09%. Comparing base (b390967) to head (52b0fb9).
Report is 19 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1120      +/-   ##
==========================================
- Coverage   30.36%   30.09%   -0.27%     
==========================================
  Files         118      118              
  Lines        5256     5203      -53     
  Branches     1106     1113       +7     
==========================================
- Hits         1596     1566      -30     
+ Misses       3658     3635      -23     
  Partials        2        2

Flag	Coverage Δ
unit	`30.09% <0.00%> (-0.27%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
www/js/control/ProfileSettings.tsx	`0.00% <0.00%> (ø)`
www/js/App.tsx	`0.00% <0.00%> (ø)`
www/js/survey/multilabel/MultiLabelButtonGroup.tsx	`0.00% <0.00%> (ø)`
www/js/control/CustomLabelSettingRow.tsx	`0.00% <0.00%> (ø)`

... and 2 files with indirect coverage changes

…-phone into customize-modes-step2

The `Icon` component was added in 5.11.0 and is referenced in CustomLabelSettingRow. So we must use 5.11.0 at minimum

JGreenlee · 2024-02-09T18:48:04Z

@jiji14 Can you change target branch to master?

jiji14 · 2024-02-09T20:11:49Z

@jiji14 Can you change target branch to master?

Done!

JGreenlee · 2024-02-10T02:21:43Z

I noticed a few issues while testing this.

I don't know if they were present before; they could be new issues from merging in changes from upstream. I also merged in Step 1 here so we can be sure Step 1 and Step 2 are working together.

Either way, @jiji14 could you take a look?

Custom Labels from label screen don't appear on profile screen

Go to the Profile screen > Manage Custom Labels and see the list of current labels (if any). Then go to the Label screen and add a custom label (via "Other..."). Then go back to the Profile screen > Manage Custom Labels, the new label does not appear immediately. After reloading, the new label does appear there

Custom labels don't appear on label screen until you interact with the "Other" input

On the label screen, I can go to "Other" and add a new custom label. Then if I go to label a new trip, the custom label shows (as expected). But if I kill the app and re-open the app, they appear to have disappeared. When I add a new custom label, I see the old ones again.

jiji14 · 2024-02-16T02:08:40Z

@JGreenlee

The error occurred after merging. I fixed the bugs and also took care of the code coverage issue

JGreenlee

I tested this again and it works really well! The bugs from merging in were probably my mistake (bad merge conflict resolution).

Below are 3 quick suggestions I have, once they are applied I will pass this along!

jest.config.js

www/js/control/ProfileSettings.tsx

www/js/App.tsx

Co-authored-by: Jack Greenlee <JackAGreenlee@gmail.com>

jiji14 · 2024-02-17T06:09:32Z

@JGreenlee
Thanks for all the suggestions. It looks great so I updated the codes :)

@shankari
Please note that server code needs to be merged first before this PR.

shankari · 2024-03-25T19:53:25Z

@jiji14 or @JGreenlee can you resolve the merge conflict? I will likely target another staging release for this week so we can be testing next week.

JGreenlee · 2024-03-25T19:57:34Z

resolved

…into customize-modes-step2

@Abby-Wheelis

Support e-mission/e-mission-phone#1120 and other changes found while adding it. @Abby-Wheelis we may want to check with the Lao team and sync up changes (potentially using @JGreenlee's script) since the custom label changes will be fairly visibile.

shankari

I'm going to go ahead and merge this since it is correct, but I think it might need enhancements as part of the CO2 calculations. Right now, when the user adds a new custom mode, we don't store any CO2 information as part of it. It seems like we should, but it is not clear that the end user knows the energy/emissions intensity of the mode that they add.

I can put this up on staging/nrel-commute for now, but we should really decide how we are going to handle this before we move to production in general, since otherwise we have to deal with data migration.

shankari · 2024-07-19T23:45:14Z

www/i18n/en.json

Added Spanish translations in e-mission/e-mission-translate@e658a1a. Still need to add Lao translations @Abby-Wheelis

shankari · 2024-07-20T00:29:57Z

www/js/App.tsx

 import { initCustomDatasetHelper } from './metrics/customMetricsHelper';
 import AlertBar from './components/AlertBar';
 import Main from './Main';

 export const AppContext = createContext<any>({});
+const CUSTOM_LABEL_KEYS_IN_DATABASE = ['mode', 'purpose'];


@JGreenlee don't we need this for replaced mode as well? Or is the expectation that the replaced mode will also share the custom labels from the regular mode?

shankari · 2024-07-20T00:49:26Z

www/js/survey/multilabel/MultiLabelButtonGroup.tsx

+                              {(modalVisibleFor === 'MODE' ||
+                                modalVisibleFor === 'REPLACED_MODE') &&
+                                t('trip-confirm.custom-mode')}


Ah I see that we do in fact use the same values for both MODE and REPLACED_MODE

jiji14 added 22 commits December 1, 2023 11:53

show customized modes (used dummy data for now)

1b57f5e

fix prettier issu

cad2d7c

fetch post/mode

74e2dfe

use displayErrorMsg

0402a34

Done with fetching data to server

09b56ee

update mode - old mode and new mode

a3cb1f2

increase new mode frequency and decrease old mode frequency

Change modes type to string array and call it when modal opens

abc7f8a

add comments

cb1c491

change mode text in a desired format (ex) my_car => My Car

0a7a4ba

add default mode & custom mode label

8ba3fb6

noted that getModes & updateMode need to be tested after e2e testing …

aa18e98

…setup

reuse existing common function and delete the original function

7548de7

use dynamic color

01c1afe

change logic for showing custom modes before 'other' option

b5a63be

change function names more descriptive

f64d719

delete unnecessary variable and change variable names more intuitive

14c4438

add new translation entry

447e7e2

Fetch custom modes on initial rendering to prevent unnecessary api calls

0509d5e

add 'custom modes' tab in Profile

23f4758

Move customModes state to AppContext to be shared between the 'Label'…

0ef37b4

… tab and the 'Profile' tab

separate the component for clean code

de9008f

Add insert user custom mode feature

07f4534

jiji14 changed the title ~~Customize modes step2~~ Custom mode step2 Dec 29, 2023

jiji14 marked this pull request as draft December 29, 2023 21:37

jiji14 changed the title ~~Custom mode step2~~ Customize modes step2 Dec 29, 2023

jiji14 added 3 commits January 3, 2024 12:20

check if inputType is 'MODE' for custom mode label

189f79d

TODO : handling custom purpose label

Modify the mode functions to encompass all types of labels (purpose, …

643ae90

…replaced_mode ...) functions to em

Merge branch 'customize-modes' into customize-modes-step2

315561e

jiji14 changed the title ~~Customize modes step2~~ Custom Labels step2 Jan 9, 2024

jiji14 mentioned this pull request Jan 9, 2024

User Customize Labels e-mission/e-mission-server#946

Merged

jiji14 added 3 commits January 12, 2024 10:18

add skipped test functions

4192269

Change list title "edit custom labels" -> "manage custom labels""

0e0569e

Merge branch 'service_rewrite_2023' into customize-modes-step2

7eb31dd

jiji14 marked this pull request as ready for review January 12, 2024 18:23

JGreenlee added 2 commits February 9, 2024 13:45

Merge branch 'customize-modes' of https://github.com/jiji14/e-mission…

2a1a12c

…-phone into customize-modes-step2

bump 'react-native-paper' to ^5.11.0

0c87797

The `Icon` component was added in 5.11.0 and is referenced in CustomLabelSettingRow. So we must use 5.11.0 at minimum

jiji14 changed the base branch from service_rewrite_2023 to master February 9, 2024 19:42

Merge branch 'master' into customize-modes-step2

7e09923

JGreenlee mentioned this pull request Feb 13, 2024

Customize Labels Step 1 #1110

Closed

jiji14 added 2 commits February 15, 2024 02:36

fix label context issue after merge

ae66eff

ignore commHelper from coverage report

3453205

delete not operator

26264ce

JGreenlee requested changes Feb 16, 2024

View reviewed changes

jest.config.js Outdated Show resolved Hide resolved

www/js/control/ProfileSettings.tsx Outdated Show resolved Hide resolved

www/js/App.tsx Outdated Show resolved Hide resolved

jiji14 and others added 3 commits February 16, 2024 22:05

add comment why we need to ingnore commHelper in coverage report

cba51b8

Co-authored-by: Jack Greenlee <JackAGreenlee@gmail.com>

delete duplicated code

96386a3

Co-authored-by: Jack Greenlee <JackAGreenlee@gmail.com>

show customLabel setting conditionally

15c994a

Co-authored-by: Jack Greenlee <JackAGreenlee@gmail.com>

JGreenlee approved these changes Feb 17, 2024

View reviewed changes

Merge branch 'master' into customize-modes-step2

45bfc2d

Merge branch 'master' of https://github.com/e-mission/e-mission-phone …

52b0fb9

…into customize-modes-step2

shankari approved these changes Jul 20, 2024

View reviewed changes

shankari merged commit 90595e9 into e-mission:master Jul 20, 2024
6 of 8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Custom Labels Step 2 #1120

Custom Labels Step 2 #1120

jiji14 commented Dec 29, 2023 •

edited

Loading

codecov bot commented Jan 12, 2024 •

edited

Loading

JGreenlee commented Feb 9, 2024

jiji14 commented Feb 9, 2024

JGreenlee commented Feb 10, 2024

jiji14 commented Feb 16, 2024

JGreenlee left a comment

jiji14 commented Feb 17, 2024 •

edited

Loading

shankari commented Mar 25, 2024

JGreenlee commented Mar 25, 2024

shankari left a comment

shankari Jul 19, 2024

shankari Jul 20, 2024

shankari Jul 20, 2024

Custom Labels Step 2 #1120

Custom Labels Step 2 #1120

Conversation

jiji14 commented Dec 29, 2023 • edited Loading

Related Issue

What I added

Result

Please check out to customize-modes branch in the Server repository for testing.

codecov bot commented Jan 12, 2024 • edited Loading

Codecov Report

JGreenlee commented Feb 9, 2024

jiji14 commented Feb 9, 2024

JGreenlee commented Feb 10, 2024

Custom Labels from label screen don't appear on profile screen

Custom labels don't appear on label screen until you interact with the "Other" input

jiji14 commented Feb 16, 2024

JGreenlee left a comment

Choose a reason for hiding this comment

jiji14 commented Feb 17, 2024 • edited Loading

shankari commented Mar 25, 2024

JGreenlee commented Mar 25, 2024

shankari left a comment

Choose a reason for hiding this comment

shankari Jul 19, 2024

Choose a reason for hiding this comment

shankari Jul 20, 2024

Choose a reason for hiding this comment

shankari Jul 20, 2024

Choose a reason for hiding this comment

jiji14 commented Dec 29, 2023 •

edited

Loading

Please check out to `customize-modes` branch in the `Server` repository for testing.

codecov bot commented Jan 12, 2024 •

edited

Loading

jiji14 commented Feb 17, 2024 •

edited

Loading