move button code to scripts folder and fix release build of button script

Author: beefo

generators/app/index.js

@@ -185,7 +185,8 @@ module.exports = yeoman.Base.extend({
         this.destinationPath('gulpfile.babel.js'), {
           date: new Date().toISOString().split('T')[0],
           name: this.pkg.name,
-          version: this.pkg.version
+          version: this.pkg.version,
+          isButton: this.props.isButton,
         }
       );
     },
@@ -264,8 +265,8 @@ module.exports = yeoman.Base.extend({
     scripts: function () {
       if (this.props.isButton) {
         this.fs.copyTpl(
-          this.templatePath('app/button.js'),
-          this.destinationPath('app/' + this.props.camelName + '.js'), {
+          this.templatePath('app/scripts/button.js'),
+          this.destinationPath('app/scripts/' + this.props.camelName + '.js'), {
             root: this.props.camelName
           }
         );

generators/app/templates/_package.json

@@ -47,7 +47,8 @@
             "quotes": [
                 2,
                 "single"
-            ]
+            ],
+            "no-alert": false
         },
         "globals": {
             "geotab": true,

generators/app/templates/app/addin.html

@@ -27,7 +27,7 @@
   <script src="scripts/main.js"></script>
   <!-- endbuild -->
   <% } else { %>
-  <script src="<%= root %>.js"></script>
+  <script src="{click}"></script>
   <% } %>
 </head>
 

generators/app/templates/app/button.js

@@ -5,7 +5,7 @@
   "items": [{
     <% if (isButton) { %>
     "page": "<%= page %>",
-    "click": "<%= url %>",
+    "click": "scripts/<%= url %>",
     "buttonName": {
       "en": "<%= menuName %>"
     },

generators/app/templates/app/config.json

@@ -0,0 +1,21 @@
+/**
+ * The function is called whenever the Add-In button is clicked.
+ *
+ * @param {object} event - The event dispatched from the button click.
+ * @param {object} api - The GeotabApi object for making calls to MyGeotab.
+ * @param {object} state - The page state object allows access to URL, page navigation and global group filter.
+ */
+geotab.customButtons.<%= root %> = (event, api, state) => {
+  'use strict';
+
+  event.preventDefault();
+
+  state.setState({
+    hello: 'world'
+  });
+
+  // getting the current user to display in the UI
+  api.getSession(session => {
+    alert(`Hello ${session.userName}`);
+  });
+};

generators/app/templates/app/scripts/button.js

@@ -85,11 +85,15 @@ gulp.task('json', () => {
 
 gulp.task('html', ['styles', 'scripts'], () => {
   var options = JSON.parse(fs.readFileSync('./app/config.json')).dev;
+  <% if (isButton) { %>
+  return gulp.src(['.tmp/**/*'])
+  <% } else { %>
   return gulp.src('app/*.html')
     .pipe($.useref({
       searchPath: ['.tmp', 'app', '.']
     }))
-    .pipe($.if('*.js', $.uglify()))
+  <% } %>
+  .pipe($.if('*.js', $.uglify()))
     .pipe($.if('*.css', $.cssSandbox('#' + options.root)))
     .pipe($.if('*.css', $.cssnano()))
     // convert relative urls to absolute
@@ -153,7 +157,9 @@ let mockAddinHost = sourceDir => {
 
     if (parsed.pathname === '/' || parsed.pathname.indexOf(config.dev.root + '.html') > -1) {
       if (isButton) {
-        htmlSource = fs.readFileSync('.dev/button.html', 'utf8').replace('{icon}', `style="background-image: url(${config.items[0].icon})"` || '');
+        htmlSource = fs.readFileSync('.dev/button.html', 'utf8')
+          .replace('{click}', config.items[0].click || '')
+          .replace('{icon}', `style="background-image: url(${config.items[0].icon})"` || '');
       } else {
         htmlSource = fs.readFileSync(parsed.pathname === '/' ? `${sourceDir}/${config.dev.root}.html` : parsed.pathname, 'utf8');
       }

generators/app/templates/gulpfile.babel.js

@@ -50,7 +50,7 @@ describe('generator-addin:button', function () {
   it('creates files for add-in button', function () {
     assert.file(commonFiles.concat([
       '.dev/button.html',
-      'app/myAddin.js'
+      'app/scripts/myAddin.js'
     ]));
   });
 });

test/app.js

@@ -73,7 +73,7 @@ describe('generator-addin:button config.json', function () {
     assert.equal(config.supportEmail, props.supportEmail);
   });
   it('has correct click', function () {
-    assert.equal(config.items[0].click, 'myAddin.js');
+    assert.equal(config.items[0].click, 'scripts/myAddin.js');
   });
   it('has correct button name', function () {
     assert.equal(config.items[0].buttonName.en, props.menuName);

test/config.js

@@ -37,7 +37,7 @@ describe('generator-addin:button myAddin.js', function () {
     helpers.run(path.join(__dirname, '../generators/app'))
       .withPrompts(props)
       .on('end', function () {
-        js = fs.readFileSync('app/myAddin.js', 'utf8');
+        js = fs.readFileSync('app/scripts/myAddin.js', 'utf8');
         done();
       });
   });