From cecb58ac2135e05afeafb184b2029100ccca7f2d Mon Sep 17 00:00:00 2001
From: Ioannis Kappas <ioannis@kappas.io>
Date: Sat, 24 Jul 2021 09:41:04 +0300
Subject: [PATCH] Fix environment comparison case sensitivity and update
 Microsoft.PowerApps.CLI to 1.8.5 (#10)

* Comment unused webpack dependencies in gulpfile

* Update Microsoft.PowerApps.CLI to 1.8.5

* Fix environment comparison case sensitivity
---
 gulpfile.js              |  8 ++++----
 src/entities/PowerApp.ts | 28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index a645d3d..c4a9f66 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -9,8 +9,8 @@ const gulp = require('gulp');
 const eslint = require('gulp-eslint');
 const mocha = require('gulp-mocha');
 const moment = require('moment');
-const gulpWebpack = require('webpack-stream');
-const webpack = require('webpack');
+// const gulpWebpack = require('webpack-stream');
+// const webpack = require('webpack');
 const vsce = require('vsce');
 const argv = require('yargs').argv;
 
@@ -209,8 +209,8 @@ async function snapshot() {
 
 const recompile = gulp.series(
     clean,
-    async () => nugetInstall('nuget.org', 'Microsoft.PowerApps.CLI', '1.7.2', path.resolve(distdir, 'pac')),
-    async () => nugetInstall('nuget.org', 'Microsoft.PowerApps.CLI.Core.osx-x64', '1.7.2', path.resolve(distdir, 'pac')),
+    async () => nugetInstall('nuget.org', 'Microsoft.PowerApps.CLI', '1.8.5', path.resolve(distdir, 'pac')),
+    async () => nugetInstall('nuget.org', 'Microsoft.PowerApps.CLI.Core.osx-x64', '1.8.5', path.resolve(distdir, 'pac')),
     compile,
 );
 
diff --git a/src/entities/PowerApp.ts b/src/entities/PowerApp.ts
index eea521c..41f93bf 100644
--- a/src/entities/PowerApp.ts
+++ b/src/entities/PowerApp.ts
@@ -10,7 +10,7 @@ import { env } from 'process';
 import { APIUtils } from '../helpers/APIUtils';
 
 export class PowerApp extends TreeItemWithParent {
-	
+
     constructor(
         public readonly id: string,
         public readonly name: string,
@@ -23,9 +23,9 @@ export class PowerApp extends TreeItemWithParent {
         public readonly environment: Environment | undefined,
         public readonly collapsibleState: vscode.TreeItemCollapsibleState,
         public readonly command?: vscode.Command
-    ) {        
+    ) {
         super(`${displayName}`, collapsibleState);
-        
+
         this.id          = id;
         this.name        = name;
         this.displayName = displayName;
@@ -43,7 +43,7 @@ export class PowerApp extends TreeItemWithParent {
             `|-:|:-:|:-|`,
             `|*Name:*               ||${name}|`,
             `|*App-Version:*        ||${version}|`,
-            `|*App Plan Classification:*||${this.properties?.appPlanClassification}|`,  
+            `|*App Plan Classification:*||${this.properties?.appPlanClassification}|`,
             `|*Designer-Version:*   ||${this.properties?.createdByClientVersion?.major}.${this.properties?.createdByClientVersion?.minor}.${this.properties?.createdByClientVersion?.build}.${this.properties?.createdByClientVersion?.revision}|`,
             `|*CanvasApp-Id:*       ||${id?.split("/")?.slice(-1)[0]}|`,  // unauthenticatedWebPackageHint
             `|*Id:*                 ||${id}|`,
@@ -70,25 +70,25 @@ export class PowerApp extends TreeItemWithParent {
 		light: path.join(path.dirname(__filename), '..', '..', 'media', 'powerapps.svg'),
 		dark: path.join(path.dirname(__filename), '..', '..', 'media', 'powerapps.svg')
 	};
-    
-    public connections?: Connection[];    
-    
+
+    public connections?: Connection[];
+
     static convert (data: any, environments?: Environment[]): PowerApp {
         const properties    = data.properties;
         const version       = properties.appPackageDetails !== undefined ? properties.appPackageDetails.documentServerVersion : {};
         const toConnections = (app: PowerApp, connections: any): Connection[] => { return connections === undefined ? [] : Object.entries(connections).map<Connection>(([k, v]) => Connection.convert(app, k, v)); };
-        const environment   = environments?.filter(e => e.id === properties.environment.id)[0];
+        const environment   = environments?.filter(e => e.id.toLowerCase() === properties.environment.id.toLowerCase())[0];
         const powerApp      = new PowerApp(
             data.id,
-            data.name, 
-            version !== undefined ? `${version.major}.${version.minor}.${version.build}.${version.revision}` : "", 
-            properties.displayName, 
-            properties.description, 
-            properties.appOpenUri, 
+            data.name,
+            version !== undefined ? `${version.major}.${version.minor}.${version.build}.${version.revision}` : "",
+            properties.displayName,
+            properties.description,
+            properties.appOpenUri,
             properties.appUris !== undefined && properties.appUris.documentUri !== undefined ? properties.appUris.documentUri.value : undefined,
             properties,
             environment,
-            vscode.TreeItemCollapsibleState.Collapsed, 
+            vscode.TreeItemCollapsibleState.Collapsed,
             undefined);
 
         powerApp.connections = toConnections(powerApp, properties.connectionReferences);