Merge pull request #1756 from zowe/publish-hotfix

Update version for zFTP fix
zowe · Apr 21, 2022 · 4b7d12d · 4b7d12d
2 parents b437854 + 256f00b
commit 4b7d12d
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 16 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -23,7 +23,7 @@
  "isBackground": true,
  "type": "shell",
  "options": {
- "cwd": "packages/zowe-explorer"
+ "cwd": "${workspaceFolder}/packages/zowe-explorer"
  },
  "command": "yarn",
  "args": ["watch"],
@@ -64,7 +64,7 @@
  "isBackground": true,
  "type": "shell",
  "options": {
- "cwd": "packages/zowe-explorer-ftp-extension"
+ "cwd": "${workspaceFolder}/packages/zowe-explorer-ftp-extension"
  },
  "command": "yarn",
  "args": ["watch"],
@@ -105,7 +105,7 @@
  "isBackground": false,
  "type": "shell",
  "options": {
- "cwd": "scripts"
+ "cwd": "${workspaceFolder}/scripts"
  },
  "command": "ts-node create-env.ts"
  },
@@ -115,7 +115,7 @@
  "isBackground": false,
  "type": "shell",
  "options": {
- "cwd": "packages/zowe-explorer"
+ "cwd": "${workspaceFolder}/packages/zowe-explorer"
  },
  "command": "yarn",
  "args": ["build:integration"],
@@ -127,7 +127,7 @@
  "isBackground": false,
  "type": "shell",
  "options": {
- "cwd": "scripts"
+ "cwd": "${workspaceFolder}/scripts"
  },
  "command": "ts-node clean-env.ts"
  }

diff --git a/packages/eslint-plugin-zowe-explorer/package.json b/packages/eslint-plugin-zowe-explorer/package.json
@@ -1,6 +1,6 @@
 {
  "name": "eslint-plugin-zowe-explorer",
- "version": "1.23.0-SNAPSHOT",
+ "version": "1.23.1",
  "description": "Custom ESLint Rules for ZOWE Explorer",
  "keywords": [
  "eslint",

diff --git a/packages/zowe-explorer-api/package.json b/packages/zowe-explorer-api/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zowe/zowe-explorer-api",
- "version": "1.23.0-SNAPSHOT",
+ "version": "1.23.1",
  "description": "Extensibility API for Zowe Explorer.",
  "publisher": "Zowe",
  "author": "Zowe",

diff --git a/packages/zowe-explorer-ftp-extension/CHANGELOG.md b/packages/zowe-explorer-ftp-extension/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## `1.23.1`
+
+- BugFix: Added a warning prompt so the user is aware some content may be truncated. [#1746](https://github.com/zowe/vscode-extension-for-zowe/pull/1746)
+
 ## `1.22.0`
 
 - Added unit tests for the MVS and JES functionality [#1632](https://github.com/zowe/vscode-extension-for-zowe/pull/1632).

diff --git a/packages/zowe-explorer-ftp-extension/package.json b/packages/zowe-explorer-ftp-extension/package.json
@@ -5,7 +5,7 @@
  "author": "Zowe",
  "license": "EPL-2.0",
  "description": "Adds zFTP support to Zowe Explorer demonstrating how to extend the Zowe Explorer using its extensibility API.",
- "version": "1.23.0-SNAPSHOT",
+ "version": "1.23.1",
  "icon": "resources/zowe_ftp_logo.png",
  "repository": {
  "url": "https://github.com/zowe/vscode-extension-for-zowe"
@@ -46,7 +46,7 @@
  "vscode": "^1.43.0"
  },
  "dependencies": {
- "@zowe/zowe-explorer-api": "1.23.0-SNAPSHOT",
+ "@zowe/zowe-explorer-api": "1.23.1",
  "@zowe/zos-ftp-for-zowe-cli": "1.5.0",
  "tmp": "0.2.1"
  },

diff --git a/packages/zowe-explorer/package.json b/packages/zowe-explorer/package.json
@@ -2,7 +2,7 @@
  "name": "vscode-extension-for-zowe",
  "displayName": "%displayName%",
  "description": "%description%",
- "version": "1.23.0-SNAPSHOT",
+ "version": "1.23.1",
  "publisher": "Zowe",
  "author": "Zowe",
  "license": "EPL-2.0",
@@ -1703,7 +1703,7 @@
  "@types/promise-queue": "^2.2.0",
  "@types/selenium-webdriver": "^3.0.4",
  "@types/yargs": "^11.0.0",
- "eslint-plugin-zowe-explorer": "1.23.0-SNAPSHOT",
+ "eslint-plugin-zowe-explorer": "1.23.1",
  "@typescript-eslint/eslint-plugin": "^2.31.0",
  "@typescript-eslint/parser": "^2.31.0",
  "eslint": "^6.8.0",
@@ -1743,7 +1743,7 @@
  "webpack-cli": "^3.3.11"
  },
  "dependencies": {
- "@zowe/zowe-explorer-api": "1.23.0-SNAPSHOT",
+ "@zowe/zowe-explorer-api": "1.23.1",
  "fs-extra": "8.0.1",
  "isbinaryfile": "4.0.4",
  "js-yaml": "3.13.1",

diff --git a/packages/zowe-explorer/src/uss/ZoweUSSNode.ts b/packages/zowe-explorer/src/uss/ZoweUSSNode.ts
@@ -14,7 +14,6 @@ import * as globals from "../globals";
 import * as vscode from "vscode";
 import * as fs from "fs";
 import * as path from "path";
-import * as moment from "moment";
 import { Session, IProfileLoaded } from "@zowe/imperative";
 import { IZoweUSSTreeNode, ZoweTreeNode, IZoweTree, ValidProfileEnum } from "@zowe/zowe-explorer-api";
 import { Profiles } from "../Profiles";
@@ -439,7 +438,7 @@ export class ZoweUSSNode extends ZoweTreeNode implements IZoweUSSTreeNode {
  this.downloadedInternal = value;
 
  if (value) {
- this.downloadedTime = moment().toISOString();
+ this.downloadedTime = new Date().toISOString();
  this.tooltip = injectAdditionalDataToTooltip(this, this.fullPath);
  }
 

diff --git a/packages/zowe-explorer/src/uss/utils.ts b/packages/zowe-explorer/src/uss/utils.ts
@@ -10,7 +10,6 @@
  */
 
 // tslint:disable-next-line: no-duplicate-imports
-import * as moment from "moment";
 import { ZoweUSSNode } from "../uss/ZoweUSSNode";
 
 /**
@@ -22,7 +21,9 @@ import { ZoweUSSNode } from "../uss/ZoweUSSNode";
 export function injectAdditionalDataToTooltip(node: ZoweUSSNode, tooltip: string) {
  if (node.downloaded && node.downloadedTime) {
  // TODO: Add time formatter to localization so we will use not just US variant
- return `${tooltip} (Downloaded: ${moment(node.downloadedTime).format("HH:mm MM/DD/YY")})`;
+ return `${tooltip} (Downloaded: ${new Date(node.downloadedTime)
+ .toISOString()
+ .replace(/(\d{4})-(\d{2})-(\d{2})T((\d{2}):(\d{2}):([^Z]+))Z/, "$5:$6 $2/$3/$1")})`;
  }
 
  return tooltip;