Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ScopeQuery #1132

Merged
merged 37 commits into from
Jul 1, 2019
Merged

Fix ScopeQuery #1132

merged 37 commits into from
Jul 1, 2019

Conversation

harshkhandeparkar
Copy link
Member

@harshkhandeparkar harshkhandeparkar commented Jun 26, 2019

Fixes #0000 (<=== Replace 0000 with the Issue Number)

@Divy123 @jywarren

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 npm test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • ask @publiclab/is-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

Thanks!

@harshkhandeparkar
Copy link
Member Author

@jywarren try to merge this ASAP. @Divy123 please review this. I recommend you to review this locally. Thanks a lot!

@Divy123
Copy link
Member

Divy123 commented Jun 26, 2019

@harshkhandeparkar request you to send the following:

  1. GIF of working demo, showing insert step button working.
  2. Screenshot of browser console.

@harshkhandeparkar
Copy link
Member Author

@Divy123 it seems to work offline but I think it would be better if you check it on your PC itself instead of me sending a pic, to make sure everything really works.

@Divy123
Copy link
Member

Divy123 commented Jun 26, 2019

Sure!

@harshkhandeparkar
Copy link
Member Author

And the browser has no errors. Not even the .contains error.

@Divy123
Copy link
Member

Divy123 commented Jun 26, 2019

Checking it now.

@codecov
Copy link

codecov bot commented Jun 26, 2019

Codecov Report

Merging #1132 into main will decrease coverage by 0.19%.
The diff coverage is 11.11%.

Impacted file tree graph

@@            Coverage Diff            @@
##             main    #1132     +/-   ##
=========================================
- Coverage   55.58%   55.39%   -0.2%     
=========================================
  Files         113      113             
  Lines        2346     2356     +10     
  Branches      364      364             
=========================================
+ Hits         1304     1305      +1     
- Misses       1042     1051      +9
Impacted Files Coverage Δ
examples/lib/scopeQuery.js 18.51% <0%> (-5.3%) ⬇️
examples/lib/defaultHtmlStepUi.js 12.19% <33.33%> (+0.39%) ⬆️
examples/lib/intermediateHtmlStepUi.js 10.16% <8.33%> (-0.18%) ⬇️

@Divy123
Copy link
Member

Divy123 commented Jun 26, 2019

@harshkhandeparkar facing some issues with npm right now.
@publiclab/is-reviewers please someone test this out locally and post here some screenshots.

@harshkhandeparkar
Copy link
Member Author

harshkhandeparkar commented Jun 26, 2019 via email

@Divy123
Copy link
Member

Divy123 commented Jun 26, 2019

Working too slow, looking into now!!

@harshkhandeparkar
Copy link
Member Author

harshkhandeparkar commented Jun 26, 2019 via email

@Divy123
Copy link
Member

Divy123 commented Jun 26, 2019

npm install and especially electron takes a lot of time

@harshkhandeparkar
Copy link
Member Author

harshkhandeparkar commented Jun 26, 2019 via email

@Divy123
Copy link
Member

Divy123 commented Jun 29, 2019

PR ready to be merged!!
Great work @harshkhandeparkar .
Thanks a lot.

@Divy123
Copy link
Member

Divy123 commented Jun 29, 2019

I think this is great.
@jywarren request you to merge this as soon as possible. Maybe what Harsh has done here and work in my PR can get everything fixed together.

@harshkhandeparkar
Copy link
Member Author

@Divy123 thanks!
Which PR are you working on btw?

@Divy123
Copy link
Member

Divy123 commented Jun 30, 2019

Actually this PR corrects the insert-step button but the internal working is also broken, so I am working on that.

@harshkhandeparkar
Copy link
Member Author

Yes I noticed that. I first thought that it was my mistake but it wasn't.

@Divy123
Copy link
Member

Divy123 commented Jun 30, 2019

No its not your PR something else broke it. I have fixed the working but still some more things to be fixed. Working on it.

@jywarren jywarren merged commit eff0d38 into publiclab:main Jul 1, 2019
@harshkhandeparkar
Copy link
Member Author

harshkhandeparkar commented Jul 1, 2019 via email

@jywarren
Copy link
Member

jywarren commented Jul 1, 2019

Great, merged this. where is your PR now, and what's our status re: #1100 and to the urgent issue from and #833 (comment) ?

@jywarren
Copy link
Member

jywarren commented Jul 1, 2019

Thank you! Just coming online after a weekend! Trying to get synced up but also working on high priority publication of MapKnitter!

jywarren pushed a commit that referenced this pull request Dec 16, 2019
* update dist

Signed-off-by: tech4GT <varun.gupta1798@gmail.com>

dist update

Revert "dist update"

This reverts commit 9ee2a98.

* Merge remote-tracking branch 'upstream/main' into main

* add dist

* add new func

* update itermediate

* changes

* fix gitignore

* use scopeQuery

* add mapHtmlTypes test

* scopeQuery tests added

* try something

* change

* fix stepui test

* Remove double quotes

* update new code

* refactor to spec

* fix link elems, add a new scopeQuery Method

* fixed undefined error

* fix everything

* getScope to scopeAll

* add new methods to CONTRIBUTING file
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants