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

Rewrite, with Welcome Page and session history #546

Merged
merged 112 commits into from
Jan 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
2b6b1eb
allow spaces in environment path
mbektas Dec 24, 2022
9af41ed
separate app state and settings, introduce workspace settings
mbektas Dec 25, 2022
9bc8e2d
refactor session creation, use defaultWorkingDirectory
mbektas Dec 25, 2022
a2b381f
refactor file open
mbektas Dec 25, 2022
1ac54af
persist app data
mbektas Dec 26, 2022
2d8a5e9
add welcome view, refactoring
mbektas Dec 27, 2022
c80ec8e
dispose, create free server on launch
mbektas Dec 28, 2022
01c406a
refactor server info provider
mbektas Dec 28, 2022
6722136
close session, app refactoring
mbektas Dec 28, 2022
f394257
fetch news from jupyter blog
mbektas Dec 28, 2022
1cb5b16
on linux and window open file and folder with separate dialogs
mbektas Dec 28, 2022
e444259
fix fast-xml-parser dependency issue
mbektas Dec 29, 2022
cb9557f
default working directory and python path in preferences dialog
mbektas Dec 29, 2022
f023545
better handle environment install status
mbektas Dec 29, 2022
bcf7af9
keep home variable in working path
mbektas Dec 29, 2022
785cb7c
make news feed optional
mbektas Dec 29, 2022
d5ceca6
startupMode in preferences dialog
mbektas Dec 29, 2022
1418691
disable splash animation
mbektas Dec 29, 2022
88dc636
show working directory in server status tooltip
mbektas Dec 29, 2022
789fa23
remote server connection
mbektas Dec 29, 2022
daff7b9
python env select popup
mbektas Dec 30, 2022
52c4dc0
don't set schema dir when in web app mode
mbektas Dec 30, 2022
8b4d416
resize env select popup with parent
mbektas Dec 31, 2022
0adf671
session dispose
mbektas Dec 31, 2022
2504fe7
recent sessions
mbektas Dec 31, 2022
6968d3f
fix env list overflow, update tooltips
mbektas Dec 31, 2022
c07f8ab
store persistSessionData as part of recent session data
mbektas Dec 31, 2022
1d3993d
handle no recent session case
mbektas Dec 31, 2022
904c48b
clear remote session on dispose
mbektas Dec 31, 2022
f671608
new server icon
mbektas Dec 31, 2022
e5b07c6
support file / folder drop open and multiple file open
mbektas Dec 31, 2022
b38c5e3
reduce styling flicker
mbektas Jan 1, 2023
58e338e
CLI with new options to set working dir and python env
mbektas Jan 2, 2023
05aff27
center windows by default, fix cli issues
mbektas Jan 2, 2023
92a75f5
fix linter
mbektas Jan 2, 2023
7aad679
handle double click file open
mbektas Jan 2, 2023
94ebf32
welcome page styling updates
mbektas Jan 2, 2023
74cb1f8
expandable recent sessions
mbektas Jan 2, 2023
02a056d
set welcome page title
mbektas Jan 2, 2023
79c816f
refactor registry
mbektas Jan 3, 2023
d3f5f7f
refactor registry
mbektas Jan 3, 2023
d3b152a
fix issue with launch by python-path alone
mbektas Jan 3, 2023
355d29d
refactor registry
mbektas Jan 5, 2023
8568b59
update workspace settings when new session created
mbektas Jan 6, 2023
00998f3
update remote server connection dialog, list local running servers
mbektas Jan 6, 2023
dd2431e
cache news list and fetch only once
mbektas Jan 6, 2023
c31e4d6
progress view
mbektas Jan 8, 2023
c73a873
check if local jupyter servers are still running
mbektas Jan 8, 2023
da54699
prevent duplicate env add, handle invalid python env
mbektas Jan 8, 2023
ead3c83
move conda root path to registry, initialize it, env popup enhancements
mbektas Jan 9, 2023
10ed880
prevent env duplicates, order desc by requirement version
mbektas Jan 9, 2023
cec9bef
error handling in progress view, preferences dialog tab activate,
mbektas Jan 10, 2023
509a7fa
get default kernel name
mbektas Jan 10, 2023
404ca01
restart after env install
mbektas Jan 11, 2023
94d692c
handle invalid workspace python path
mbektas Jan 11, 2023
cc6e444
handle all session create errors
mbektas Jan 11, 2023
2c23708
handle reloading last session
mbektas Jan 11, 2023
216c836
improve startup
mbektas Jan 11, 2023
f531b96
better handle environment discovery errors
mbektas Jan 12, 2023
41026a7
shut down processes properly on exit
mbektas Jan 13, 2023
d368089
pre-create env select popup
mbektas Jan 14, 2023
b8c5284
prevent duplicate envs caused by symlinks
mbektas Jan 14, 2023
faea94c
update env selector height properly
mbektas Jan 14, 2023
f34d1dc
show env packages in tooltip, handle long env names
mbektas Jan 14, 2023
ba38a0d
fix fedora port in use detection problem
mbektas Jan 15, 2023
461d66b
handle activating sub conda envs
mbektas Jan 15, 2023
ec0e5ca
local / remote / connection rename
mbektas Jan 15, 2023
28b8fd2
lazy load running server list
mbektas Jan 15, 2023
2a17aea
fix client-app mode
mbektas Jan 17, 2023
28de6dd
show no local server found message on list
mbektas Jan 17, 2023
5ab8fa1
check for bundled env update availability
mbektas Jan 17, 2023
986f284
show local server url in tooltip
mbektas Jan 17, 2023
8efcf7b
remove recent remote URL support
mbektas Jan 18, 2023
2cbea34
support removing recent session from list
mbektas Jan 18, 2023
735ab34
handle non-existing recent working dirs
mbektas Jan 18, 2023
6157d69
do not store empty filesToOpen list
mbektas Jan 19, 2023
09da81f
move settings file
mbektas Jan 19, 2023
ac37a71
separate appdata, sessionconfig, settings
mbektas Jan 19, 2023
8d63510
move IDisposable to tokens
mbektas Jan 19, 2023
8821617
rename MainWindow to SessionWindow
mbektas Jan 19, 2023
a070363
fix move issues
mbektas Jan 19, 2023
2d4d433
if default python not found show notification and install option on w…
mbektas Jan 20, 2023
1b18974
handle last recent delete
mbektas Jan 20, 2023
0f8c3d0
migrate some settings from old config
mbektas Jan 20, 2023
5115fb5
dont list app created servers in connect list
mbektas Jan 20, 2023
c9462ec
remove $HOME option for working directory
mbektas Jan 20, 2023
887c23a
session persistence and clear history
mbektas Jan 21, 2023
cfef428
dont show login dialog for web-app mode
mbektas Jan 21, 2023
80ef35e
try to keep one server session always up in the background
mbektas Jan 21, 2023
7d06129
refactor session server create
mbektas Jan 21, 2023
568a19b
refactor updateContentView
mbektas Jan 21, 2023
cc3e2ce
refactor session create for file open
mbektas Jan 21, 2023
ba995f3
wait for dom ready before updating running server list
mbektas Jan 21, 2023
b6a2795
set body tooltip to empty to hide
mbektas Jan 21, 2023
93bc878
minor fixes, refactoring, cleanup
mbektas Jan 22, 2023
ea9cd38
disable allow origin for web app mode, handle server start failures
mbektas Jan 23, 2023
86ce3b8
fix recent session delete and rendering wrap issues
mbektas Jan 23, 2023
119da42
set custom workspace dir for each session directory
mbektas Jan 23, 2023
55f6f7a
fix PDF rendering issue caused by partition
mbektas Jan 24, 2023
a0468f3
fix recents list scrollbar problem on windows
mbektas Jan 24, 2023
1b5adbb
fix recent session list issues
mbektas Jan 24, 2023
a040419
fix remove recent session problem
mbektas Jan 27, 2023
1b2b2a8
handle multiple instances
mbektas Jan 27, 2023
5249333
set the selected python path from file dialog without further entry, …
mbektas Jan 28, 2023
4a5d4c1
indicate bundled & default env in the list, make sure user selected e…
mbektas Jan 28, 2023
0d9eab9
fix second instance args handling, disable working dir theme override
mbektas Jan 29, 2023
932a68f
prevent persisting invalid python paths
mbektas Jan 29, 2023
807a8cc
hide env select popup on title bar click
mbektas Jan 29, 2023
c05ffe2
fix path encoding issue on Windows
mbektas Jan 29, 2023
817a056
fix linter
mbektas Jan 29, 2023
523520d
fix conda sub-environment discovery on Windows
mbektas Jan 29, 2023
da75e07
fix venv get info on Windows
mbektas Jan 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": "0.1.0",
"configurations": [
{
"name": "Debug Electron App",
"name": "Debug",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
Expand All @@ -15,7 +15,20 @@
}
},
{
"name": "Debug Electron App without Build",
"name": "Debug without webpack",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
"args" : ["."],
"outputCapture": "std",
"preLaunchTask": "npm: build:no-pack",
"env": {
"NODE_ENV": "development"
}
},
{
"name": "Debug without build",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"watch": "concurrently \"yarn watch:tsc\" \"yarn watch:assets\" \"yarn watch:pack\" ",
"build:pack": "webpack --config webpack.browser.js",
"build": "tsc && node ./scripts/extract.js && node ./scripts/copyassets.js && yarn build:pack",
"build:no-pack": "tsc && node ./scripts/extract.js && node ./scripts/copyassets.js",
"build:all": "yarn clean && yarn build && yarn start",
"extract": "node scripts/extract.js",
"pack": "yarn build && electron-builder --dir",
Expand Down Expand Up @@ -151,7 +152,7 @@
"@types/react": "~17.0.2",
"@types/react-dom": "^17.0.1",
"@types/semver": "^7.3.4",
"@types/yargs": "^16.0.0",
"@types/yargs": "^17.0.18",
"@typescript-eslint/eslint-plugin": "~5.28.0",
"@typescript-eslint/parser": "~5.28.0",
"@yarnpkg/lockfile": "~1.1.0",
Expand Down Expand Up @@ -279,9 +280,9 @@
"@jupyterlab/vdom": "3.5.2",
"@jupyterlab/vdom-extension": "3.5.2",
"@jupyterlab/vega5-extension": "3.5.2",
"bottlejs": "^2.0.0",
"ejs": "^3.1.7",
"electron-log": "^4.4.8",
"fast-xml-parser": "^4.0.12",
"fix-path": "^3.0.0",
"js-yaml": "^4.1.0",
"node-fetch": "^2.6.7",
Expand All @@ -291,7 +292,7 @@
"update-electron-app": "^2.0.1",
"which": "^2.0.2",
"winreg": "^1.2.4",
"yargs": "^16.2.0"
"yargs": "^17.6.2"
},
"resolutions": {
"@jupyterlab/application": "~3.5.2",
Expand Down
8 changes: 8 additions & 0 deletions scripts/copyassets.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ function copyAssests() {
path.join(srcDir, 'assets', 'icon.svg'),
path.join(dest, '../app-assets', 'icon.svg')
);
fs.copySync(
path.join(srcDir, 'assets', 'progress-logo.svg'),
path.join(dest, '../app-assets', 'progress-logo.svg')
);
fs.copySync(
path.join(srcDir, 'assets', 'jupyterlab-wordmark.svg'),
path.join(dest, '../app-assets', 'jupyterlab-wordmark.svg')
);

const toolkitPath = path.join(
'../node_modules',
Expand Down
43 changes: 43 additions & 0 deletions src/assets/jupyterlab-wordmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading