ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Agent bugs and fixes (#1243)

Browse Source 
* show Error for temp placeholder

* changed message to loading error

* changed error message when loading

* localized error msg

* localized error message
This commit is contained in:
Aditya Bist
2018-04-24 13:34:17 -07:00
committed by Karl Burtram
parent d0d4df313e
commit a2734807ca
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/base/browser/ui/table/plugins/rowDetailView.ts
View File

@@ -1,6 +1,7 @@
// Adopted and converted to typescript from https://github.com/6pac/SlickGrid/blob/master/plugins/slick.rowdetailview.js // Adopted and converted to typescript from https://github.com/6pac/SlickGrid/blob/master/plugins/slick.rowdetailview.js
// heavily modified // heavily modified
import { mixin } from 'vs/base/common/objects'; import { mixin } from 'vs/base/common/objects';
import * as nls from 'vs/nls';
export class RowDetailView { export class RowDetailView {
@@ -277,7 +278,7 @@ export class RowDetailView {
item._parent = parent; item._parent = parent;
item._offset = offset; item._offset = offset;
item.jobId = parent.jobId; item.jobId = parent.jobId;
item.name = parent.message ? parent.message : 'Error'; item.name = parent.message ? parent.message : nls.localize('rowDetailView.loadError','Loading Error...');
return item; return item;
} }

4
src/sql/parts/jobManagement/views/jobsView.component.ts
View File

@@ -207,7 +207,7 @@ export class JobsViewComponent implements AfterContentChecked {
if (job.lastRunOutcome === 0 && !expandedJobs.get(job.jobId)) { if (job.lastRunOutcome === 0 && !expandedJobs.get(job.jobId)) {
this.expandJobRowDetails(i+expandedJobs.size); this.expandJobRowDetails(i+expandedJobs.size);
this.addToStyleHash(i+expandedJobs.size); this.addToStyleHash(i+expandedJobs.size);
this._agentViewComponent.setExpanded(job.jobId, 'temp'); this._agentViewComponent.setExpanded(job.jobId, 'Loading Error...');
} else if (job.lastRunOutcome === 0 && expandedJobs.get(job.jobId)) { } else if (job.lastRunOutcome === 0 && expandedJobs.get(job.jobId)) {
this.expandJobRowDetails(i+expansions); this.expandJobRowDetails(i+expansions);
this.addToStyleHash(i+expansions); this.addToStyleHash(i+expansions);
@@ -298,7 +298,7 @@ export class JobsViewComponent implements AfterContentChecked {
let item = self.dataView.getItemById(job.jobId + '.error'); let item = self.dataView.getItemById(job.jobId + '.error');
let noStepsMessage = nls.localize('jobsView.noSteps', 'No Steps available for this job.'); let noStepsMessage = nls.localize('jobsView.noSteps', 'No Steps available for this job.');
let errorMessage = jobHistory ? jobHistory.message: noStepsMessage; let errorMessage = jobHistory ? jobHistory.message: noStepsMessage;
item['name'] = item['name'] + ': ' + errorMessage; item['name'] = nls.localize('jobsView.error', 'Error: ') + errorMessage;
self._agentViewComponent.setExpanded(job.jobId, errorMessage); self._agentViewComponent.setExpanded(job.jobId, errorMessage);
self.dataView.updateItem(job.jobId + '.error', item); self.dataView.updateItem(job.jobId + '.error', item);