PublicLab.Editor

PublicLab.Editor copied to clipboard

Fixes #435

pulled this out from here #464 so it gets a little easier to review. The original PR had two changes in it

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

• [ ] tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with grunt jasmine
• [ ] code is in uniquely-named feature branch and has no merge conflicts
• [ ] PR is descriptively titled
• [ ] PR body includes fixes #0000-style reference to original issue #
• [ ] ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays.

Thanks!

Looks like we have extra things added in /dist file, other than that PR is good to me merged

Oh! do i have to do anything about this @sagarpreet-chadha ?

Hmm, re: dist file, i wonder if you need to do a clean rebuild with grunt build and readd the dist files so it only includes the content from your /src/ changes in this PR? Thank you both!!!

Also would it be possible to show screenshots (or a gif) of how this works, for documentation's sake and so we all are on the same page? Thank you so much, @Shulammite-Aso !! Great work!

Hi @Shulammite-Aso , can you rebase your branch with main and then make a new /dist file as Jeff mentioned, then this PR is good to go 100 Also a screenshot/ GIF if possible smile

will do this.

Hi @sagarpreet-chadha this is what i'm getting from trying to rebase. Resolved merge conflict by accepting both changes, but running git rebase --continue give me this output:

i did use git add to add and commit the changes

Also rebuilding dist file with grunt build is generating the same changes we currently have in the dist file here

Did you do git add . after resolving conflicts and before doing git rebase --continue?

Did you do git add . after resolving conflicts and before doing git rebase --continue?

Yes @sagarpreet-chadha i did add all the changes

Okay if you can just pull recent changes from main branch, and resolving conflicts that should be fine then. Just make sure the commit history is fine using git log --pretty=oneline The history should have you commits after last commit of main branch and the final merge commit. In this way we can be sure the commits are right. Thanks!

Hi @sagarpreet-chadha please check this out 😃

Is there anything i can do for the tests to pass? or can we merge it this way?

Hey @Shulammite-Aso , I reviewed your PR, it is good to go 💯 However 4 tests are failing which arw unrelated to your PR it seems, would you like to debug this? I think @keshav234156 has opened a PR related to this maybe https://github.com/publiclab/PublicLab.Editor/pull/602