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

[AXON-134] Fix for 'Start work' not working when another 'Start work' tab is open #132

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### Bug Fixes

- Fixed 'Create Jira issue' page getting stuck on the loader when the first Jira server is unreachable.
- Fixed 'Start work' not working when another 'Start work' tab is open.

## What's new in 3.4.6

Expand Down
2 changes: 1 addition & 1 deletion src/react/atlascode/startwork/startWorkController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export type StartWorkChanges = { [key: string]: any };
function reducer(state: StartWorkState, action: StartWorkUIAction): StartWorkState {
switch (action.type) {
case StartWorkUIActionType.Init: {
console.log(`JS-1324 start work controller init repo count: ${action.data.repoData.length}`);
console.log(`JS-1324 start work controller init repo count: ${action.data.repoData?.length}`);
const newstate = {
...state,
...action.data,
Expand Down
8 changes: 5 additions & 3 deletions src/webview/singleViewFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,17 @@ export class SingleWebview<FD, R> implements ReactWebview<FD> {
const { id, site, product } = this._controller.screenDetails();
this._analyticsApi.fireViewScreenEvent(id, site, product);
} else {
if (this._controller) {
this._controller.update(factoryData);
this._panel.title = this._controller.title();
}

this._panel.webview.html = this._controllerFactory.webviewHtml(
this._extensionPath,
this._panel.webview.asWebviewUri(Uri.file(this._extensionPath)),
this._panel.webview.cspSource,
);
this._panel.reveal(column ? column : ViewColumn.Active); // , false);
if (this._controller) {
this._controller.update(factoryData);
}
}

// Send feature gates to the panel in a message
Expand Down