Mtc merge 2021 tweaks by landonreed · Pull Request #686 · ibi-group/datatools-ui

landonreed · 2021-06-11T14:28:16Z

Checklist

Appropriate branch selected (all PRs must first be merged to dev before they can be merged to master)
Any modified or new methods or classes have helpful JSDoc and code is thoroughly commented
The description lists all applicable issues this PR seeks to resolve
The description lists any configuration setting(s) that differ from the default settings
All tests and CI builds passing

Description

Contains UI tweaks that correspond to changes in ibi-group/datatools-server#376

lib/manager/actions/status.js

binh-dam-ibigroup · 2021-06-11T18:20:28Z

lib/manager/actions/status.js

+        <ul>
+          {failureReasons.map((r, i) => <li key={i}>{r}</li>)}
+        </ul>


Unrelated to this PR: a similar (scrolling) list could be added for successful merges.

I'm not sure I follow. What would this list show?

binh-dam-ibigroup

Looks fine

evansiroky · 2021-06-17T22:44:38Z

lib/manager/actions/status.js

  // Do nothing or show merged feed modal? Feed version is be created
-  details.push('Remapped ID count: ' + result.remappedReferences)
-  if (Object.keys(result.remappedIds).length > 0) {
+  details.push([messages('remappedIdCount'), remappedReferences].join(SEPARATOR))


Could there be a template string used in the english.yml file instead?

Addressed in 1c12390.

evansiroky · 2021-06-17T22:45:07Z

lib/manager/actions/status.js

    }
-    details.push('Remapped IDs: ' + remappedIdStrings.join(', '))
+    details.push(
+      [messages('remappedIds'), remappedIdStrings.join(', ')].join(SEPARATOR)


Could there be a template string used in the english.yml file instead?

Improved in 1c12390 with a proper list.

evansiroky · 2021-06-17T22:45:23Z

lib/manager/actions/status.js

    }
-    details.push('Skipped records: ' + skippedRecordsStrings.join(', '))
+    details.push(
+      [messages('skipped'), skippedRecordsStrings.join(', ')].join(SEPARATOR)


Could there be a template string used in the english.yml file instead?

Improved in 1c12390 with a proper list.

evansiroky · 2021-06-17T22:45:35Z

lib/manager/actions/status.js

-    details.push('ID conflicts: ' + result.idConflicts.join(', '))
+  if (idConflicts.length > 0) {
+    details.push(
+      [messages('idConflicts'), idConflicts.join(', ')].join(SEPARATOR)


Could there be a template string used in the english.yml file instead?

Improved in 1c12390 with a proper list.

evansiroky · 2021-06-17T22:48:03Z

i18n/english.yml

    title: Log in
+  MergeFeedsResult:
+    body:
+      failure: Merge failed with $errorCount errors.


This is inconsistent with the way template strings are done in components.FeedTransformationDescriptions.DeleteRecordsTransformation. Can we agree upon a consistent way of doing template strings?

Addressed in 1c12390.

evansiroky

Could use more template strings in certain places, and also it'd be nice to have an agreed-upon way of doing template strings.

…come.

… ones.

@evansiroky

Comments from @evansiroky were addressed.

miles-grant-ibigroup

My knowledge of our MTC additions is not so strong, but this all looks reasonable given the context

miles-grant-ibigroup · 2021-11-18T11:48:33Z

Assigning back to @binh-dam-ibigroup to coordinate merge with the backend

…alphabetically.

landonreed added 4 commits June 2, 2021 09:39

refactor(MergeFeedsResult): add strategy to modal

6a29237

refactor(status): update strategy messages; use i18n

8d8fdc5

refactor: update messages for merge feeds

e609564

refactor: fix message quotation

88dfe63

landonreed assigned evansiroky and binh-dam-ibigroup Jun 11, 2021

landonreed mentioned this pull request Jun 11, 2021

Add trip handling strategies for MTC feed merge ibi-group/datatools-server#376

Merged

5 tasks

binh-dam-ibigroup reviewed Jun 11, 2021

View reviewed changes

lib/manager/actions/status.js Show resolved Hide resolved

binh-dam-ibigroup reviewed Jun 11, 2021

View reviewed changes

lib/manager/actions/status.js Outdated Show resolved Hide resolved

binh-dam-ibigroup reviewed Jun 11, 2021

View reviewed changes

binh-dam-ibigroup approved these changes Jun 11, 2021

View reviewed changes

binh-dam-ibigroup removed their assignment Jun 11, 2021

refactor(status): fix inconsistent spacing

a3d19da

evansiroky reviewed Jun 17, 2021

View reviewed changes

evansiroky previously requested changes Jun 17, 2021

View reviewed changes

evansiroky assigned landonreed and unassigned evansiroky Jun 17, 2021

landonreed assigned binh-dam-ibigroup and unassigned landonreed Sep 11, 2021

binh-dam-ibigroup added 5 commits November 8, 2021 17:52

improvement(getMergeFeedMocalContent): Improve rendering of merge out…

1c12390

…come.

Merge branch 'dev' into mtc-merge-2021-tweaks

3abd214

refactor(Job status): Update text for merge strategies, remove unused…

809b3bd

… ones.

refactor(Merge status): Remove unused idConflict field.

529dec1

improvement(Merge status): Display a bullet list of trip ids to check.

3270382

binh-dam-ibigroup removed their assignment Nov 17, 2021

binh-dam-ibigroup assigned miles-grant-ibigroup Nov 17, 2021

binh-dam-ibigroup requested a review from miles-grant-ibigroup November 17, 2021 15:29

miles-grant-ibigroup approved these changes Nov 18, 2021

View reviewed changes

miles-grant-ibigroup added the ready for merge label Nov 18, 2021

miles-grant-ibigroup assigned binh-dam-ibigroup and unassigned miles-grant-ibigroup Nov 18, 2021

improvement(manager/actions/status): Display remapped tables and ids …

c00e7ad

…alphabetically.

binh-dam-ibigroup added Pending ext. approval and removed ready for merge labels Dec 9, 2021

binh-dam-ibigroup removed the Pending ext. approval label Jan 14, 2022

binh-dam-ibigroup merged commit b1f5b42 into dev Jan 14, 2022

binh-dam-ibigroup deleted the mtc-merge-2021-tweaks branch January 14, 2022 14:37

binh-dam-ibigroup mentioned this pull request Jan 14, 2022

MTC docs update 2021 #751

Merged

1 task

binh-dam-ibigroup mentioned this pull request Jun 22, 2022

Feature Release: June 22, 2022 #709

Merged

7 tasks

Conversation

landonreed commented Jun 11, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Description

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

binh-dam-ibigroup left a comment

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!

Choose a reason for hiding this comment

Uh oh!

evansiroky left a comment

Choose a reason for hiding this comment

Uh oh!

miles-grant-ibigroup left a comment • 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!

miles-grant-ibigroup commented Nov 18, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

landonreed commented Jun 11, 2021 •

edited

Loading

miles-grant-ibigroup left a comment •

edited

Loading