Ready to publish

Author: ggallotti

assets/gx.png

@@ -2,23 +2,18 @@
   "compatibleVersion": 3,
   "bundleVersion": 1,
   "name": "GeneXusDesignOps",
-  "title": "GxDesignOps",
+  "title": "GeneXus Design Ops",
   "commands": [
     {
-      "name": "Build and Deploy Prototype",
+      "name": "Build & Deploy Prototype",
       "identifier": "gxdesignops.deploy-to-cloud-identifier",
       "script": "__deploy-to-cloud_ts"
     },
     {
-      "name": "Status",
+      "name": "Check Last Status",
       "identifier": "gxdesignops.deploy-to-cloud-status-identifier",
       "script": "__deploy-to-cloud-status_ts"
     },
-    {
-      "name": "Send Sketch and Images ",
-      "identifier": "gxdesignops.send-to-queue-identifier",
-      "script": "__send-to-queue.js"
-    },
     {
       "name": "Send GeneXus Format",
       "identifier": "gxdesignops.send-to-queue-identifier-gx",
@@ -46,15 +41,14 @@
       "gxdesignops.deploy-to-cloud-identifier",
       "gxdesignops.deploy-to-cloud-status-identifier",
       "-",
-      "gxdesignops.send-to-queue-identifier",
       "gxdesignops.send-to-queue-identifier-gx",
       "gxdesignops.file-send-to-queue-identifier",
       "gxdesignops.see-result",
       "-",
       "gxdesignops.set-queue-path"
     ]
   },
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Sketch Plugin For GeneXus Design Ops Cycles",
   "identifier": "GeneXus DesignOps",
   "disableCocoaScriptPreprocessor": true,

gxdesignops.sketchplugin/Contents/Resources/gx.png

@@ -2,7 +2,7 @@
   "name": "gxdesignops",
   "description": "Sketch Plugin For GeneXus Design Ops Cycles",
   "repository": "https://github.com/genexuslabs/sketchdesignops.git",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "engines": {
     "sketch": ">=49.0"
   },
@@ -16,7 +16,7 @@
     "sketch-assets-file": "sketch-assets/icons.sketch"
   },
   "scripts": {
-    "dev:sketch": "SET NODE_ENV=development && skpm-build",
+    "dev:sketch": "NODE_ENV=development skpm-build",
     "build": "skpm-build",
     "watch": "skpm-build --watch",
     "start": "skpm-build --watch --run",

gxdesignops.sketchplugin/Contents/Sketch/__deploy-to-cloud-2.js

@@ -1,9 +1,8 @@
 import sketch from 'sketch';
-import { openUrl, output, showOperationMessage, syncFetch, attachToConsole, startOperationContext, step, info } from './utils';
+import { openUrl, output, showOperationMessage, syncFetch, attachToConsole, startOperationContext, step, info, getFileAndQueueName, getQueuePath } from './utils';
 import { execSync } from '@skpm/child_process';
-import Settings from 'sketch/settings';
-import { SettingKeys } from './constants';
 import { runOnBackgroundAsync } from './utils-new';
+import { getSettingsData, setCurrentProject } from './settings-helper';
 
 
 async function runCommand() {
@@ -27,21 +26,20 @@ export default async function () {
 export async function status() {
   startOperationContext("Checking status", 10);
 
+  let fileName;
+  ({ fileName } = getFileAndQueueName(sketch.getSelectedDocument(), getQueuePath()));
+  
   step("Reading Settings");
-
-  const projectId = Settings.settingForKey(SettingKeys.PROJECT_ID);
-
-  const serverUrl = Settings.settingForKey(SettingKeys.SERVER_URL);
-
-  const statusUrl = serverUrl + 'status?id=' + projectId;
-
-
+  
+  setCurrentProject(fileName);
+  const settings = getSettingsData();
+  const statusUrl = settings.serverUrl + 'status?id=' + settings.projectId;
   step("Checking Job Status");
 
   let isReady = false;
   let deployUrl;
   let pendingRetryCount = 3;
-  let message = '';
+  let message = 'Unknown error';
   let failed = false;
   let waitingRetries = 0;
   let buildingRetries = 0;

gxdesignops.sketchplugin/Contents/Sketch/__deploy-to-cloud-2.js.map

@@ -4,6 +4,7 @@ import { spawnSync, execSync } from '@skpm/child_process';
 import Settings from 'sketch/settings';
 import { SettingKeys } from './constants';
 import { runOnBackgroundAsync } from './utils-new';
+import { getSettingsData, setCurrentProject } from './settings-helper';
 
 
 async function runCommand() {
@@ -34,15 +35,7 @@ export default async function () {
 export async function publish(queuePath, doc, images) {
   startOperationContext("Build And Deploy Prototype", 10);
 
-  step("Reading Settings");
-
-  const projectId = Settings.settingForKey(SettingKeys.PROJECT_ID) || uuidv4();
-  const projectName = Settings.settingForKey(SettingKeys.PROJECT_NAME) || '';
-  const projectUserName = Settings.settingForKey(SettingKeys.PROJECT_USER_NAME) || '';
-  const serverUrl = Settings.settingForKey(SettingKeys.SERVER_URL);
-
-  const enqueueUrl = serverUrl + 'enqueue';
-
+  
   let enableFonts = Settings.settingForKey(SettingKeys.ENABLE_FONTS) == 1
 
   var fileName;
@@ -58,6 +51,12 @@ export async function publish(queuePath, doc, images) {
     }
   }
 
+  step("Reading Settings");
+  setCurrentProject(fileName);
+  const settings = getSettingsData();
+  const enqueueUrl = settings.serverUrl + 'enqueue';
+
+
   step("Copy Images");
 
   if (images) {
@@ -112,9 +111,9 @@ export async function publish(queuePath, doc, images) {
 
   const enqueueRequest = {
     source: 'sketch',
-    projectId: projectId,
-    projectName: projectName,
-    userName: projectUserName,
+    projectId: settings.projectId,
+    projectName: settings.projectName,
+    userName: settings.userName,
     overwrite: true
   }
 
@@ -169,7 +168,7 @@ export async function publish(queuePath, doc, images) {
   }
 
   step('Job uploaded successfully');
-  sketch.UI.alert("GeneXus", "Your prototype has been uploaded. 💚 Please check status page for work status.");
+  sketch.UI.alert("GeneXus", "Your prototype has been uploaded. 💚 Please check status option for work status. (Plugins -> GeneXus -> Check Status)");
 
   return true;
 }
@@ -185,10 +184,3 @@ function upload(url, filePath) {
   }
   return false;
 }
-
-function uuidv4() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
-    return v.toString(16);
-  });
-}

gxdesignops.sketchplugin/Contents/Sketch/__deploy-to-cloud-status_ts

@@ -2,20 +2,16 @@ const { identifier, name } = require('./identifier');
 
 const commandList = [
   {
-    name: 'Build and Deploy Prototype',
+    name: 'Build & Deploy Prototype',
     identifier: `${identifier}.deploy-to-cloud-identifier`,
     script: './deploy-to-cloud.ts'
   },
   {
-    name: 'Status',
+    name: 'Check Last Status',
     identifier: `${identifier}.deploy-to-cloud-status-identifier`,
     script: './deploy-to-cloud-status.ts'
   },
-  {
-    name: "Send Sketch and Images ",
-    identifier: `${identifier}.send-to-queue-identifier`,
-    script: "./send-to-queue.js"
-  },
+
   {
     name: "Send GeneXus Format",
     identifier: `${identifier}.send-to-queue-identifier-gx`,
@@ -43,15 +39,15 @@ module.exports = {
   compatibleVersion: 3,
   bundleVersion: 1,
   name,
-  title: "GxDesignOps",
+  title: "GeneXus Design Ops",
   commands: commandList,
   menu: {
     title: name,
     items: [
       `${identifier}.deploy-to-cloud-identifier`,
       `${identifier}.deploy-to-cloud-status-identifier`,
       '-',
-      `${identifier}.send-to-queue-identifier`,
+      //`${identifier}.send-to-queue-identifier`,
       `${identifier}.send-to-queue-identifier-gx`,
       `${identifier}.file-send-to-queue-identifier`,
       `${identifier}.see-result`,

gxdesignops.sketchplugin/Contents/Sketch/__deploy-to-cloud.js

@@ -6,8 +6,8 @@ export default function () {
   var queuePath = getQueuePath();
   var fileName;
 
-  let doc = window["doc"] || global["doc"];
-
+  const doc = sketch.getSelectedDocument();
+  
   ({ fileName, queuePath } = getFileAndQueueName(doc, queuePath));
 
   const urlPath = queuePath + fileName.replace(".sketch", ".url");

gxdesignops.sketchplugin/Contents/Sketch/__deploy-to-cloud.js.map

@@ -8,17 +8,19 @@ import {  SettingKeys} from './constants';
 
 export default function() {
   sketch.UI.alert("Copied to Design Ops Queue ! 💚");
-  const doc = sketch.getSelectedDocument()
+  const doc = sketch.getSelectedDocument();
   var queuePath = getQueuePath();
-  if (queuePath)
+  if (queuePath) {
     if (!copySketch(queuePath, doc, true))
       showOperationMessage("😔 Some error occurs, see console for further details", output);
+  }
 }
 
 
 export function copySketch(queuePath, doc, images) {
   var fileName;
   var path = queuePath;
+  console.log("Starting copySketch " + queuePath);
   ({ fileName, queuePath } = getFileAndQueueName(doc, path));
   console.log("copy to queue:" + queuePath);
   if (queuePath.localeCompare(path) != 0) {

gxdesignops.sketchplugin/Contents/Sketch/__deploy-to-cloud_ts

@@ -8,7 +8,7 @@ export default function (context) {
 
   // Read settings
   const projectId = Settings.settingForKey(SettingKeys.PROJECT_ID) || uuidv4();
-  const projectName = Settings.settingForKey(SettingKeys.PROJECT_NAME) || '';
+  //const projectName = Settings.settingForKey(SettingKeys.PROJECT_NAME) || '';
   const projectUserName = Settings.settingForKey(SettingKeys.PROJECT_USER_NAME) || '';
   let serverUrl = Settings.settingForKey(SettingKeys.SERVER_URL) || 'https://maed962my9.execute-api.us-east-1.amazonaws.com/prod/';
 
@@ -51,8 +51,8 @@ export default function (context) {
   dialog.addDivider();
   dialog.addLeftLabel("", "Project Id");
   const textProjectId = dialog.addTextInput("projectId", "", projectId);
-  dialog.addLeftLabel("", "Project Name");
-  const textProjectName = dialog.addTextInput("projectName", "", projectName, "Project Name");
+  //dialog.addLeftLabel("", "Project Name");
+  //const textProjectName = dialog.addTextInput("projectName", "", projectName, "Project Name");
   dialog.addLeftLabel("", "User Name");
   const textProjectUserName = dialog.addTextInput("projectUserName", "", projectUserName, "GeneXus User Account Name");
   dialog.addLeftLabel("", "Server Url");
@@ -63,8 +63,8 @@ export default function (context) {
   textServerUrl.setEnabled(true);
   textProjectId.setEnabled(true);
   textProjectId.setEditable(false);
-  textProjectName.setEnabled(true);
-  textProjectName.setEnabled(true);
+  //textProjectName.setEnabled(true);
+  //textProjectName.setEnabled(true);
   textProjectUserName.setEditable(true);
   textProjectUserName.setEnabled(true);
 
@@ -117,7 +117,7 @@ export default function (context) {
 
     Settings.setSettingForKey(SettingKeys.SERVER_URL, serverUrl);
     Settings.setSettingForKey(SettingKeys.PROJECT_ID, projectId);
-    Settings.setSettingForKey(SettingKeys.PROJECT_NAME, projectNameUserValue);
+    //Settings.setSettingForKey(SettingKeys.PROJECT_NAME, projectNameUserValue);
     Settings.setSettingForKey(SettingKeys.PROJECT_USER_NAME, projectUserNameUserValue);
 
     Settings.setSettingForKey("DesignOpsQueue", queueDesign);

gxdesignops.sketchplugin/Contents/Sketch/__my-command.js

@@ -0,0 +1,27 @@
+import { Settings } from "sketch";
+import { SettingKeys } from "./constants";
+import { normalize, uuidv4 } from "./utils-new";
+
+let currentActiveProjectName: string;
+
+export function setCurrentProject(name: string) {
+    currentActiveProjectName = name.replace('.', '-');
+}
+
+export interface SettingsData {
+
+    projectId: string;
+    projectName: string;
+    userName: string;
+    serverUrl: string;
+}
+
+export function getSettingsData(): SettingsData{
+    return {
+        projectId: normalize(Settings.settingForKey(SettingKeys.PROJECT_ID) || uuidv4() + '-' + currentActiveProjectName),
+        userName: Settings.settingForKey(SettingKeys.PROJECT_USER_NAME) || '',
+        serverUrl: Settings.settingForKey(SettingKeys.SERVER_URL),
+        projectName: currentActiveProjectName
+    }
+}
+

gxdesignops.sketchplugin/Contents/Sketch/__my-command.js.map

@@ -6,7 +6,7 @@ import { attachToConsole, Delegate, setDialogFeedback} from './utils';
 export async function runOnBackgroundAsync(runCommand, title, description, actionName) {
     UIDialog.setUp(context);
 
-    const dialog = new UIDialog(title, NSMakeRect(0, 0, 400, 180), actionName, description, "Close")
+    const dialog = new UIDialog(title, NSMakeRect(0, 0, 400, 220), actionName, description, "Close")
     var step = 0;
     var progress = dialog.addProgress(true, 0, 10);
     // @ts-ignore: Types sketch error
@@ -17,8 +17,6 @@ export async function runOnBackgroundAsync(runCommand, title, description, actio
         {
             'next:': async function next() {
                 if (!(step in steps)) {
-                    // @ts-ignore: Types sketch error
-                    //lbl.setString(userOutput);
                     return;
                 }
                 step++;
@@ -34,25 +32,17 @@ export async function runOnBackgroundAsync(runCommand, title, description, actio
             progress.setHidden(false);
             // @ts-ignore: Types sketch error
             progress.startAnimation(true);
-            // @ts-ignore: Types sketch error
-            //lbl.setString(userOutput);
         },
         2: async function () {
-            // @ts-ignore: Types sketch error
-           // lbl.setString(userOutput);
         },
         3: async function () {
             console.log('running command..');
             await runCommand();
-            // @ts-ignore: Types sketch error
-            //lbl.setString(userOutput);
         },
         4: async function () {
             timer.invalidate();
-            // @ts-ignore: Types sketch error
-            progress.stopAnimation(true);
             // @ts-ignore: Unreachable code error
-            //lbl.setString(userOutput);
+            progress.stopAnimation(true);
         }
     };
     var onExport = function onExport() {
@@ -74,4 +64,17 @@ export async function runOnBackgroundAsync(runCommand, title, description, actio
             return false
         }
     }
-}
+}
+
+export function normalize(name: string){
+    return name.replace(' ', '').replace('.', '-');
+
+}
+
+
+export function uuidv4() {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+      var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+      return v.toString(16);
+    });
+  }