Aser

.travis/build.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-yarn build
+# yarn build

.travis/push.sh

@@ -2,10 +2,10 @@
 
 set -euo pipefail
 
-readonly GITHUB_ORG="${GITHUB_ORG:-CatalystCode}"
+readonly GITHUB_ORG="${GITHUB_ORG:-Azure}"
 readonly GITHUB_REPO="${GITHUB_REPO:-ibex-dashboard}"
 readonly TARGET_BRANCH="${TARGET_BRANCH:-master}"
-readonly SOURCE_BRANCH="${SOURCE_BRANCH:-ibex-version-1.0}"
+# readonly SOURCE_BRANCH="${SOURCE_BRANCH:-ibex-version-1.0}"
 
 readonly AUTOCOMMIT_NAME="Travis CI"
 readonly AUTOCOMMIT_EMAIL="[email protected]"
@@ -16,16 +16,40 @@ log() {
 }
 
 ensure_preconditions_met() {
+
+  log "TRAVIS_BRANCH: ${TRAVIS_BRANCH}"
+  log "TRAVIS_PULL_REQUEST: ${TRAVIS_PULL_REQUEST}"
+  log "TRAVIS_PULL_REQUEST_BRANCH: ${TRAVIS_PULL_REQUEST_BRANCH}"
+  log "TRAVIS_COMMIT: ${TRAVIS_COMMIT}"
+  log "TRAVIS_COMMIT_MESSAGE: ${TRAVIS_COMMIT_MESSAGE}"
+  log "TRAVIS_COMMIT_RANGE: ${TRAVIS_COMMIT_RANGE}"
+  log "TRAVIS_BUILD_NUMBER: ${TRAVIS_BUILD_NUMBER}"
+
+  # get last commit comment
+  ORIGINAL_COMMIT_ID="$(echo ${TRAVIS_COMMIT_RANGE} | cut -d '.' -f4)"
+  log "ORIGINAL_COMMIT_ID: ${ORIGINAL_COMMIT_ID}"
+  ORIGINAL_COMMIT_MESSAGE=$(git log --format=%B -n 1 $ORIGINAL_COMMIT_ID)
+  log "ORIGINAL_COMMIT_MESSAGE: ${ORIGINAL_COMMIT_MESSAGE}"
+
+  # If last commit was by travis build, ignore and don't push
+  if [ "${ORIGINAL_COMMIT_MESSAGE}" == "Travis build: "* ]; then
+    log "Last commit by Travis CI - Ignoring and existing"
+    exit 0
+  fi
+
   if [ -z "${TRAVIS_PULL_REQUEST_BRANCH}" ]; then
     log "Job is CI for a push, skipping creation of production build"
     exit 0
   fi
-  if [ "${TRAVIS_BRANCH}_${TRAVIS_PULL_REQUEST_BRANCH}" != "${TARGET_BRANCH}_${SOURCE_BRANCH}" ]; then
+
+  # Only if push is to master branch, include a build
+  if [ "${TRAVIS_BRANCH}" != "${TARGET_BRANCH}" ]; then
     log "Skipping creation of production build"
-    log "We only create production builds for pull requests from '${SOURCE_BRANCH}' to '${TARGET_BRANCH}'"
-    log "but this pull request is from '${TRAVIS_PULL_REQUEST BRANCH}' to '${TRAVIS_BRANCH}'"
+    log "We only create production builds for pull requests to '${TARGET_BRANCH}'"
+    log "but this pull request is to '${TRAVIS_BRANCH}'"
     exit 0
   fi
+
   if [ -z "${GITHUB_TOKEN}" ]; then
     log "GITHUB_TOKEN not set: won't be able to push production build"
     log "Please configure the token in .travis.yml or the Travis UI"
@@ -50,10 +74,11 @@ commit_build_files() {
 }
 
 push_to_github() {
-  git push origin-travis "${AUTOCOMMIT_BRANCH}:${SOURCE_BRANCH}"
+  git push origin-travis "${AUTOCOMMIT_BRANCH}:${TRAVIS_PULL_REQUEST_BRANCH}"
 }
 
 ensure_preconditions_met
+create_production_build
 setup_git
 commit_build_files
 push_to_github

Dockerfile

@@ -7,17 +7,14 @@ RUN mkdir -p /usr/src/app/server
 WORKDIR /usr/src/app
 
 # Install app dependencies
-COPY package.json /usr/src/app/
-COPY package-lock.json /usr/src/app/
 COPY yarn.lock /usr/src/app/
+COPY package.json /usr/src/app/
 
 COPY server/yarn.lock /usr/src/app/server
 COPY server/package.json /usr/src/app/server
-COPY server/package-lock.json /usr/src/app/server
 
 COPY client/yarn.lock /usr/src/app/client
 COPY client/package.json /usr/src/app/client
-COPY client/package-lock.json /usr/src/app/client
 
 RUN npm install yarn -g
 RUN yarn

README.md

@@ -1,8 +1,28 @@
-# Ibex Dashboard [![Build Status](https://travis-ci.org/CatalystCode/ibex-dashboard.png?branch=master)](https://travis-ci.org/CatalystCode/ibex-dashboard)
+# Ibex Dashboard [![Build Status](https://travis-ci.org/Azure/ibex-dashboard.png?branch=master)](https://travis-ci.org/Azure/ibex-dashboard)
 
-Ibex is a dashboarding application that enables building dashboard and templates.
+
+[Ibex](http://aka.ms/ibex) is a dashboarding application that enables building dashboard and templates.
 It mainly supports **Application Insights** but data sources and visual components are easily extendable.
 
+## Changes
+
+### Version 1.3 (January 22, 2018)
+
+Version 1.3 contains the following changes:
+
+* Moving application insights queries from client to server
+* Updated tests to answer some security risks presented by GitHub
+* Updated tests to accommodate the new approach
+* Added masking/unmasking of connection parameters (so that client side can only update API KEY but not see what it is)
+* Fixed small bugs with Firefox rendering
+
+### Version 1.2 (October 16, 2017)
+Version 1.2 breaks the persitency paths of dashboard files and custom templates. If you are upgrading to this version, copy your private dashboards from `/dashboards` into `/dashboards/persistent/` as follows: 
+
+> Private Files: Move files from `/dashboards/*.private.js` to `/dashboards/persistent/private`.
+
+> Custom Templates: Move files from `/dashboards/customTemplates/*.private.ts` to `/dashboards/persistent/customTemplates`.
+
 # Preview
 
 [![Preview](/docs/images/bot-fmk-dashboard.png)](/docs/images/bot-fmk-dashboard.png)
@@ -14,7 +34,7 @@ It mainly supports **Application Insights** but data sources and visual componen
 ```bash
 npm install yarn -g
 
-git clone https://github.com/CatalystCode/ibex-dashboard
+git clone https://github.com/Azure/ibex-dashboard
 cd ibex-dashboard
 yarn
 yarn start
@@ -57,13 +77,13 @@ There are 3 ways to deploy to Azure:
 1. Fork this repo (to be able to automatically create github deployment key)
 2. Copy the fork url and use it with the following deployment button:
 
-<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Ftorosent%2Fibex-dashboard%2Fmaster%2Fscripts%2Fdeployment%2Fwebapp%2Fazuredeploy.json" target="_blank">
+<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fibex-dashboard%2Fmaster%2Fscripts%2Fdeployment%2Fwebapp%2Fazuredeploy.json" target="_blank">
     <img src="http://azuredeploy.net/deploybutton.png"/>
 </a>
 
 ### 2. Web App On Linux - Automated with Docker Hub
 
-<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FCatalystCode%2Fibex-dashboard%2Fmaster%2Fscripts%2Fdeployment%2Fwebapponlinux%2Fazuredeploy.json" target="_blank">
+<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fibex-dashboard%2Fmaster%2Fscripts%2Fdeployment%2Fwebapponlinux%2Fazuredeploy.json" target="_blank">
     <img src="http://azuredeploy.net/deploybutton.png"/>
 </a>
 
@@ -77,7 +97,7 @@ There are 3 ways to deploy to Azure:
 
 1. `docker build -t **image name** .`
 2. `docker run -d -e PORT=80 **image name** `
-3. Docker image is also available at Docker Hub - `docker pull catalystcode/ibex-dashboard`
+3. Docker image is also available at Docker Hub - `docker pull morshemesh/ibex-dashboard`
 
 # Application Insights Integration
 
@@ -99,6 +119,10 @@ The following steps explain how to connect **Application Insights** bot with you
 6. Open the URL of your web app
 7. Under **AppId**/**ApiKey** set the values you created.
 
+### Adding Application Insights instrumentation to your bot
+- [Instrumentation for Node.js bots](https://github.com/Azure/botbuilder-instrumentation)
+- [Instrumentation for C# bots](https://github.com/Azure/botbuilder-instrumentation-cs)
+
 # Testing
 The test watcher is integrated into the create-react-app mechanism and runs tests related to files changes since the last commit.
 
@@ -159,4 +183,4 @@ Thinking about integrating with:
 * Running node version 6.11 or above. 
 
 # License
-MIT
+MIT

build/asset-manifest.json

@@ -1,6 +1,6 @@
 {
-  "main.css": "static/css/main.a28d60f2.css",
-  "main.css.map": "static/css/main.a28d60f2.css.map",
-  "main.js": "static/js/main.fcbb67b2.js",
-  "main.js.map": "static/js/main.fcbb67b2.js.map"
+  "main.css": "static/css/main.526645cd.css",
+  "main.css.map": "static/css/main.526645cd.css.map",
+  "main.js": "static/js/main.462c17f8.js",
+  "main.js.map": "static/js/main.462c17f8.js.map"
 }

build/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/favicon.ico"><link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500"/><title>React App</title><link href="/static/css/main.a28d60f2.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/static/js/main.fcbb67b2.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/favicon.ico"><link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500"/><title>React App</title><link href="/static/css/main.526645cd.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/static/js/main.462c17f8.js"></script></body></html>

client/@types/types.d.ts

@@ -203,7 +203,7 @@ interface IElement {
   /**
    * The name of the element type to be used
    * For a complete list follow:
-   * https://github.com/CatalystCode/ibex-dashboard/tree/master/docs#elements-plugins
+   * https://github.com/Azure/ibex-dashboard/tree/master/docs#elements-plugins
    */
   type: string;
   /**