Feature: allow replacing project with template #1889

magicznyleszek · 2018-07-25T13:24:57Z

Description

Replacing project with template implementation. FE uses PATCH on asset with clone_from parameter (there is a bug, see related issues).

Related issues

fixes #1887
fixes #1810
~~blocked by #1892~~

pmusaraj · 2018-07-25T14:53:05Z

Something isn't right here. After replacing a project from a template, I get an error when trying to preview in Enketo.

Also, sometimes if I go to the form builder immediately after replacing with a template, I see the old form questions in the builder. I would need to refresh to see the new questions.

# Conflicts: # jsapp/js/components/formEditors.es6

and rename onComplete to onCompleted for consistency

plus rename onComplete to onCompleted and move update asset error notification to actions

magicznyleszek · 2018-08-17T09:36:43Z

@pmusaraj ready to be tested :)

pmusaraj

I tested this branch both locally and on a demo (du), and got a 500 error when trying to replace a project with a template.

pmusaraj · 2018-08-27T19:39:07Z

jsapp/js/actions.es6

@@ -383,17 +383,21 @@ actions.resources.listTags.completed.listen(function(results){
  }
 });

-actions.resources.updateAsset.listen(function(uid, values, params={}) {
+actions.resources.updateAsset.listen(function(uid, values, callbacks={}) {


We shouldn't change params to callbacks here, and we shouldn't change onComplete to onCompleted below. It's not necessary to make these changes to nomenclature, it is longer to review and it's also prone to merge conflicts (the searchStore branch makes changes in the same lines, roughly).

jsapp/js/actions.es6

magicznyleszek · 2018-08-28T09:23:40Z

@pmusaraj I undid all these unnecessary naming changes and custom callbacks (and will try embrace natural Reflux actions from now on :-P)

pmusaraj · 2018-08-28T12:57:10Z

Naming changes look good.

magicznyleszek · 2018-08-28T14:28:37Z

Currently blocked by BE issue: dictionary update sequence element #0 has length 1; 2 is required

# Conflicts: # jsapp/js/actions.es6

magicznyleszek · 2018-09-11T15:21:28Z

@pmusaraj BE issue fixed, ready to be reviewed and merged :)

# Conflicts: # jsapp/js/components/formEditors.es6

magicznyleszek · 2018-10-03T08:18:52Z

@pmusaraj ping :)

pmusaraj · 2018-10-03T13:42:41Z

Tested this on unu @magicznyleszek and I still have an issue: after replacing a project with a template, when I go to the form builder, I see the project's original questions. I should see the new questions, from the template.

magicznyleszek · 2018-10-05T08:44:10Z

@pmusaraj fond the problem - Form Builder uses allAssets store, which unlike searches wasn't being updated on updateAsset action. This can also fix some other unknown bugs. Deployed on unu for retest :)

magicznyleszek · 2018-10-23T09:35:12Z

@pmusaraj ping ;-)

jsapp/js/components/modalForms/projectSettings.es6

jnm · 2018-12-06T17:50:51Z

I tested this and it seems to work well. Penar may not have time to do any more reviews. I'd be happy to merge once the order is changed as I indicated above.

…project

magicznyleszek added 3 commits July 25, 2018 15:20

templates list safe check

f1e8417

loadAssetContent action callbacks

335dfb8

replace project with template fixed

e972f14

magicznyleszek requested a review from pmusaraj July 25, 2018 13:24

magicznyleszek changed the base branch from master to form-template-frontend July 25, 2018 13:25

magicznyleszek added the donotmerge label Jul 25, 2018

magicznyleszek added 3 commits July 25, 2018 18:48

replace choices and settings too

fe4475e

use updateasset with clone_from

b46cc7e

Merge branch 'master' into replace-project-with-template

31998b2

# Conflicts: # jsapp/js/components/formEditors.es6

pmusaraj changed the base branch from form-template-frontend to master July 29, 2018 01:47

magicznyleszek mentioned this pull request Jul 29, 2018

A user can choose a template when replacing an existing project #1810

Closed

magicznyleszek added 2 commits July 30, 2018 18:26

Merge branch 'master' into replace-project-with-template

b547643

Merge branch 'master' into replace-project-with-template

1403286

magicznyleszek changed the title ~~Replace project with template~~ Feature: allow replacing project with template Aug 13, 2018

magicznyleszek mentioned this pull request Aug 15, 2018

Enhancement: pass more backend error messages to user #1926

Closed

magicznyleszek added 4 commits August 17, 2018 11:17

Merge branch 'master' into replace-project-with-template

18ef918

add missing onFailed callback for cloneAsset

b35ca2e

and rename onComplete to onCompleted for consistency

add missing onFailed callback for updateAsset

ebab2da

plus rename onComplete to onCompleted and move update asset error notification to actions

lint code

071e64b

magicznyleszek removed the donotmerge label Aug 17, 2018

pmusaraj suggested changes Aug 27, 2018

View reviewed changes

magicznyleszek added 5 commits August 28, 2018 10:36

Merge branch 'master' into replace-project-with-template

ab4378e

cr changes

0f69f0c

dont use additional callbacks for actions.resources.updateAsset

df9b66b

undo unnecessary changes

e12887a

don't use unnecessary callbacks for clone asset

da75c7a

magicznyleszek and others added 2 commits September 11, 2018 09:20

Merge branch 'master' into replace-project-with-template

512e4e6

# Conflicts: # jsapp/js/actions.es6

Fixed failing merge when payload is string

b6990ca

magicznyleszek added 2 commits September 25, 2018 09:37

Merge branch 'master' into replace-project-with-template

5b3cbb1

# Conflicts: # jsapp/js/components/formEditors.es6

update

e6f43ea

Merge branch 'master' into replace-project-with-template

68b06b9

magicznyleszek added 7 commits October 4, 2018 08:26

Merge branch 'master' into replace-project-with-template

b619933

undo params removal

08e74f5

cleanup asset actions handlers

55c7412

fix unknown uid on creating new project

1c52db6

unlisten actions after unmounting

d18a118

Merge branch 'master' into replace-project-with-template

cb39656

update allAsset store on asset update action

4abc261

jnm requested changes Dec 6, 2018

View reviewed changes

jsapp/js/components/modalForms/projectSettings.es6 Outdated Show resolved Hide resolved

magicznyleszek added 2 commits December 6, 2018 19:13

Merge branch 'master' into replace-project-with-template

b5ce37a

display template button second for new project, but last for replace …

14b1b19

…project

jnm approved these changes Dec 10, 2018

View reviewed changes

jnm merged commit 63968cc into master Dec 10, 2018

jnm deleted the replace-project-with-template branch December 10, 2018 19:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature: allow replacing project with template #1889

Feature: allow replacing project with template #1889

magicznyleszek commented Jul 25, 2018 •

edited

pmusaraj commented Jul 25, 2018

magicznyleszek commented Aug 17, 2018

pmusaraj left a comment

pmusaraj Aug 27, 2018

magicznyleszek commented Aug 28, 2018

pmusaraj commented Aug 28, 2018

magicznyleszek commented Aug 28, 2018

magicznyleszek commented Sep 11, 2018

magicznyleszek commented Oct 3, 2018

pmusaraj commented Oct 3, 2018

magicznyleszek commented Oct 5, 2018 •

edited

magicznyleszek commented Oct 23, 2018

jnm commented Dec 6, 2018

Feature: allow replacing project with template #1889

Feature: allow replacing project with template #1889

Conversation

magicznyleszek commented Jul 25, 2018 • edited

Description

Related issues

pmusaraj commented Jul 25, 2018

magicznyleszek commented Aug 17, 2018

pmusaraj left a comment

Choose a reason for hiding this comment

pmusaraj Aug 27, 2018

Choose a reason for hiding this comment

magicznyleszek commented Aug 28, 2018

pmusaraj commented Aug 28, 2018

magicznyleszek commented Aug 28, 2018

magicznyleszek commented Sep 11, 2018

magicznyleszek commented Oct 3, 2018

pmusaraj commented Oct 3, 2018

magicznyleszek commented Oct 5, 2018 • edited

magicznyleszek commented Oct 23, 2018

jnm commented Dec 6, 2018

magicznyleszek commented Jul 25, 2018 •

edited

magicznyleszek commented Oct 5, 2018 •

edited