Merge branch 'dev' into chrome-extension

appbaseio · Jan 9, 2017 · 2c459e0 · 2c459e0
2 parents bc6c6a7 + cd500ee
commit 2c459e0
Show file tree

Hide file tree

Showing 6 changed files with 332 additions and 258 deletions.
diff --git a/app/app.component.html b/app/app.component.html
@@ -3,9 +3,9 @@
 		<div class="loadingBar"></div>
 	</div>
 </section>
-<div class="app-container" [ngClass]="{'without-hf': !allowHF}">
+<div class="app-container" [ngClass]="{'without-hf': !allowHF, 'without-h': !allowH, 'without-f': !allowF}">
 	<!-- HEADER START -->
-	<header class="header text-center" *ngIf="allowHF">
+	<header class="header text-center" *ngIf="allowH">
 		<span class="img-container">
 			<img src="assets/images/Mirage_Flat_9.png" alt="Mirage" class="img-responsive" />
 		</span>
@@ -17,7 +17,7 @@
 	<!-- HEADER END -->
 	<div class="applogin-component">
 		<!-- APPLOGIN START -->
-		<form class="col-xs-12 init-ES" id="init-ES"  *ngIf="allowHF" (ngSubmit)="connectHandle()" #initEs="ngForm">
+		<form class="col-xs-12 init-ES" id="init-ES"  *ngIf="allowH" (ngSubmit)="connectHandle()" #initEs="ngForm">
 			<div class="esContainer">
 				<span class="action-btns">
 					<share-url [urlShare]="urlShare"></share-url>
@@ -84,7 +84,7 @@
 		<doc-sidebar [docLink]="docLink" (setDocSample)="setDocSample($event);"></doc-sidebar>
 		<!-- Doc Sidebar end -->
 		<!-- Footer START -->
-		<footer class="text-center" *ngIf="allowHF">
+		<footer class="text-center" *ngIf="allowF">
 			<span class="footer-center">
 				<a id="mirage-learn-link" (click)="openLearn();">New to mirage?</a>
 			</span>

diff --git a/app/app.component.ts b/app/app.component.ts
@@ -62,8 +62,10 @@ export class AppComponent implements OnInit, OnChanges {
 	submitted = false;
 	public queryParams: any;
 	public allowHF: boolean;
+	public allowH: boolean;
+	public allowF: boolean;
 	public setLayoutFlag = false;
-  	public deleteItemInfo: any = {
+	public deleteItemInfo: any = {
 		title: 'Confirm Deletion',
 		message: 'Do you want to delete this query?',
 		yesText: 'Delete',
@@ -75,16 +77,18 @@ export class AppComponent implements OnInit, OnChanges {
 	};
 	public appSelected: boolean = false;
 
-  	onSubmit() { this.submitted = true; }
+	onSubmit() { this.submitted = true; }
 
-  	setDocSample(link) { 
-  		this.docLink = link; 
-  	}
+	setDocSample(link) { 
+		this.docLink = link; 
+	}
 
 	ngOnInit() {
 		$('body').removeClass('is-loadingApp');
 		this.queryParams = this.urlShare.getQueryParameters();
-        this.allowHF = !(this.queryParams && this.queryParams.hasOwnProperty('hf')) ? true : false;
+		this.allowHF = !(this.queryParams && this.queryParams.hasOwnProperty('hf')) ? true : false;
+		this.allowF = !this.allowHF ? false : (!(this.queryParams && this.queryParams.hasOwnProperty('f')) ? true : false);
+		this.allowH = !this.allowHF ? false : (!(this.queryParams && this.queryParams.hasOwnProperty('h')) ? true : false);
 		// get data from url
 		this.detectConfig(configCb.bind(this));
 		function configCb(config) {
@@ -142,40 +146,40 @@ export class AppComponent implements OnInit, OnChanges {
 	// get indices
 	getIndices() {
 		var es_host = document.URL.split('/_plugin/')[0];
-        var getIndices = this.appbaseService.getIndices(es_host);
-        getIndices.then(function(res) {
+		var getIndices = this.appbaseService.getIndices(es_host);
+		getIndices.then(function(res) {
 			try {
 				let data = res.json();
 				let historicApps = this.getAppsList();
 				var indices = [];
-                for(let indice in data.indices) {
-                    if(historicApps && historicApps.length) {
-                        historicApps.forEach(function(old_app, index) {
-                            if(old_app.appname === indice) {
-                                historicApps.splice(index, 1);
-                            }
-                        })
-                    }
-                    var obj = {
-                        appname: indice,
-                        url: es_host
-                    };
-                    indices.push(indice);
-                    historicApps.push(obj);
-                }
-                // default app is no app found
-                if(!historicApps.length) {
-                    var obj = {
-                        appname: 'sampleapp',
-                        url: es_host
-                    };
-                    historicApps.push(obj);
-                }
-                if(!this.config.url) {
-                	this.config.url = historicApps[0].url;
-                }
-            	this.storageService.set('mirage-appsList', JSON.stringify(historicApps));
-            	this.getAppsList();
+				for(let indice in data.indices) {
+					if(historicApps && historicApps.length) {
+						historicApps.forEach(function(old_app, index) {
+							if(old_app.appname === indice) {
+								historicApps.splice(index, 1);
+							}
+						})
+					}
+					var obj = {
+						appname: indice,
+						url: es_host
+					};
+					indices.push(indice);
+					historicApps.push(obj);
+				}
+				// default app is no app found
+				if(!historicApps.length) {
+					var obj = {
+						appname: 'sampleapp',
+						url: es_host
+					};
+					historicApps.push(obj);
+				}
+				if(!this.config.url) {
+					this.config.url = historicApps[0].url;
+				}
+				this.storageService.set('mirage-appsList', JSON.stringify(historicApps));
+				this.getAppsList();
 			} catch(e) {
 				console.log(e);
 			}
@@ -327,9 +331,8 @@ export class AppComponent implements OnInit, OnChanges {
 	// get mappings
 	getMappings(clearFlag) {
 		var self = this;
-		this.appbaseService.get('/_mapping').then(function(res) {
+		this.appbaseService.getMappings().then(function(data) {
 			self.connected = true;
-			let data = res.json();
 			self.setInitialValue();
 			self.finalUrl = self.config.host + '/' + self.config.appname;
 			self.mapping = data;
@@ -374,6 +377,7 @@ export class AppComponent implements OnInit, OnChanges {
 			}, 300);
 
 		}).catch(function(e) {
+			console.log(e);
 			self.initial_connect = true;
 			self.errorShow({
 				title: 'Authentication Error',
@@ -580,7 +584,19 @@ export class AppComponent implements OnInit, OnChanges {
 		function setSidebar() {
 			var windowHeight = $(window).height();
 			$('.features-section').css('height', windowHeight);
-			if(self.allowHF) {
+			if(!self.allowF) {
+				var bodyHeight = $('body').height();
+				setTimeout(()=>{
+					$('#mirage-container').css('height', bodyHeight- 140);
+					$('#paneCenter, #paneEast').css('height', bodyHeight- 140);
+				}, 300);
+			} else if(!self.allowH) {
+				var bodyHeight = $('body').height();
+				setTimeout(()=>{
+					$('#mirage-container').css('height', bodyHeight- 15);
+					$('#paneCenter, #paneEast').css('height', bodyHeight- 15);
+				}, 300);
+			} else if(self.allowHF) {
 				var bodyHeight = $('body').height();
 				setTimeout(()=>{
 					$('#mirage-container').css('height', bodyHeight- 166);