Added issue comment and close issue feature

2018-07-23 16:14:53 +05:30
parent fc281dd6c6
commit 88eac3d247
16 changed files with 343 additions and 119 deletions
--- a/src/js/bot/recast-ops.js
+++ b/src/js/bot/recast-ops.js
@@ -32,6 +32,7 @@ module.exports = class Recast {
                if(intent !== undefined) {
                    domManipulator.displayIntentBox(intent);
                    domManipulator.showWidget(intent);
+                    domManipulator.addGitOperationHistory(command, 'command');
                    domManipulator.populateRecastData(intent, bodyRelevant);
                  //  self.processIntent(intent);
                }
--- a/src/js/config.js
+++ b/src/js/config.js
@@ -25,8 +25,32 @@ module.exports = {
            "cardDataUrl": "html_url",
            "cardDataName": "title"
        },
+        'closeissue' : {
+            "requestMethod": 'post',
+            "intentMessage": "Close an issue in Github",
+            "getDataOperation": "getCloseIssueJson",
+            "githubOperation": "closeIssue",
+            "showWidgetOperation": "showCloseIssueWidget",
+            "populateDataOperation": "populateCloseIssueData",
+            "successMessage": "Issue Closed!",
+            "cardMsg": "Issue Closed as requested!",
+            "cardDataUrl": "html_url",
+            "cardDataName": "title"
+        },
+        'addissuecomment' : {
+            "requestMethod": 'post',
+            "intentMessage": "Add a comment on an issue in Github",
+            "getDataOperation": "getAddCommentJson",
+            "githubOperation": "addIssueComment",
+            "showWidgetOperation": "showAddCommentWidget",
+            "populateDataOperation": "populateAddCommentData",
+            "successMessage": "Comment Added!",
+            "cardMsg": "Comment Added as Requested, view here: ",
+            "cardDataUrl": "html_url",
+            "cardDataName": "title"
+        },
        'addcollab' : {
-            "Method": 'post',
+            "requestMethod": 'post',
            "intentMessage": "Add a collaborator",
            "getDataOperation": "getAddCollaboratorJson",
            "githubOperation": "addCollaborator",
--- a/src/js/dom-ops.js
+++ b/src/js/dom-ops.js
@@ -239,6 +239,27 @@ module.exports = class DomManipulator {
        }
    }

+    populateAddCommentData(recastResponse) {
+        var repoForIssueCommentTextField = document.getElementById('repoForIssueComment');
+        var issueNumberTextField = document.getElementById('issueNumber');
+        var issueCommentTextArea = document.getElementById('issueComment');
+        if(repoForIssueCommentTextField && recastResponse && recastResponse.entities['git-repository'] && recastResponse.entities['git-repository'].length > 0 
+                && recastResponse.entities['git-repository']['0']['value']) {
+            var repoForIssueComment = recastResponse.entities['git-repository']['0']['value'];
+            repoForIssueCommentTextField.value = repoForIssueComment;
+        }
+        if(issueNumberTextField && recastResponse && recastResponse.entities['issue_id'] && recastResponse.entities['issue_id'].length > 0 
+                && recastResponse.entities['issue_id']['0']['value']) {
+            var issueNumber = recastResponse.entities['issue_id']['0']['value'];
+            issueNumberTextField.value = issueNumber;
+        }
+        if(issueCommentTextArea && recastResponse && recastResponse.entities['issue_comment'] && recastResponse.entities['issue_comment'].length > 0 
+                && recastResponse.entities['issue_comment']['0']['value']) {
+            var issueComment = recastResponse.entities['issue_comment']['0']['value'];
+            issueCommentTextArea.value = issueComment ;
+        }
+    }
+
    isVisible(element) {
        return element ? !element.classList.contains('hide') : false;
    }
@@ -286,6 +307,16 @@ module.exports = class DomManipulator {
        return data;
    }

+    getCloseIssueJson() {
+        var data = {};
+        data.urlParams = {};
+        if(this.isVisible(document.getElementById("closeissue"))) {
+            data.urlParams.issueId = document.getElementById("issueNumerToClose").value;
+            data.urlParams.repoName = document.getElementById("repoForIssueClose").value;
+        }
+        return data;
+    }
+
    getAddCollaboratorJson() {
        var data = {};
        data.urlParams = {};
@@ -296,6 +327,19 @@ module.exports = class DomManipulator {
        return data;
    }

+    getAddCommentJson() {
+        var data = {};
+        data.urlParams = {};
+        var request = {};
+        if(this.isVisible(document.getElementById("addissuecomment"))) {
+            request.body = document.getElementById('issueComment').value;
+            data.urlParams.issueId = document.getElementById("issueNumber").value;
+            data.urlParams.repoName = document.getElementById("repoForIssueComment").value;
+        }
+        data.request = request;
+        return data;
+    }
+
    addGitOperationHistory(data, type) {
        var intent = $('#' + $config.costants.hiddenIntentFieldId).val();
        var requestMethod = $config.intentSlugToOperations[intent].requestMethod;
@@ -305,6 +349,8 @@ module.exports = class DomManipulator {
        var card = document.createElement('div');
        var cardBody = document.createElement('div');
        var cardTitle = document.createElement('h5');
+        var closeAnchor = document.createElement('a');
+        var closeHeader = document.createElement('h6');
        var cardText = document.createElement('p');
        var cardFooter = document.createElement('div');
        var textMuted = document.createElement('small');
@@ -315,11 +361,16 @@ module.exports = class DomManipulator {
        card.classList.add('card', type);
        cardBody.classList.add('card-body');
        cardTitle.classList.add('card-title');
+        closeAnchor.classList.add('close');
+        // closeAnchor.setAttribute('href', '#');
        cardText.classList.add('card-text');
        cardFooter.classList.add('card-footer');
        textMuted.classList.add('text-muted');
        underCardLine.classList.add('line');

+        // Add content
+        closeHeader.innerHTML = 'x';
+
        var x = this.display_ct(0, textMuted);
        if(type === 'command') {
            // Add content
@@ -349,6 +400,8 @@ module.exports = class DomManipulator {
        }

        // Associations
+        closeAnchor.appendChild(closeHeader);
+        cardTitle.appendChild(closeAnchor);
        cardBody.appendChild(cardTitle);
        cardBody.appendChild(cardText);
        cardFooter.appendChild(textMuted);
@@ -437,7 +490,7 @@ module.exports = class DomManipulator {
            td_2.innerHTML = "<a href='" + currentRepo.html_url + "' class='repoLink'>" + currentRepo.id + "</a>";
            td_3.innerHTML = currentRepo.created_at;
            td_4.innerHTML = "<a href='" + currentRepo.owner.html_url + "' class='btn btn-info'>" + currentRepo.owner.login + "</a>";
-            td_5.innerHTML = "<a href='" + currentRepo.owner.url + "' class='btn btn-info'>View</a>";
+            td_5.innerHTML = "<a href='" + currentRepo.url + "' class='btn btn-info'>View</a>";
            td_6.innerHTML = "<a href='" + currentRepo.owner.html_url + "' class='btn btn-danger'>Delete</a>";

            // Associations
@@ -455,6 +508,10 @@ module.exports = class DomManipulator {
        return table;
    } 

+    concealCodeInUrl() {
+        window.location = "http://localhost:8080";
+    }
+
    toggleModals(response) {
        var self = this;
        var promise = response.json();
@@ -477,6 +534,7 @@ module.exports = class DomManipulator {
            $('#dangerAlert').removeClass('hide');
            self.addGitOperationHistory(response.status);
        }
+        $('#' + $config.costants.hiddenIntentFieldId).val('');
    }

    display_ct (start, element) {
--- a/src/js/event-toggles.js
+++ b/src/js/event-toggles.js
@@ -8,6 +8,8 @@ const $config = require('./config.js');


 module.exports = $(document).ready(function () {
+    // console.log('test');
+    app.setToken();
    $('#sidebarCollapse').on('click', function () {
        $('#sidebar').toggleClass('active');
        $('.hideable').toggleClass('hide');
@@ -32,7 +34,6 @@ module.exports = $(document).ready(function () {
            if (command) {
                var text = { "text": command };
                recastclient.getAndCallProcessIntent(command, text);
-                dom.addGitOperationHistory(command, 'command');
            } else {
                dom.showEmptyCommandMessage();
            }
@@ -55,30 +56,26 @@ module.exports = $(document).ready(function () {
    $("#hideSuccessAlert").on('click', function () {
        $('#successAlert').addClass('hide');
    });
-    $('.close').click(function () {
+    $('#conversations').on('click', '.close', function () {
        var $target = $(this).closest('.card');
+        var line = $target.next();
        $target.hide('slow', function () { $target.remove(); });
+        line.hide('slow', function () { line.remove(); });
    });
    $("#hideDangerAlert").on('click', function () {
        $('#dangerAlert').addClass('hide');
    });
-
-    var urlParam = getUrlParameter('code');
-    app.getToken(urlParam);
-
-});
-
-var getUrlParameter = function getUrlParameter(sParam) {
-    var sPageURL = decodeURIComponent(window.location.search.substring(1)),
-        sURLVariables = sPageURL.split('&'),
-        sParameterName,
-        i;
-
-    for (i = 0; i < sURLVariables.length; i++) {
-        sParameterName = sURLVariables[i].split('=');
-
-        if (sParameterName[0] === sParam) {
-            return sParameterName[1] === undefined ? true : sParameterName[1];
-        }
+    $('#git_bridge').on('click', function() {
+        window.location.href = 'https://github.com/login/oauth/authorize?scope=user:email:repo&client_id=f6f649a1fe2dfea082ba';
+        // var user = app.getCurrentUser();
+        // if(user) {
+        //     window.location.href = './../continue.html'
+        // } else {
+        //     window.location.href = 'https://github.com/login/oauth/authorize?scope=user:email:repo&client_id=f6f649a1fe2dfea082ba';
+        // }
+    })
+    if(window.location.href.match(/\?code=(.*)/) ) {
+        var code = window.location.href.match(/\?code=(.*)/)[1];
+        app.getToken(code);
    }
-};
+});
--- a/src/js/github-ops.js
+++ b/src/js/github-ops.js
@@ -3,6 +3,9 @@ const GithubHelper = require('./helper.js');
 const githubHelper = new GithubHelper();
 const DomManipulator = require('./dom-ops.js');
 const dom = new DomManipulator();
+const PersistentOps = require('./persistent-ops.js');
+const persistentOps = new PersistentOps();
+

 module.exports = class Github {

@@ -10,33 +13,41 @@ module.exports = class Github {
        this.authorizationToken =  "token " + config.gitToken;
    }

-    getToken(getTokenRequest) {
+    getToken(code) {
        var token = '';
-        let url = 'https://cors-anywhere.herokuapp.com/https://github.com/login/oauth/access_token';
-        fetch(url, {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json; charset=utf-8",
-                    "Application": "application/json; charset=utf-8"
-                },
-                body: JSON.stringify(getTokenRequest)
-            }
-        )
-        .then(function(response) {
-            console.log("token get success");
-            response.json().then(function(body){
-                console.log(response);
-                token = body.access_token; 
-                console.log(body);
-                console.log(token); 
-                return token;
-            });
-            // dom.toggleModals(response);
-        })
-        .catch(error => console.error('Fetch Error =\n', error));
+        self = this;
+        $.getJSON('http://localhost:9999/authenticate/' + code, function(data) {
+            console.log(data.token);
+            token = data.token;
+            // set cookie here
+            persistentOps.setCookie('gitToken', token, 30);
+            // self.authorizationToken = "token " + persistentOps.getCookie('gitToken');
+            dom.concealCodeInUrl();
+        });
        return token;
    }

+    getCurrentUser() {
+        var repositories = '';
+        let url = 'https://api.github.com/user/';
+        fetch(url, {
+                method: "GET",
+                headers: {
+                    "Content-Type": "application/json; charset=utf-8"
+                }
+            }
+        )
+        .then(function(response) {
+            response.json().then(function(body){
+                repositories = body; 
+                console.log(repositories); 
+                return repositories;
+            });
+            dom.toggleModals(response);
+        })
+        .catch(error => console.error('Fetch Error =\n', error));
+        return repositories;
+    }
    authenticate() {

    }
@@ -148,8 +159,6 @@ module.exports = class Github {
    }

    closeIssue(closeIssueJson, repoName, issueNumber) {
-        repoName = 'stack_route_prj7';
-        issueNumber = 2;
        let url = 'https://api.github.com/repos/mohiit1502/' + repoName + '/issues/' + issueNumber;
        fetch(url, {
                method: "PATCH",
@@ -160,7 +169,9 @@ module.exports = class Github {
                body: JSON.stringify(closeIssueJson)
            }
        )
-        .then(response => response.json())
+        .then(function(response) {
+            dom.toggleModals(response);
+        })
        .catch(error => console.error('Fetch Error =\n', error)); 
    }

@@ -205,10 +216,8 @@ module.exports = class Github {
        return issues;
    }

-    addIssueComment(commentBodyJson, repoName, issueNumber) {
-        repoName = "stack_route_prj7";
-        issueNumber = 2;
-        let url = 'https://api.github.com/repos/mohiit1502/' + repoName + '/issues/' + issueNumber + "/comments";
+    addIssueComment(commentBodyJson, repoName, issueId) {
+        let url = 'https://api.github.com/repos/mohiit1502/' + repoName + '/issues/' + issueId + "/comments";
        fetch(url, {
                method: "POST",
                headers: {
@@ -218,7 +227,9 @@ module.exports = class Github {
                body: JSON.stringify(commentBodyJson)
            }
        )
-        .then(response => response.json())
+        .then(function(response) {
+            dom.toggleModals(response);
+        })
        .catch(error => console.error('Fetch Error =\n', error)); 
    }

--- a/src/js/microbot-ops.js
+++ b/src/js/microbot-ops.js
@@ -1,5 +1,7 @@
 const Github = require('./github-ops.js');
 const $github = new Github()
+const PersistentOps = require('./persistent-ops.js');
+const persistentOps = new PersistentOps();

 module.exports = class Microbot {

@@ -10,11 +12,15 @@ module.exports = class Microbot {
    }

    getToken(code) {
-        $github.getToken({
-            'client_id': 'f6f649a1fe2dfea082ba',
-            'client_secret': '7e9a33d05ffdb36b4a498140bb9bb06d62de4f0e',
-            'code': code 
-        });
+        $github.getToken(code);
+    }
+
+    setToken() {
+        $github.authorizationToken = "token " + persistentOps.getCookie('gitToken');
+    }
+
+    getCurrentUser() {
+        $github.getCurrentUser();
    }

    viewRepositories() {
@@ -72,11 +78,12 @@ module.exports = class Microbot {
        });
    }

-    closeIssue() {
+    closeIssue(requestData) {
+        var repoName = requestData.urlParams.repoName;
+        var issueId = requestData.urlParams.issueId;
        $github.closeIssue({
-            "milestone": 1,
            "state": "close",
-        });
+        }, repoName, issueId);
    }

    displayIssue() {
@@ -90,10 +97,11 @@ module.exports = class Microbot {
        })
    }

-    addIssueComment() {
-        $github.addIssueComment({
-            "body": "This is another test issue comment"
-        });
+    addIssueComment(requestData) {
+        var requestJson = requestData.request;
+        var repoName = requestData.urlParams.repoName;
+        var issueId = requestData.urlParams.issueId;
+        $github.addIssueComment(requestJson, repoName, issueId);
    }

    displayLastComment() {
--- a/src/js/persistent-ops.js
+++ b/src/js/persistent-ops.js
@@ -0,0 +1,29 @@
+module.exports = class PersistentOps {
+    getLatestComment(comments) {
+        if(comments && comments.length > 0)
+            return comments[comments.length - 1]['body'];
+    }
+
+    setCookie(cname, cvalue, exdays) {
+        var d = new Date();
+        d.setTime(d.getTime() + (exdays*24*60*60*1000));
+        var expires = "expires="+ d.toUTCString();
+        document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
+    }
+
+    getCookie(cname) {
+        var name = cname + "=";
+        var decodedCookie = decodeURIComponent(document.cookie);
+        var ca = decodedCookie.split(';');
+        for(var i = 0; i <ca.length; i++) {
+            var c = ca[i];
+            while (c.charAt(0) == ' ') {
+                c = c.substring(1);
+            }
+            if (c.indexOf(name) == 0) {
+                return c.substring(name.length, c.length);
+            }
+        }
+        return "";
+    }
+}
--- a/src/styles/scss/base.scss
+++ b/src/styles/scss/base.scss
@@ -313,6 +313,54 @@ ADDITIONS
    text-decoration: underline;
 }

+.headerprompt {
+  display: flex;
+  width: 100%;
+}
+
+.logotext {
+  color: $theme-supplementer;
+}
+
+#content nav div.collapse li a.nav-link i.far {
+  color: $theme-supplementer;
+  font-size: 1.8em;
+  padding: 0.2em;
+}
+
+#loading-img {
+    background: url(http://preloaders.net/preloaders/360/Velocity.gif) center center no-repeat;
+    height: 100%;
+    z-index: 20;
+}
+
+.overlay {
+    background: #e9e9e9;
+    display: none;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    opacity: 0.5;
+}
+
+.loader {
+    border: 0px solid #f3f3f3;
+    border-radius: 50%;
+    border-top: 2px solid #3498db;
+    border-right: 2px solid #3498db;
+    width: 20px;
+    height: 20px;
+    -webkit-animation: spin 2s linear infinite; /* Safari */
+    animation: spin 2s linear infinite;
+  }
+  
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+}
+
@keyframes anim {
    0% {
      display: none;
@@ -336,37 +384,6 @@ ADDITIONS
  100%{   color: #000;    }
 }

-.headerprompt {
-  display: flex;
-  width: 100%;
-}
-
-.logotext {
-  color: $theme-supplementer;
-}
-
-#content nav div.collapse li a.nav-link i.far {
-  color: $theme-supplementer;
-  font-size: 1.8em;
-  padding: 0.2em;
-}
-
-.loader {
-    border: 0px solid #f3f3f3;
-    border-radius: 50%;
-    border-top: 2px solid #3498db;
-    border-right: 2px solid #3498db;
-    width: 20px;
-    height: 20px;
-    -webkit-animation: spin 2s linear infinite; /* Safari */
-    animation: spin 2s linear infinite;
-  }
-  
-  @keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-  }
-
 /* --------------------------------------------------
  OVERRIDES
  --------------------------------------------------*/