From d7724b2ab5cdba46ff33fd1293fee3be2a361355 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Thu, 19 Sep 2019 17:21:37 -0300
Subject: [PATCH] [IMPROVE] Remove global Blaze helpers (#15414)

* Remove unused not helper

* Move escapeCSsUrl helper to uploadedFilesList template
---
 app/integrations/client/views/integrationsOutgoing.html | 6 +++---
 app/ui-admin/client/admin.html                          | 2 +-
 app/ui-admin/client/users/adminUsers.html               | 2 +-
 app/ui-flextab/client/tabs/uploadedFilesList.js         | 3 +++
 client/templateHelpers/escapeCssUrl.js                  | 3 ---
 client/templateHelpers/index.js                         | 2 --
 client/templateHelpers/not.js                           | 3 ---
 7 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 client/templateHelpers/escapeCssUrl.js
 delete mode 100644 client/templateHelpers/not.js

diff --git a/app/integrations/client/views/integrationsOutgoing.html b/app/integrations/client/views/integrationsOutgoing.html
index fd35b7a436a..2d15d8d81b3 100644
--- a/app/integrations/client/views/integrationsOutgoing.html
+++ b/app/integrations/client/views/integrationsOutgoing.html
@@ -2,9 +2,9 @@
 	<section class="page-container page-home page-static page-settings">
 		{{#header sectionName=pageTitle buttons=true}}
 			<div class="rc-header__section-button">
-				<button class="rc-button rc-button--secondary history" disabled="{{not showHistoryButton}}">{{_ "History"}}</button>
-				<button class="rc-button rc-button--cancel delete" disabled="{{not canDelete}}"><span>{{_ "Delete"}}</span></button>
-				<button class="rc-button rc-button--primary save" disabled="{{not hasTypeSelected}}"><span>{{_ "Save_changes"}}</span></button>
+				<button class="rc-button rc-button--secondary history" disabled="{{$not showHistoryButton}}">{{_ "History"}}</button>
+				<button class="rc-button rc-button--cancel delete" disabled="{{$not canDelete}}"><span>{{_ "Delete"}}</span></button>
+				<button class="rc-button rc-button--primary save" disabled="{{$not hasTypeSelected}}"><span>{{_ "Save_changes"}}</span></button>
 			</div>
 		{{/header}}
 
diff --git a/app/ui-admin/client/admin.html b/app/ui-admin/client/admin.html
index 9df76523349..34a383bd52a 100644
--- a/app/ui-admin/client/admin.html
+++ b/app/ui-admin/client/admin.html
@@ -6,7 +6,7 @@
 					{{#if hasChanges}}
 						<button class="rc-button rc-button--cancel discard"><span>{{_ "Cancel"}}</span></button>
 					{{/if}}
-					<button class="rc-button rc-button--primary save" disabled="{{not hasChanges}}"><span>{{_ "Save_changes"}}</span></button>
+					<button class="rc-button rc-button--primary save" disabled="{{$not hasChanges}}"><span>{{_ "Save_changes"}}</span></button>
 					{{#if $eq _id 'OAuth'}}
 						<button class="rc-button rc-button--secondary refresh-oauth"><span>{{_ "Refresh_oauth_services"}}</span></button>
 						<button class="rc-button rc-button--secondary add-custom-oauth"><span>{{_ "Add_custom_oauth"}}</span></button>
diff --git a/app/ui-admin/client/users/adminUsers.html b/app/ui-admin/client/users/adminUsers.html
index 4af3cb4fbcd..becdb5d67e3 100644
--- a/app/ui-admin/client/users/adminUsers.html
+++ b/app/ui-admin/client/users/adminUsers.html
@@ -77,7 +77,7 @@
 									</div>
 								</td>
 								<td width="20%">
-									<div class="rc-table-wrapper">{{#if not active}}{{_"deactivated"}}{{else}}{{status}}{{/if}}</div>
+									<div class="rc-table-wrapper">{{#if $not active}}{{_"deactivated"}}{{else}}{{status}}{{/if}}</div>
 								</td>
 							</tr>
 							{{else}} {{# with searchText}}
diff --git a/app/ui-flextab/client/tabs/uploadedFilesList.js b/app/ui-flextab/client/tabs/uploadedFilesList.js
index abbacb4556d..764e78c8cde 100644
--- a/app/ui-flextab/client/tabs/uploadedFilesList.js
+++ b/app/ui-flextab/client/tabs/uploadedFilesList.js
@@ -49,6 +49,9 @@ Template.uploadedFilesList.helpers({
 			return getURL(this.url);
 		}
 	},
+
+	escapeCssUrl: (url) => url.replace(/(['"])/g, '\\$1'),
+
 	limit() {
 		return Template.instance().state.get('limit');
 	},
diff --git a/client/templateHelpers/escapeCssUrl.js b/client/templateHelpers/escapeCssUrl.js
deleted file mode 100644
index fccb4e69a91..00000000000
--- a/client/templateHelpers/escapeCssUrl.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Template } from 'meteor/templating';
-
-Template.registerHelper('escapeCssUrl', (url) => url.replace(/(['"])/g, '\\$1'));
diff --git a/client/templateHelpers/index.js b/client/templateHelpers/index.js
index b7ff6277b80..74f50060a20 100644
--- a/client/templateHelpers/index.js
+++ b/client/templateHelpers/index.js
@@ -1,4 +1,2 @@
-import './escapeCssUrl';
 import './log';
-import './not';
 import './pathFor';
diff --git a/client/templateHelpers/not.js b/client/templateHelpers/not.js
deleted file mode 100644
index a47086b4468..00000000000
--- a/client/templateHelpers/not.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Template } from 'meteor/templating';
-
-Template.registerHelper('not', (value) => !value);