Merge pull request #709 from mattermost/PLT-11

PLT-11 adding config for logs to UI

3 files changed, 79 insertions, 1 deletions

diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index 3e23e5c33..ed228f6c4 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -345,6 +345,32 @@ export function getLogs() {
     );
 }
 
+export function getConfig() {
+    if (isCallInProgress('getConfig')) {
+        return;
+    }
+
+    callTracker.getConfig = utils.getTimestamp();
+    client.getConfig(
+        (data, textStatus, xhr) => {
+            callTracker.getConfig = 0;
+
+            if (xhr.status === 304 || !data) {
+                return;
+            }
+
+            AppDispatcher.handleServerAction({
+                type: ActionTypes.RECIEVED_CONFIG,
+                config: data
+            });
+        },
+        (err) => {
+            callTracker.getConfig = 0;
+            dispatchError(err, 'getConfig');
+        }
+    );
+}
+
 export function findTeams(email) {
     if (isCallInProgress('findTeams_' + email)) {
         return;
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index ba3042d78..c9eb09c00 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -297,7 +297,7 @@ export function getLogs(success, error) {
         dataType: 'json',
         contentType: 'application/json',
         type: 'GET',
-        success: success,
+        success,
         error: function onError(xhr, status, err) {
             var e = handleError('getLogs', xhr, status, err);
             error(e);
@@ -305,6 +305,35 @@ export function getLogs(success, error) {
     });
 }
 
+export function getConfig(success, error) {
+    $.ajax({
+        url: '/api/v1/admin/config',
+        dataType: 'json',
+        contentType: 'application/json',
+        type: 'GET',
+        success,
+        error: function onError(xhr, status, err) {
+            var e = handleError('getConfig', xhr, status, err);
+            error(e);
+        }
+    });
+}
+
+export function saveConfig(config, success, error) {
+    $.ajax({
+        url: '/api/v1/admin/save_config',
+        dataType: 'json',
+        contentType: 'application/json',
+        type: 'POST',
+        data: JSON.stringify(config),
+        success,
+        error: function onError(xhr, status, err) {
+            var e = handleError('saveConfig', xhr, status, err);
+            error(e);
+        }
+    });
+}
+
 export function getMeSynchronous(success, error) {
     var currentUser = null;
     $.ajax({
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 032cf4ff4..074591489 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -54,6 +54,29 @@ export function isTestDomain() {
     return false;
 }
 
+export function isInRole(roles, inRole) {
+    var parts = roles.split(' ');
+    for (var i = 0; i < parts.length; i++) {
+        if (parts[i] === inRole) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+export function isAdmin(roles) {
+    if (isInRole(roles, 'admin')) {
+        return true;
+    }
+
+    if (isInRole(roles, 'system_admin')) {
+        return true;
+    }
+
+    return false;
+}
+
 export function getDomainWithOutSub() {
     var parts = window.location.host.split('.');