WIP: Feature #3186/import alignment data with USFM import, and fix alignment export to USFM #3868

PhotoNomad0 · 2018-02-17T12:36:12Z

Closed due to breaking changes in develop. Created new: #3895

Describe what your pull request addresses (Please include relevant issue numbers):

Fixes GL Alignment Data Import as Target Language Project from USFM 3 File #3186
- issue to import alignment data contained in USFM3 file
Fixes Fix issues with USFM3 alignment export #3756
- issue on USFM export that verse markers are not at beginning of line (depends on Bugfix #3756/fix missing new lines in usfm export usfm-js#33)
- issue on alignment export that unaligned chapters are not included in the output

Please include detailed Test instructions for your pull request:

on USFM export, should see chapter and verse markers beginning on new lines.
on USFM export of project with unaligned chapters, should see data for all chapters, even the unaligned.
on USFM import of project with alignments, should see same alignment data in WA: unaligned words should show up in word bank and aligned words should show also.

Standard Test Instructions for PR Review Process:

This change is

codecov · 2018-02-17T12:53:21Z

Codecov Report

Merging #3868 into develop will increase coverage by 0.33%.
The diff coverage is 84.31%.

@@             Coverage Diff             @@
##           develop    #3868      +/-   ##
===========================================
+ Coverage    49.71%   50.05%   +0.33%     
===========================================
  Files          224      224              
  Lines         5652     5710      +58     
  Branches       905      922      +17     
===========================================
+ Hits          2810     2858      +48     
- Misses        2434     2440       +6     
- Partials       408      412       +4

Impacted Files	Coverage Δ
src/js/actions/WordAlignmentActions.js	`29.77% <ø> (ø)`	⬆️
src/js/actions/WordAlignmentLoadActions.js	`74.13% <100%> (ø)`	⬆️
src/js/helpers/VerseObjectHelpers.js	`95.58% <100%> (ø)`	⬆️
src/js/helpers/ResourcesHelpers.js	`77.89% <100%> (+1.29%)`	⬆️
src/js/helpers/AlignmentHelpers.js	`94.23% <60%> (-2.62%)`	⬇️
src/js/helpers/WordAlignmentHelpers.js	`91.83% <68.18%> (-5.64%)`	⬇️
...FileConversionHelpers/UsfmFileConversionHelpers.js	`87.5% <90%> (+0.26%)`	⬆️
src/js/actions/ResourcesActions.js	`68.67% <94.11%> (+3.67%)`	⬆️
src/js/helpers/manifestHelpers.js	`45.94% <0%> (-2.71%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fd2ffe9...4486dbc. Read the comment docs.

…ationCore into feature-mcleanb-3186/importAlignmentDataWithUSFM.2

klappy · 2018-02-20T01:27:27Z

src/js/helpers/ResourcesHelpers.js, line 18 at r2 (raw file):

      const STATIC_RESOURCES_BIBLES_PATH = path.join(STATIC_RESOURCES_PATH, languagesId, 'bibles');
      const BIBLE_RESOURCES_PATH = path.join(USER_RESOURCES_PATH, languagesId, 'bibles');
      let bibleNames = fs.readdirSync(STATIC_RESOURCES_BIBLES_PATH).filter(folder => { // filter out .DS_Store

Was this added back on purpose? These were filtered out since they weren't doing anything. There aren't any folders .DS_Store just files and we don't need these in this file, it happens in a few blocks below as well.

Comments from Reviewable

klappy · 2018-02-20T01:34:22Z

Reviewed 8 of 11 files at r1, 2 of 2 files at r2.
Review status: 10 of 13 files reviewed at latest revision, 1 unresolved discussion, some commit checks failed.

Comments from Reviewable

PhotoNomad0 · 2018-02-20T11:36:54Z

Review status: 10 of 13 files reviewed at latest revision, 1 unresolved discussion, some commit checks failed.

src/js/helpers/ResourcesHelpers.js, line 18 at r2 (raw file):

Previously, klappy (Christopher Klapp) wrote…

Was this added back on purpose? These were filtered out since they weren't doing anything. There aren't any folders .DS_Store just files and we don't need these in this file, it happens in a few blocks below as well.

I don't know where it was added, but I don't see any check to make sure these are folders before copying.

Comments from Reviewable

…ationCore into feature-mcleanb-3186/importAlignmentDataWithUSFM.2 # Conflicts: # src/js/helpers/WordAlignmentHelpers.js

PhotoNomad0 · 2018-02-20T12:12:30Z

Review status: 6 of 11 files reviewed at latest revision, 1 unresolved discussion.

src/js/helpers/ResourcesHelpers.js, line 18 at r2 (raw file):

Previously, PhotoNomad0 (Bruce McLean) wrote…

I don't know where it was added, but I don't see any check to make sure these are folders before copying.

It looks like I hadn't merged with develop recently.

Comments from Reviewable

PhotoNomad0 · 2018-02-20T12:12:41Z

Review status: 6 of 11 files reviewed at latest revision, 1 unresolved discussion.

src/js/helpers/ResourcesHelpers.js, line 18 at r2 (raw file):

Previously, PhotoNomad0 (Bruce McLean) wrote…

It looks like I hadn't merged with develop recently.

Done.

Comments from Reviewable

klappy · 2018-02-20T16:14:39Z

Reviewed 1 of 11 files at r1, 1 of 4 files at r3.
Review status: 7 of 11 files reviewed at latest revision, all discussions resolved.

Comments from Reviewable

klappy · 2018-02-20T16:14:51Z

Reviewed 1 of 4 files at r3.
Review status: 8 of 11 files reviewed at latest revision, all discussions resolved.

Comments from Reviewable

klappy · 2018-02-20T16:15:14Z

Reviewed 1 of 11 files at r1.
Review status: 9 of 11 files reviewed at latest revision, all discussions resolved.

Comments from Reviewable

klappy · 2018-02-20T16:15:23Z

Reviewed 2 of 4 files at r3.
Review status: all files reviewed at latest revision, all discussions resolved.

Comments from Reviewable

PhotoNomad0 · 2018-02-21T12:45:39Z

Closed due to breaking changes in develop. Created new: #3895

Had to start a new branch

ca3835a

updated USFM-js library with export fixes.

a811ee7

PhotoNomad0 mentioned this pull request Feb 17, 2018

Fix issues with USFM3 alignment export #3756

Closed

PhotoNomad0 changed the title ~~WIP: Feature #3186/import alignment data with USFM import~~ Feature #3186/import alignment data with USFM import Feb 17, 2018

PhotoNomad0 mentioned this pull request Feb 17, 2018

GL Alignment Data Export from tC as Target Language Project to USFM 3 File #3185

Closed

PhotoNomad0 self-assigned this Feb 19, 2018

Merge branch 'develop' of https://github.com/unfoldingWord-dev/transl…

d53c52d

…ationCore into feature-mcleanb-3186/importAlignmentDataWithUSFM.2

PhotoNomad0 mentioned this pull request Feb 19, 2018

QA Fail #3185/Fix USFM Export File Name #3872

Merged

16 tasks

Merge branch 'develop' of https://github.com/unfoldingWord-dev/transl…

61cd92f

…ationCore into feature-mcleanb-3186/importAlignmentDataWithUSFM.2 # Conflicts: # src/js/helpers/WordAlignmentHelpers.js

Clean up merge conflicts.

e2bb6f9

PhotoNomad0 changed the title ~~Feature #3186/import alignment data with USFM import~~ Feature #3186/import alignment data with USFM import, and fix alignment export to USFM Feb 20, 2018

PhotoNomad0 changed the title ~~Feature #3186/import alignment data with USFM import, and fix alignment export to USFM~~ WIP: Feature #3186/import alignment data with USFM import, and fix alignment export to USFM Feb 21, 2018

update usfm-js.

4486dbc

PhotoNomad0 closed this Feb 21, 2018

PhotoNomad0 mentioned this pull request Feb 21, 2018

Feature #3186/import alignment data with USFM import, and fix alignment export to USFM #3895

Merged

16 tasks

PhotoNomad0 deleted the feature-mcleanb-3186/importAlignmentDataWithUSFM.2 branch March 5, 2018 13:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: Feature #3186/import alignment data with USFM import, and fix alignment export to USFM #3868

WIP: Feature #3186/import alignment data with USFM import, and fix alignment export to USFM #3868

PhotoNomad0 commented Feb 17, 2018 •

edited

Loading

codecov bot commented Feb 17, 2018 •

edited

Loading

klappy commented Feb 20, 2018

klappy commented Feb 20, 2018

PhotoNomad0 commented Feb 20, 2018

PhotoNomad0 commented Feb 20, 2018

PhotoNomad0 commented Feb 20, 2018

klappy commented Feb 20, 2018

klappy commented Feb 20, 2018

klappy commented Feb 20, 2018

klappy commented Feb 20, 2018

PhotoNomad0 commented Feb 21, 2018

WIP: Feature #3186/import alignment data with USFM import, and fix alignment export to USFM #3868

WIP: Feature #3186/import alignment data with USFM import, and fix alignment export to USFM #3868

Conversation

PhotoNomad0 commented Feb 17, 2018 • edited Loading

Describe what your pull request addresses (Please include relevant issue numbers):

Please include detailed Test instructions for your pull request:

Standard Test Instructions for PR Review Process:

codecov bot commented Feb 17, 2018 • edited Loading

Codecov Report

klappy commented Feb 20, 2018

klappy commented Feb 20, 2018

PhotoNomad0 commented Feb 20, 2018

PhotoNomad0 commented Feb 20, 2018

PhotoNomad0 commented Feb 20, 2018

klappy commented Feb 20, 2018

klappy commented Feb 20, 2018

klappy commented Feb 20, 2018

klappy commented Feb 20, 2018

PhotoNomad0 commented Feb 21, 2018

PhotoNomad0 commented Feb 17, 2018 •

edited

Loading

codecov bot commented Feb 17, 2018 •

edited

Loading