Skip to content

fix: view loading order #193

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 30, 2023
Merged

fix: view loading order #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 3 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,7 @@
"stats": "npm run --silent package -- --env namedChunks=true --profile --json > ./dist/stats.json && webpack-bundle-analyzer ./dist/stats.json ./dist"
},
"activationEvents": [
"workspaceContains:**",
"onView:cnblogs-authorize",
"onView:cnblogs-account",
"onView:cnblogs-post-list",
"onView:vscode-cnb-workspace",
"onCommand:vscode-cnb.workspace.code-open",
"onCommand:vscode-cnb.login.web",
"onCommand:vscode-cnb.logout",
"onCommand:vscode-cnb.ing-publish-select"
"onStartupFinished"
],
"main": "./dist/extension.js",
"contributes": {
Expand Down Expand Up @@ -769,13 +761,13 @@
{
"id": "cnblogs-authorize",
"name": "登录/授权",
"when": "!vscode-cnb.isAuthed",
"when": "vscode-cnb.isUnauthorized",
"visibility": "visible"
},
{
"id": "vscode-cnb-workspace",
"name": "工作空间",
"when": "vscode-cnb.isAuthed",
"when": "!vscode-cnb.isUnauthorized",
"visibility": "collapsed"
},
{
Expand Down
2 changes: 2 additions & 0 deletions src/auth/auth-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ export namespace AuthManager {

await execCmd('setContext', `${globalCtx.extName}.isAuthed`, isAuthed)

await execCmd('setContext', `${globalCtx.extName}.isUnauthorized`, !isAuthed)

if (!isAuthed) return

await execCmd('setContext', `${globalCtx.extName}.user`, {
Expand Down
4 changes: 2 additions & 2 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export async function activate(ctx: ExtensionContext) {
// WRN: For old version compatibility, NEVER remove this line
void LocalState.delSecret('user')

await AuthManager.updateAuthStatus()

setupExtCmd()
setupExtTreeView()

Expand All @@ -28,8 +30,6 @@ export async function activate(ctx: ExtensionContext) {

window.registerUriHandler(extUriHandler)

await AuthManager.updateAuthStatus()

setupUi(LocalState.getExtCfg())

return { extendMarkdownIt }
Expand Down