[Develop and manual test] /api/v1/commandList

 On branch master
 Changes to be committed:
	modified:   front-end/app/scripts/controllers/SelectCommand.ts
	modified:   front-end/app/scripts/services/APIEndPoint.ts
	modified:   front-end/app/templates/select-command.html
	modified:   front-end/dist/bundle.js
	modified:   front-end/dist/templates/select-command.html
	new file:   server/api/v1/commandList/index.js
	modified:   server/routes.js

diff --git a/front-end/app/scripts/controllers/SelectCommand.ts b/front-end/app/scripts/controllers/SelectCommand.ts
index 9f770e8..b6cfee7 100644 (file)
--- a/front-end/app/scripts/controllers/SelectCommand.ts
+++ b/front-end/app/scripts/controllers/SelectCommand.ts
@@ -3,6 +3,7 @@ namespace app.controllers {
 
         public static $inject = ['$scope', 'APIEndPoint'];
         private tags: string[];
+        private commands: string[];
 
         constructor($scope: ng.IScope, private APIEndPoint: services.APIEndPoint) {
             var controller = this;
@@ -12,6 +13,12 @@ namespace app.controllers {
                    controller.tags = result.info; 
                 });
 
+            this.APIEndPoint
+                .getCommands()
+                .$promise.then((result) => {
+                   controller.commands = result.info; 
+                });
+
         } 
     }
 }

diff --git a/front-end/app/scripts/services/APIEndPoint.ts b/front-end/app/scripts/services/APIEndPoint.ts
index 76b1732..4f680cf 100644 (file)
--- a/front-end/app/scripts/services/APIEndPoint.ts
+++ b/front-end/app/scripts/services/APIEndPoint.ts
@@ -52,6 +52,12 @@ namespace app.services {
             return this.resource(endPoint, {}).get();
         }
 
+        public getCommands(): ng.resource.IResource<declares.IResponse> {
+            var endPoint = '/api/v1/commandList';
+            return this.resource(endPoint, {}).get();
+        }
+
+
         public execute(data: any): ng.IHttpPromise<{}> {
             var endPoint = '/api/v1/execution';
             var fd = new FormData()

diff --git a/front-end/app/templates/select-command.html b/front-end/app/templates/select-command.html
index 0278295..6271362 100644 (file)
--- a/front-end/app/templates/select-command.html
+++ b/front-end/app/templates/select-command.html
@@ -5,7 +5,7 @@
 <div class="modal-body">
     <div class="row">
         <div class="col-md-8">
-            <p ng-repeat="tag in c.tags">{{tag}}</p>
+            <p ng-repeat="command in c.commands">{{command}}</p>
             <!--
             <div class="btn-group"ng-repeat="tag in tags">
                 <button type="button" class="btn btn-default btn-xs" ng-click="changeTag(tag)"><span class="glyphicon glyphicon-tag"></span>{{tag}}</button>

diff --git a/front-end/dist/bundle.js b/front-end/dist/bundle.js
index 3a80e17..f46514e 100644 (file)
--- a/front-end/dist/bundle.js
+++ b/front-end/dist/bundle.js
@@ -41051,6 +41051,10 @@
                        var endPoint = '/api/v1/tagList';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getCommands = function () {
+                       var endPoint = '/api/v1/commandList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -41429,6 +41433,11 @@
                            .$promise.then(function (result) {
                            controller.tags = result.info;
                        });
+                       this.APIEndPoint
+                           .getCommands()
+                           .$promise.then(function (result) {
+                           controller.commands = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -41539,6 +41548,10 @@
                        var endPoint = '/api/v1/tagList';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getCommands = function () {
+                       var endPoint = '/api/v1/commandList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -41917,6 +41930,11 @@
                            .$promise.then(function (result) {
                            controller.tags = result.info;
                        });
+                       this.APIEndPoint
+                           .getCommands()
+                           .$promise.then(function (result) {
+                           controller.commands = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -42027,6 +42045,10 @@
                        var endPoint = '/api/v1/tagList';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getCommands = function () {
+                       var endPoint = '/api/v1/commandList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -42405,6 +42427,11 @@
                            .$promise.then(function (result) {
                            controller.tags = result.info;
                        });
+                       this.APIEndPoint
+                           .getCommands()
+                           .$promise.then(function (result) {
+                           controller.commands = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -42515,6 +42542,10 @@
                        var endPoint = '/api/v1/tagList';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getCommands = function () {
+                       var endPoint = '/api/v1/commandList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -42893,6 +42924,11 @@
                            .$promise.then(function (result) {
                            controller.tags = result.info;
                        });
+                       this.APIEndPoint
+                           .getCommands()
+                           .$promise.then(function (result) {
+                           controller.commands = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -43003,6 +43039,10 @@
                        var endPoint = '/api/v1/tagList';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getCommands = function () {
+                       var endPoint = '/api/v1/commandList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -43381,6 +43421,11 @@
                            .$promise.then(function (result) {
                            controller.tags = result.info;
                        });
+                       this.APIEndPoint
+                           .getCommands()
+                           .$promise.then(function (result) {
+                           controller.commands = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -43491,6 +43536,10 @@
                        var endPoint = '/api/v1/tagList';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getCommands = function () {
+                       var endPoint = '/api/v1/commandList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -43869,6 +43918,11 @@
                            .$promise.then(function (result) {
                            controller.tags = result.info;
                        });
+                       this.APIEndPoint
+                           .getCommands()
+                           .$promise.then(function (result) {
+                           controller.commands = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -43979,6 +44033,10 @@
                        var endPoint = '/api/v1/tagList';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getCommands = function () {
+                       var endPoint = '/api/v1/commandList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -44357,6 +44415,11 @@
                            .$promise.then(function (result) {
                            controller.tags = result.info;
                        });
+                       this.APIEndPoint
+                           .getCommands()
+                           .$promise.then(function (result) {
+                           controller.commands = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -44467,6 +44530,10 @@
                        var endPoint = '/api/v1/tagList';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getCommands = function () {
+                       var endPoint = '/api/v1/commandList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -44845,6 +44912,11 @@
                            .$promise.then(function (result) {
                            controller.tags = result.info;
                        });
+                       this.APIEndPoint
+                           .getCommands()
+                           .$promise.then(function (result) {
+                           controller.commands = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -44955,6 +45027,10 @@
                        var endPoint = '/api/v1/tagList';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getCommands = function () {
+                       var endPoint = '/api/v1/commandList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -45333,6 +45409,11 @@
                            .$promise.then(function (result) {
                            controller.tags = result.info;
                        });
+                       this.APIEndPoint
+                           .getCommands()
+                           .$promise.then(function (result) {
+                           controller.commands = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -45443,6 +45524,10 @@
                        var endPoint = '/api/v1/tagList';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getCommands = function () {
+                       var endPoint = '/api/v1/commandList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -45821,6 +45906,11 @@
                            .$promise.then(function (result) {
                            controller.tags = result.info;
                        });
+                       this.APIEndPoint
+                           .getCommands()
+                           .$promise.then(function (result) {
+                           controller.commands = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -45931,6 +46021,10 @@
                        var endPoint = '/api/v1/tagList';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getCommands = function () {
+                       var endPoint = '/api/v1/commandList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -46309,6 +46403,11 @@
                            .$promise.then(function (result) {
                            controller.tags = result.info;
                        });
+                       this.APIEndPoint
+                           .getCommands()
+                           .$promise.then(function (result) {
+                           controller.commands = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -46419,6 +46518,10 @@
                        var endPoint = '/api/v1/tagList';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getCommands = function () {
+                       var endPoint = '/api/v1/commandList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -46797,6 +46900,11 @@
                            .$promise.then(function (result) {
                            controller.tags = result.info;
                        });
+                       this.APIEndPoint
+                           .getCommands()
+                           .$promise.then(function (result) {
+                           controller.commands = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;

diff --git a/front-end/dist/templates/select-command.html b/front-end/dist/templates/select-command.html
index 0278295..6271362 100644 (file)
--- a/front-end/dist/templates/select-command.html
+++ b/front-end/dist/templates/select-command.html
@@ -5,7 +5,7 @@
 <div class="modal-body">
     <div class="row">
         <div class="col-md-8">
-            <p ng-repeat="tag in c.tags">{{tag}}</p>
+            <p ng-repeat="command in c.commands">{{command}}</p>
             <!--
             <div class="btn-group"ng-repeat="tag in tags">
                 <button type="button" class="btn btn-default btn-xs" ng-click="changeTag(tag)"><span class="glyphicon glyphicon-tag"></span>{{tag}}</button>

diff --git a/server/api/v1/commandList/index.js b/server/api/v1/commandList/index.js
new file mode 100644 (file)
index 0000000..1eb846d
--- /dev/null
+++ b/server/api/v1/commandList/index.js
@@ -0,0 +1,15 @@
+'use strict';
+
+var express = require('express');
+var router  = express.Router();
+
+router.get('/', function(req, res) {
+   var commandList = require(__dirname + '/../../../../user-specific-files/OptionControlFile/command_list');
+    var info = {
+       status: 'success',
+       info: commandList 
+   };
+   res.send(info);
+});
+
+module.exports = router;

diff --git a/server/routes.js b/server/routes.js
index f71234b..443bb9a 100644 (file)
--- a/server/routes.js
+++ b/server/routes.js
@@ -23,6 +23,7 @@ module.exports = function(app) {
     app.use('/api/v1/all/workspace/directory', require(__dirname + '/api/v1/all/workspace/directory'));
     app.use('/api/v1/optionControlFile', require(__dirname + '/api/v1/optionControlFile'));
     app.use('/api/v1/tagList', require(__dirname + '/api/v1/tagList'));
+    app.use('/api/v1/commandList', require(__dirname + '/api/v1/commandList'));
 
     app.route('/*')
     .get(function(req, res) {