Tray icon #1005

ixrock · 2020-10-01T04:34:56Z

Tray icon and menu (enabled by default)

Added preferences

auto-startup on login (api: app.setLoginItemSettings, enabled by default)

close #833

Signed-off-by: Roman <ixrock@gmail.com>

src/main/tray.ts

Nokel81

Why do we still have the kontena logo in master?

Looks pretty good

src/main/app-updater.ts

src/main/menu.ts

src/main/tray.ts

nevalla · 2020-10-01T15:55:28Z

Why do we still have the kontena logo in master?

Looks pretty good

Kontena refuses to die 😂

Signed-off-by: Roman <ixrock@gmail.com>

nevalla · 2020-10-06T08:39:59Z

Couple of usage issues / enhancement requests:

Icon on dark OSX theme is invisible
When opening cluster from "inactive" workspace does not activate the workspace (cluster menu etc)
IMHO connection status is irrelevant here
Can we have checkbox to indicate what cluster is active in tray menu?

Signed-off-by: Roman <ixrock@gmail.com>

ixrock · 2020-10-06T15:07:26Z

This error possibly causing integration tests start failing.
@nevalla Could you please check or maybe you have any ideas?

- optimization: don't re-create tray icon on menu udpates (avoid blinking) Signed-off-by: Roman <ixrock@gmail.com>

Signed-off-by: Roman <ixrock@gmail.com>

# Conflicts: # src/renderer/components/cluster-manager/cluster-view.tsx

Signed-off-by: Roman <ixrock@gmail.com>

ixrock · 2020-10-07T18:11:56Z

@nevalla @jakolehm PTAL
Now it's possible to close main window Cmd+W or by clicking (x) at traffic-light buttons.

Signed-off-by: Roman <ixrock@gmail.com>

jakolehm · 2020-10-08T05:00:17Z

src/common/base-store.ts

@@ -73,7 +75,9 @@ export class BaseStore<T = any> extends Singleton {

  enableSync() {
    this.syncDisposers.push(
-      reaction(() => this.toJSON(), model => this.onModelChange(model)),
+      reaction(() => this.toJSON(), model => this.onModelChange(model), {
+        delay: this.params.syncDelayMs,


Why do we need a delay now?

It was added to avoid possible infinite cycle of saving store.json in some cases when update comes from renderer
(don't remember exact case, usually hard to reproduce)

I ran into something like that too. The fix that I used was making sure any updates happen within the store class and are marked as @action that way multiple deep updates don't cause an infinite loop. But if you have tried that this might help

src/main/index.ts

Signed-off-by: Roman <ixrock@gmail.com>

nevalla · 2020-10-12T06:42:07Z

Investigated integration tests failures. They are now failing because we introduced new window for Tray and tests are expecting certain amount of windows. To fix those please modify integration/app.tests.ts to have following lines (26):

while (await app.client.getWindowCount() > 2);
await app.client.windowByIndex(1)

However, after fixing that, tests revealed a real problem. When adding new cluster, the cluster activation happens before the cluster is added in cluster store on main process.

# Conflicts: # src/renderer/components/+add-cluster/add-cluster.tsx # src/renderer/components/+cluster-settings/cluster-settings.tsx

Signed-off-by: Roman <ixrock@gmail.com>

src/renderer/components/+preferences/preferences.tsx

src/main/tray.ts

Signed-off-by: Roman <ixrock@gmail.com>

# Conflicts: # locales/en/messages.po # locales/fi/messages.po # locales/ru/messages.po

Signed-off-by: Roman <ixrock@gmail.com>

ixrock · 2020-10-15T12:51:18Z

@nevalla integration on linux failed again for some reasons.. and why I actually can't re-run it? (but clicking to "Re-run" says only it's has been requested).

jakolehm · 2020-10-16T04:50:06Z

package.json

@@ -200,6 +208,7 @@
    "openid-client": "^3.15.2",
    "path-to-regexp": "^6.1.0",
    "proper-lockfile": "^4.1.1",
+    "react": "^16.13.1",


Why react moved here?

Such error arised initially by @nevalla AFAIK not sure if this still fixing something..
Commit: ec50c41

Yep. tried to move out react to devDependencies and got this from Lens build version:

And seems like it's requested by react-router in runtime in main process (need to refactor navigation.ts to get rid of this dependency)

@jakolehm did refactoring and now react and react-router not required to be runtime dependencies. PTAL.

src/main/index.ts

Signed-off-by: Roman <ixrock@gmail.com>

…` and `react-router` not required as package.json dependecies in runtime (main) Signed-off-by: Roman <ixrock@gmail.com>

jim-docker · 2020-10-16T15:29:27Z

src/main/tray.ts

+        const browserWindow = await windowManager.ensureMainWindow();
+        showAbout(browserWindow);


Does the "About Lens" dialog have to depend on the browserWindow's existence? This means, if not already open, the user must wait for the splash window and browser window to come up before seeing "About Lens". Maybe the splash window can be skipped? Though maybe there is still a delay for the browser window?

Yes and I don't know if it's technically possible to show the dialog without it.

If you have Lens minimized and pick "About Lens" from the Lens system menu the dialog comes up without bringing up the main window:

Though I guess this probably still requires the main window to exist

jim-docker · 2020-10-16T15:43:18Z

src/main/tray.ts

+      label: "Check for updates",
+      async click() {
+        const result = await AppUpdater.checkForUpdates();
+        const browserWindow = await windowManager.ensureMainWindow();


Can this line be inside the if (!result) { ... }? I'm not sure what happens when result is true (Does there still need to be a browserWindow?)

jim-docker · 2020-10-16T15:51:42Z

src/main/window-manager.ts

-    // load & show app
-    this.showMain();
-    initMenu(this);
+  async ensureMainWindow(): Promise<BrowserWindow> {


could take showSplash param and pass on to initMainWindow()?

jim-docker · 2020-10-16T15:59:02Z

src/renderer/components/+preferences/preferences.scss

@@ -57,4 +57,8 @@
      box-shadow: 0 0 0 1px $borderFaintColor;
    }
  }
+
+  .Checkbox {
+    align-self: start; // limit clickable area to checkbox + text


thanks for adding comments! I get lost easily in css files :)

integration/helpers/utils.ts

jakolehm · 2020-10-21T19:27:40Z

package.json

@@ -303,12 +309,15 @@
    "postinstall-postinstall": "^2.1.0",
    "progress-bar-webpack-plugin": "^2.1.0",
    "raw-loader": "^4.0.1",
-    "react": "^16.13.1",
+    "react": "^16.14.0",


Does this PR require React upgrade?

Should we revert? Not that many changes in that release: https://github.com/facebook/react/blob/master/CHANGELOG.md#16140-october-14-2020

Why it's even matter? :) It is not a major release update.

jakolehm · 2020-10-22T05:21:25Z

@ixrock integration tests are failing (I have triggered restart but it didn't help).

nevalla · 2020-10-22T07:22:49Z

@ixrock integration tests are failing (I have triggered restart but it didn't help).

Some of the menu links have now ?namespace= that integration tests do not take into an account. Created PR to ignore that query param: #1109.

Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>

nevalla · 2020-10-23T09:30:36Z

Noticed that we are now using dark icon as default, which does not look that good on Ubuntu and Windows:

I suggest we should use the white icon as default (could be done in future PR too).

ixrock · 2020-10-23T09:52:45Z

Current implementation sets icon color depending on electron's API nativeTheme.shouldUseDarkColors.
If this is not supported in Linux we could force specific color to Linux-only.
UPD: or maybe themes in Linux/Win should use inverted colors for that option..
Read more: https://www.electronjs.org/docs/api/native-theme

jakolehm · 2020-10-27T08:35:04Z

@ixrock this needs conflict resolve.

# Conflicts: # package.json # src/common/user-store.ts # src/common/workspace-store.ts # src/main/index.ts # src/main/window-manager.ts # src/renderer/components/+cluster-settings/cluster-settings.tsx # src/renderer/components/+preferences/preferences.tsx # src/renderer/components/cluster-manager/cluster-manager.tsx # src/renderer/components/cluster-manager/clusters-menu.tsx # src/renderer/components/layout/sidebar.tsx # yarn.lock

Signed-off-by: Roman <ixrock@gmail.com>

# Conflicts: # package.json

Signed-off-by: Roman <ixrock@gmail.com>

nevalla

LGTM

done already

ixrock added 4 commits September 29, 2020 19:09

Tray icon #833 -- part 1

f88aa2f

Signed-off-by: Roman <ixrock@gmail.com>

Tray icon #833 -- part 2

eee7feb

Signed-off-by: Roman <ixrock@gmail.com>

Tray icon #833 -- part 3

162b410

Signed-off-by: Roman <ixrock@gmail.com>

Tray icon #833 -- part 4

c1dc1e6

Signed-off-by: Roman <ixrock@gmail.com>

ixrock added the enhancement New feature or request label Oct 1, 2020

ixrock added this to the 3.7.0 milestone Oct 1, 2020

ixrock requested a review from a team October 1, 2020 04:34

fix: lint / linux build failed

deb0d85

Signed-off-by: Roman <ixrock@gmail.com>

nevalla reviewed Oct 1, 2020

View reviewed changes

src/main/tray.ts Outdated Show resolved Hide resolved

Nokel81 reviewed Oct 1, 2020

View reviewed changes

src/main/app-updater.ts Outdated Show resolved Hide resolved

src/main/menu.ts Show resolved Hide resolved

src/main/tray.ts Outdated Show resolved Hide resolved

src/main/tray.ts Show resolved Hide resolved

allow to disable tray from preferences

8797f0a

Signed-off-by: Roman <ixrock@gmail.com>

ixrock added 3 commits October 6, 2020 15:17

allow to tweak svg-icon before applying as tray-icon

fdb5368

Signed-off-by: Roman <ixrock@gmail.com>

add checkbox indication, setActive workspace on cluster select

6e975fa

Signed-off-by: Roman <ixrock@gmail.com>

fix build version (cannon find module 'react')

ec50c41

Signed-off-by: Roman <ixrock@gmail.com>

ixrock added 4 commits October 7, 2020 13:21

- switching dark/light icon depending on os-x theme settings

43ea13c

- optimization: don't re-create tray icon on menu udpates (avoid blinking) Signed-off-by: Roman <ixrock@gmail.com>

fix: refresh icon after turning on/off + switching dark-mode

fc20733

Signed-off-by: Roman <ixrock@gmail.com>

Merge remote-tracking branch 'origin/master' into feature/tray

1a0b5c1

# Conflicts: # src/renderer/components/cluster-manager/cluster-view.tsx

allow to close main window and re-open from dock or tray icon

aac4eb1

Signed-off-by: Roman <ixrock@gmail.com>

ixrock added 2 commits October 7, 2020 23:31

small fix

a2c3935

Signed-off-by: Roman <ixrock@gmail.com>

fix: ensure main-window from global menu

fb8c57b

Signed-off-by: Roman <ixrock@gmail.com>

jakolehm reviewed Oct 8, 2020

View reviewed changes

ixrock added 2 commits October 8, 2020 10:13

chore

c458b68

Signed-off-by: Roman <ixrock@gmail.com>

fix: hide traffic-light buttons for tray window

a3b6efd

Signed-off-by: Roman <ixrock@gmail.com>

ixrock added 2 commits October 12, 2020 12:14

Merge remote-tracking branch 'origin/master' into feature/tray

be6f018

# Conflicts: # src/renderer/components/+add-cluster/add-cluster.tsx # src/renderer/components/+cluster-settings/cluster-settings.tsx

removed redundant tray window

addc220

Signed-off-by: Roman <ixrock@gmail.com>

jakolehm previously requested changes Oct 15, 2020

View reviewed changes

ixrock added 3 commits October 15, 2020 15:23

chore

aeac903

Signed-off-by: Roman <ixrock@gmail.com>

Merge remote-tracking branch 'origin/master' into feature/tray

b0d1923

# Conflicts: # locales/en/messages.po # locales/fi/messages.po # locales/ru/messages.po

yarn i18n.extract

b111b76

Signed-off-by: Roman <ixrock@gmail.com>

jakolehm reviewed Oct 16, 2020

View reviewed changes

ixrock added 2 commits October 16, 2020 12:28

clean-up

8097ca5

Signed-off-by: Roman <ixrock@gmail.com>

navigation refactoring, move out buildUrl to common/utils so `react…

457171d

…` and `react-router` not required as package.json dependecies in runtime (main) Signed-off-by: Roman <ixrock@gmail.com>

stevejr mentioned this pull request Oct 16, 2020

Open last active cluster view when switching between workspaces #1054

Closed

jim-docker reviewed Oct 16, 2020

View reviewed changes

jakolehm reviewed Oct 21, 2020

View reviewed changes

Merge branch 'master' into feature/tray

2650cdc

Ignore namespace query param on integration tests (#1109)

36b1e21

Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>

nevalla modified the milestones: 3.7.0, 4.0.0 Oct 26, 2020

ixrock added 5 commits October 27, 2020 12:21

merge-conflicts fixes

1a834c2

Signed-off-by: Roman <ixrock@gmail.com>

support page fixes

1c654db

Signed-off-by: Roman <ixrock@gmail.com>

Merge remote-tracking branch 'origin/master' into feature/tray

b11b747

# Conflicts: # package.json

make eslint happy again

c37534c

Signed-off-by: Roman <ixrock@gmail.com>

nevalla approved these changes Oct 27, 2020

View reviewed changes

ixrock merged commit 334815f into master Oct 27, 2020

ixrock deleted the feature/tray branch October 27, 2020 13:25

jakolehm mentioned this pull request Oct 27, 2020

Release v4.0.0-alpha.1 #1159

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tray icon #1005

Tray icon #1005

ixrock commented Oct 1, 2020 •

edited

Loading

Nokel81 left a comment

nevalla commented Oct 1, 2020

nevalla commented Oct 6, 2020

ixrock commented Oct 6, 2020 •

edited

Loading

ixrock commented Oct 7, 2020 •

edited

Loading

jakolehm Oct 8, 2020

ixrock Oct 8, 2020

Nokel81 Oct 8, 2020

nevalla commented Oct 12, 2020

ixrock commented Oct 15, 2020

jakolehm Oct 16, 2020

ixrock Oct 16, 2020 •

edited

Loading

ixrock Oct 16, 2020 •

edited

Loading

ixrock Oct 16, 2020

ixrock Oct 16, 2020 •

edited

Loading

jim-docker Oct 16, 2020

ixrock Oct 16, 2020

jim-docker Oct 16, 2020

jim-docker Oct 16, 2020

jim-docker Oct 16, 2020

jim-docker Oct 16, 2020

jakolehm Oct 21, 2020

ixrock Oct 22, 2020

nevalla Oct 23, 2020

ixrock Oct 23, 2020

jakolehm commented Oct 22, 2020

nevalla commented Oct 22, 2020

nevalla commented Oct 23, 2020 •

edited

Loading

ixrock commented Oct 23, 2020 •

edited

Loading

jakolehm commented Oct 27, 2020

nevalla left a comment

		const browserWindow = await windowManager.ensureMainWindow();
		showAbout(browserWindow);

Tray icon #1005

Tray icon #1005

Conversation

ixrock commented Oct 1, 2020 • edited Loading

Nokel81 left a comment

Choose a reason for hiding this comment

nevalla commented Oct 1, 2020

nevalla commented Oct 6, 2020

ixrock commented Oct 6, 2020 • edited Loading

ixrock commented Oct 7, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nevalla commented Oct 12, 2020

ixrock commented Oct 15, 2020

Choose a reason for hiding this comment

ixrock Oct 16, 2020 • edited Loading

Choose a reason for hiding this comment

ixrock Oct 16, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ixrock Oct 16, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jakolehm commented Oct 22, 2020

nevalla commented Oct 22, 2020

nevalla commented Oct 23, 2020 • edited Loading

ixrock commented Oct 23, 2020 • edited Loading

jakolehm commented Oct 27, 2020

nevalla left a comment

Choose a reason for hiding this comment

ixrock commented Oct 1, 2020 •

edited

Loading

ixrock commented Oct 6, 2020 •

edited

Loading

ixrock commented Oct 7, 2020 •

edited

Loading

ixrock Oct 16, 2020 •

edited

Loading

ixrock Oct 16, 2020 •

edited

Loading

ixrock Oct 16, 2020 •

edited

Loading

nevalla commented Oct 23, 2020 •

edited

Loading

ixrock commented Oct 23, 2020 •

edited

Loading