From 519cf0df31ad2984dab40e7d42782411eda65bc7 Mon Sep 17 00:00:00 2001 From: Ben Gordon Date: Tue, 29 Mar 2022 11:29:50 -0500 Subject: [PATCH] 3.7.1 (#175) * 3.8.0 * as3 tasks tweak --- CHANGELOG.md | 6 ++++++ package-lock.json | 16 ++++++++-------- package.json | 2 +- src/treeViewsProviders/as3TreeProvider.ts | 20 +++++++++++++------- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91d6447..e634292 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,12 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how --- +## [3.7.1] - (03-29-2022) + +- as3 declarations/tasks data smoothing (m) + +--- + ## [3.7.0] - (03-18-2022) - [RFE] Ability to organize F5 Hosts into Folders #71 diff --git a/package-lock.json b/package-lock.json index daba52e..0973d84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-f5", - "version": "3.6.1", + "version": "3.7.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-f5", - "version": "3.6.1", + "version": "3.8.0", "license": "Apache-2.0", "dependencies": { "@f5devcentral/f5-fast-core": "^0.18.0", @@ -2667,9 +2667,9 @@ } }, "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" }, "node_modules/mkdirp": { "version": "0.5.5", @@ -6048,9 +6048,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" }, "mkdirp": { "version": "0.5.5", diff --git a/package.json b/package.json index 61b9122..33ffe08 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "The F5 Extension", "description": "Supercharge your F5 automation development", "publisher": "F5DevCentral", - "version": "3.7.0", + "version": "3.7.1", "keywords": [ "F5", "F5Networks", diff --git a/src/treeViewsProviders/as3TreeProvider.ts b/src/treeViewsProviders/as3TreeProvider.ts index d3e80ab..f4fb33b 100644 --- a/src/treeViewsProviders/as3TreeProvider.ts +++ b/src/treeViewsProviders/as3TreeProvider.ts @@ -281,7 +281,7 @@ export class AS3TreeProvider implements TreeDataProvider { await this.getTenants(); // refresh tenant information await this.getTasks(); // refresh tasks information - const taskCount = this.tasks.length !== 0 ? this.tasks.length.toString() : ''; + const taskCount = this.tasks.length !== 0 ? this.tasks.length.toString() : '0'; // only try to parse declarations if we have an as3 dec map // sometimes AS3 is installed but has no apps @@ -342,13 +342,19 @@ export class AS3TreeProvider implements TreeDataProvider { await ext.f5Client?.as3?.getTasks() .then((resp: any) => { this.tasks = []; // clear current tenant list - this.tasks = resp.data.items.map((item: any) => { - // if no decs in task or none on box, it returns limited details, but the request still gets an ID, so we blank in what's not there - also happens when getting-tasks - const timeStamp = item.declaration.hasOwnProperty('controls') ? item.declaration.controls.archiveTimestamp : ''; - const iId = item.id; - return { iId, timeStamp }; - }); + // reassing tasks data cbip returns 'resp.data.items[]', mbip returns 'resp.data[]' + const tsks = resp.data.items ? resp.data.items : resp.data; + + // if(resp.data.length > 0) { + this.tasks = tsks.map((item: any) => { + // if no decs in task or none on box, it returns limited details, but the request still gets an ID, so we blank in what's not there - also happens when getting-tasks + const timeStamp = item.declaration.hasOwnProperty('controls') ? item.declaration.controls.archiveTimestamp : ''; + const iId = item.id; + + return { iId, timeStamp }; + }); + // } }); } }