Reduce input during on-boarding #954

TheSin- · 2020-08-29T16:51:23Z

- Add mdns and ngx-electron plugin
- Add electron-rebuild to dev depends so that electron can be rebuilt with the installed node
- Fix setTimeout and setInstance to with with Node modules (required for mdns)
- Reduce the version on node as electron needs to be on the same version for this to work
- Change order in on boarding wizard to select API first
- Use mdns to detect and list octoprint instances (WIP need to figure out min version required)
- Auto set Printer name if a detected install if found.

Step 1 in #921

- Add electron-rebuild to dev depends so that electron can be rebuilt with the installed node - Fix setTimeout and setInstance to with with Node modules (required for mdns) - Reduce the version on node as electron needs to be on the same version for this to work - Change order in on boarding wizard to select API first - Use mdns to detect and list octoprint instances (WIP need to figure out min version required) - Auto set Printer name if a detected install if found. I'm trying to reduce input and the need for a keyboard during onboarding. Obviously this is just the first step as the API key still needs to be inputed. But it's still a start. Follow Issue UnchartedBull#921 for more info on the changes.

UnchartedBull

Looks really good. The only bigger point to discuss here, is whether the mdns part should be moved to the main.js, where we already have full access to the node api, sharing data can be easily done via the electron IPC. And the API Connection check can be at the end I guess. Everything else is just some minor codestyle stuff (I guess the pipeline will also complain about some of that).

src/app/config/no-config/no-config.component.ts

UnchartedBull · 2020-08-31T12:46:45Z

src/app/config/no-config/no-config.component.ts

+
+    const mdns = this._electronService.remote.require('mdns');
+    const browser = mdns.createBrowser(mdns.tcp('octoprint'));
+    browser.on('serviceUp', service => {
+      var node = {
+        'display': service.name.match(/"([^"]+)"/)[1] + ' (' + service.txtRecord.version + ')',
+        'name': service.name.match(/"([^"]+)"/)[1],
+        'version': service.txtRecord.version,
+        'url': service.host.replace(/\.$/, '') + ":" + service.port + service.txtRecord.path.replace(/\/$/, '') + "/api/",
+        // Compare version to make sure it meets the requirement
+        'disable': false
+      };
+
+      this.octoprintNodes[service.host.replace(/\.$/, '').replace('.', '_')] = node;
+    });
+    browser.on('serviceDown', service => {
+      delete this.octoprintNodes[service.host.replace(/\.$/, '').replace('.', '_')];
+    });
+    browser.start();


Can we put this in main.js, this would remove the ngx-electron dependency and the icp links are already there, plus we would get around having to add node to the main angular app.

Let me know if you want me to do this.

Yeah that is beyond me, this took me long enough to figure out ;)

Ok I'll take that one :)

src/app/config/no-config/no-config.component.ts

src/app/config/no-config/no-config.component.html

src/app/config/no-config/no-config.component.ts

Returns void Co-authored-by: Timon G. <timon.gaebelein@icloud.com>

Return Boolean Co-authored-by: Timon G. <timon.gaebelein@icloud.com>

Returns void Co-authored-by: Timon G. <timon.gaebelein@icloud.com>

TheSin- · 2020-08-31T13:33:57Z

Because of my changes to post install I might need to move the electron-rebuild dev depend into depends? I'm really new to electron.

TheSin- · 2020-08-31T15:50:45Z

Done addressing things, I'm going to see if I can figure out why CI is falling next.

This reverts commit 8564d39.

UnchartedBull · 2020-08-31T17:14:11Z

Sorry for the spam commits, just wanted to test whether I can push to the PR :)

TheSin- · 2020-08-31T17:15:40Z

no problem I've been learning what can be done too ;)

TheSin- · 2020-08-31T19:41:02Z

The new Travis fails is due to the changes in .eslintrc.js

Which is out side of my knowledge

https://travis-ci.com/github/UnchartedBull/OctoDash/jobs/379614533

Error: .eslintrc.js#overrides[0]:
608	Environment key "typescript" is unknown

UnchartedBull · 2020-08-31T20:39:11Z

Yeah I'll fix those :)

TheSin- · 2020-08-31T21:18:11Z

I think we committed at the same time and some how mine because forced even though I didn't force it :\

UnchartedBull · 2020-08-31T21:44:07Z

No problem, you only did linter stuff right? I'll probably just force push over that, if that's ok :)

TheSin- · 2020-09-04T19:08:49Z

Awesome can't wait to try/test it. I'm just heading out for a bit, I'll test it when I return though!

TheSin- · 2020-09-05T20:34:20Z

I'm searching like made but in electron is there no way to show the number input spinner ? That would be the best to keep it 100% touch only.

TheSin- · 2020-09-05T20:36:43Z

Maybe something like http://angular-step-input.10kb.nl ?

TheSin- · 2020-09-08T23:01:31Z

I have an idea for the numeric inputs that I"m going to try to work on this week.

TheSin- · 2020-09-11T04:11:36Z

This is my idea, but the two way data bind is really really slow to update and I can't figure out why. It needs to be much faster to be usable, is this due to electron?

TheSin- · 2020-09-11T19:48:09Z

It's something with the IPC calls, if I set page to 4 and start it (skip the api calls) then it's super responsive and very nice to use. If I start at page 0 then it's pretty much unusable. Since I really do not understand the IPC stuff I think you might need to debug it.

UnchartedBull · 2020-09-14T08:52:50Z

Hi, sorry last week has been kinda busy. I'll have a look at that today or tomorrow :) Is there an option to enter text manually though? I think it will be really hard to get to the right number on 3.5" device. I guess we can change that now as well but all other text fields should be updates as well to the new input method. That will be tracked in #762 though.

TheSin- · 2020-09-14T13:07:05Z

I figured we could make the number display (span) into an input, or we could have a toggle to go between the 2. But I didn't want to work on it if I couldn't get it working at all.

UnchartedBull · 2020-09-15T14:23:16Z

Just tried it and it works just fine for me. No noticable lag at all (I started on page 0). It looks nice and certainly is a super clean way of inputting a number. The main problem here is, that some (possibly many) people are using 3.5" GPIO displays with something close to 1 or 2Hz refresh rate. This makes nice gestures for essential stuff almost impossible.

I redid those so we have + und - buttons (hold them to go up/down faster). I'm fairly happy with that, but please provide feedback on that. Sorry for crashing everything again. This PR is ready to be merged into master from my side now (if the pipeline passes). Let me know what you're thinking :)

TheSin- · 2020-09-15T14:27:28Z

I'll try them in a few minutes, just have a few meetings first. But if it works well I think that is the last of it, I'm excited!! This is a great update indeed!

UnchartedBull · 2020-09-15T14:30:41Z

Sure take your time, doesn't really matter if this PR stays open for another day or two :)

TheSin- · 2020-09-15T14:52:08Z

Looks good, is the alignment issue on purpose or is it just cause I'm running it on my Mac?
Are we going to add it to the Interval on Page 5 as well? Just to keep things consistent?

UnchartedBull · 2020-09-15T15:07:24Z

That layout issue shouldn't happen. Some weird CSS thing going on with the input I guess. Should be fixed now though. The value interval won't receive the buttons since it will be removed soon (once the push updates are in place there is really no need for that anymore), so we can safe ourself the hassle of adding the controller there to.

TheSin- · 2020-09-15T15:09:41Z

yeah I was on the fence about cause really it shouldn't normally be changed. I'll try the new changes but otherwise I'm gtg on this, it's amazing work!

TheSin- · 2020-09-15T15:11:18Z

Odd it fixed the large version but not the smaller version

UnchartedBull · 2020-09-15T15:32:28Z

Damn, thought I had fixed it. Will try again later today, once that's fixed we're good to merge.

TheSin- · 2020-09-15T15:37:19Z

I believe so!!

TheSin- · 2020-09-15T16:04:29Z

Fixed, for me in both views now.

UnchartedBull · 2020-09-16T09:28:36Z

🚢

* - Add mdns and ngx-electron plugin - Add electron-rebuild to dev depends so that electron can be rebuilt with the installed node - Fix setTimeout and setInstance to with with Node modules (required for mdns) - Reduce the version on node as electron needs to be on the same version for this to work - Change order in on boarding wizard to select API first - Use mdns to detect and list octoprint instances (WIP need to figure out min version required) - Auto set Printer name if a detected install if found. I'm trying to reduce input and the need for a keyboard during onboarding. Obviously this is just the first step as the API key still needs to be inputed. But it's still a start. Follow Issue UnchartedBull#921 for more info on the changes. * Add postinstall so it auto rebuilds electron against node * Update src/app/config/no-config/no-config.component.ts Returns void Co-authored-by: Timon G. <timon.gaebelein@icloud.com> * Update src/app/config/no-config/no-config.component.ts Return Boolean Co-authored-by: Timon G. <timon.gaebelein@icloud.com> * Update src/app/config/no-config/no-config.component.ts Returns void Co-authored-by: Timon G. <timon.gaebelein@icloud.com> * Resolve a few issues with VSCode and more consistent var naming * Add version compare to disable older Nodes * Switch back to 5000 as the default and add a note about port 80 * test * Revert "test" This reverts commit 8564d39. * Attempt to fix CI * restructure main.js * With the new changes newer node is working again * Use proper indentation * Forgot to update package-lock with node update * electron stuff finished * Fix lint errors and warnings * finalise workflow * small bugfix * prevent the same instance showing multiple times * remove node from angular app * Manually trigger change detection * Also trigger change detection for Page changes to fix bug * intial setup to load op script * Fix ngZone issue * Remove ngx-electron from package-lock * Remove electron-rebuild, postinstall script and test if the travis changes are still needed since we are no longer rebuilding * Tested and no longer required, was a rebuild only issue * fix OctoPrint var * finally get that freakin jQuery working not pretty, but it works * cleanup + reset URL if manual input is opened. * Check OctoPrint connection and load client library * Update package-lock, fix a few navigation bugs * Make sure pages can't go below 0 or above totalPages * refactor navigation controller + show next button after page 1 again * login with request working * use printer name from printerprofile * fix setup (all working) * Convert to range slider to numeric input is not required * I think 150 would be fast enough to load * value selector for numbers * fix layout issue * Fix alignemnt on large and small views Co-authored-by: Timon G. <timon.gaebelein@icloud.com>

TheSin- added 3 commits August 29, 2020 10:27

Merge with upstream master

8923014

Add postinstall so it auto rebuilds electron against node

7313d24

UnchartedBull requested changes Aug 31, 2020

View reviewed changes

TheSin- and others added 4 commits August 31, 2020 07:16

Update src/app/config/no-config/no-config.component.ts

b038c08

Returns void Co-authored-by: Timon G. <timon.gaebelein@icloud.com>

Update src/app/config/no-config/no-config.component.ts

6c53aec

Return Boolean Co-authored-by: Timon G. <timon.gaebelein@icloud.com>

Update src/app/config/no-config/no-config.component.ts

8716587

Returns void Co-authored-by: Timon G. <timon.gaebelein@icloud.com>

Resolve a few issues with VSCode and more consistent var naming

68887b1

TheSin- added 2 commits August 31, 2020 09:44

Add version compare to disable older Nodes

afb80d7

Switch back to 5000 as the default and add a note about port 80

57172e1

UnchartedBull added 2 commits August 31, 2020 19:09

test

8564d39

Revert "test"

9caf235

This reverts commit 8564d39.

TheSin- and others added 5 commits August 31, 2020 11:22

Attempt to fix CI

73387d2

Merge branch 'master' of git://github.com/TheSin-/OctoDash

36887ce

restructure main.js

a2dff3a

With the new changes newer node is working again

957cb03

Use proper indentation

735f395

TheSin- and others added 3 commits August 31, 2020 14:55

Forgot to update package-lock with node update

0e3d9a6

electron stuff finished

becd2c4

Fix lint errors and warnings

540fc43

TheSin- force-pushed the master branch from becd2c4 to 540fc43 Compare August 31, 2020 21:11

Merge remote-tracking branch 'origin/master'

2e2e675

Merge with Master

5dac7f9

Convert to range slider to numeric input is not required

6083fca

TheSin- added 2 commits September 10, 2020 22:13

Merge changes from master

e63a183

I think 150 would be fast enough to load

f6086df

value selector for numbers

159e418

Merge branch 'master' into master

dd861f0

UnchartedBull approved these changes Sep 15, 2020

View reviewed changes

fix layout issue

3f33af4

Fix alignemnt on large and small views

be231ef

UnchartedBull merged commit 6458cc6 into UnchartedBull:master Sep 16, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reduce input during on-boarding #954

Reduce input during on-boarding #954

TheSin- commented Aug 29, 2020 •

edited

Loading

UnchartedBull left a comment

UnchartedBull Aug 31, 2020

UnchartedBull Aug 31, 2020

TheSin- Aug 31, 2020

UnchartedBull Aug 31, 2020

TheSin- commented Aug 31, 2020

TheSin- commented Aug 31, 2020

UnchartedBull commented Aug 31, 2020

TheSin- commented Aug 31, 2020

TheSin- commented Aug 31, 2020 •

edited

Loading

UnchartedBull commented Aug 31, 2020

TheSin- commented Aug 31, 2020

UnchartedBull commented Aug 31, 2020

TheSin- commented Sep 4, 2020

TheSin- commented Sep 5, 2020

TheSin- commented Sep 5, 2020

TheSin- commented Sep 8, 2020

TheSin- commented Sep 11, 2020

TheSin- commented Sep 11, 2020 •

edited

Loading

UnchartedBull commented Sep 14, 2020

TheSin- commented Sep 14, 2020

UnchartedBull commented Sep 15, 2020

TheSin- commented Sep 15, 2020

UnchartedBull commented Sep 15, 2020

TheSin- commented Sep 15, 2020

UnchartedBull commented Sep 15, 2020

TheSin- commented Sep 15, 2020

TheSin- commented Sep 15, 2020

UnchartedBull commented Sep 15, 2020 •

edited

Loading

TheSin- commented Sep 15, 2020

TheSin- commented Sep 15, 2020

UnchartedBull commented Sep 16, 2020

Reduce input during on-boarding #954

Reduce input during on-boarding #954

Conversation

TheSin- commented Aug 29, 2020 • edited Loading

UnchartedBull left a comment

Choose a reason for hiding this comment

UnchartedBull Aug 31, 2020

Choose a reason for hiding this comment

UnchartedBull Aug 31, 2020

Choose a reason for hiding this comment

TheSin- Aug 31, 2020

Choose a reason for hiding this comment

UnchartedBull Aug 31, 2020

Choose a reason for hiding this comment

TheSin- commented Aug 31, 2020

TheSin- commented Aug 31, 2020

UnchartedBull commented Aug 31, 2020

TheSin- commented Aug 31, 2020

TheSin- commented Aug 31, 2020 • edited Loading

UnchartedBull commented Aug 31, 2020

TheSin- commented Aug 31, 2020

UnchartedBull commented Aug 31, 2020

TheSin- commented Sep 4, 2020

TheSin- commented Sep 5, 2020

TheSin- commented Sep 5, 2020

TheSin- commented Sep 8, 2020

TheSin- commented Sep 11, 2020

TheSin- commented Sep 11, 2020 • edited Loading

UnchartedBull commented Sep 14, 2020

TheSin- commented Sep 14, 2020

UnchartedBull commented Sep 15, 2020

TheSin- commented Sep 15, 2020

UnchartedBull commented Sep 15, 2020

TheSin- commented Sep 15, 2020

UnchartedBull commented Sep 15, 2020

TheSin- commented Sep 15, 2020

TheSin- commented Sep 15, 2020

UnchartedBull commented Sep 15, 2020 • edited Loading

TheSin- commented Sep 15, 2020

TheSin- commented Sep 15, 2020

UnchartedBull commented Sep 16, 2020

TheSin- commented Aug 29, 2020 •

edited

Loading

TheSin- commented Aug 31, 2020 •

edited

Loading

TheSin- commented Sep 11, 2020 •

edited

Loading

UnchartedBull commented Sep 15, 2020 •

edited

Loading