Merge pull request #75 from metatron-app/3.0.1

Release 3.0.1

Author: kyungtaak

.gitignore

@@ -66,6 +66,7 @@ hive-site.xml
 discovery-server/src/main/resources/hive-site.xml
 !/discovery-server/src/main/java/com/metatron/discovery/domain/workbook/configurations/PageConfiguration.java
 !/discovery-server/src/main/java/com/metatron/discovery/domain/workbook/configurations/filter/ExpressionFilter.java
+discovery-frontend/src/environments/build.env.ts
 
 # dataprep local base dir
 dataprep/uploads

discovery-frontend/build.env.js

@@ -0,0 +1,4 @@
+exports.vars = [
+  'METATRON_APP_VERSION',
+  'METATRON_DEPLOY_SERVER'
+];

discovery-frontend/package.json

@@ -12,7 +12,8 @@
     "lint": "ng lint",
     "lint-fix": "ng lint --fix",
     "e2e": "ng e2e",
-    "dummy-db": "json-server --watch dummy.json"
+    "dummy-db": "json-server --watch dummy.json",
+    "prebuild": "node prebuild.js"
   },
   "private": true,
   "dependencies": {

discovery-frontend/pom.xml

@@ -52,6 +52,13 @@
             <goals>
               <goal>npm</goal>
             </goals>
+
+            <configuration>
+              <environmentVariables>
+                <METATRON_APP_VERSION>${metatron.app.version}</METATRON_APP_VERSION>
+              </environmentVariables>
+              <arguments>run prebuild</arguments>
+            </configuration>
           </execution>
 
           <execution>

discovery-frontend/prebuild.js

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const vars = require('./build.env').vars;
+
+const env_vars = {};
+
+vars.forEach(x => {
+  if (vars.indexOf(x) !== -1) {
+  env_vars[x] = process.env[x];
+}
+});
+
+
+const buildinfo_path = path.join(__dirname, 'src', 'environments', 'build.env.ts');
+const buildinfo = JSON.stringify(env_vars, null, ' ');
+
+fs.writeFileSync(buildinfo_path, `export const BuildInfo = ${buildinfo};`);
+
+process.exit(0);

discovery-frontend/src/app/common/component/chart/base-chart.ts

@@ -88,6 +88,9 @@ export abstract class BaseChart extends AbstractComponent implements OnInit, OnD
   // 선반 정보
   protected pivot: Pivot;
 
+  // 기존 선반 정보 (병렬 / 중첩에따라서 변경되지않는 선반값)
+  protected originPivot: Pivot;
+
   // 저장 정보
   protected saveInfo: UIOption;
 
@@ -236,6 +239,8 @@ export abstract class BaseChart extends AbstractComponent implements OnInit, OnD
     ////////////////////////////////////////////////////////
 
     // Set
+    this.pivot = result.config.pivot;
+    this.originPivot = _.cloneDeep(this.pivot);
     this.originalData = _.cloneDeep(result.data);
 
     ///////////////////////////
@@ -255,7 +260,8 @@ export abstract class BaseChart extends AbstractComponent implements OnInit, OnD
       }
 
       // Min/Max 변경
-      if( !_.isUndefined(this.uiOption.yAxis.grid) ) {
+      if( !_.isUndefined(this.uiOption.yAxis.grid)
+          && !this.uiOption.yAxis.grid.autoScaled ) {
 
         this.calculateMinMax(this.uiOption.yAxis.grid, result, true);
       }
@@ -274,7 +280,8 @@ export abstract class BaseChart extends AbstractComponent implements OnInit, OnD
       }
 
       // Min/Max 변경
-      if( !_.isUndefined(this.uiOption.xAxis.grid) ) {
+      if( !_.isUndefined(this.uiOption.xAxis.grid)
+          && !this.uiOption.xAxis.grid.autoScaled ) {
 
         this.calculateMinMax(this.uiOption.xAxis.grid, result, false);
       }
@@ -284,7 +291,6 @@ export abstract class BaseChart extends AbstractComponent implements OnInit, OnD
 
     // Set
     this.data = result.data;
-    this.pivot = result.config.pivot;
 
     // 데이터레이블에서 사용되는 uiData에 설정된 columns 데이터 설정
     this.data.columns = this.setUIData();

discovery-frontend/src/app/common/component/chart/option/converter/axis-option-converter.ts

@@ -396,6 +396,7 @@ export class AxisOptionConverter {
 
         let min = null;
         let max = null;
+        let calculateMin = null;
         if( data.categories && data.categories.length > 0 ) {
           _.each(data.categories, (category) => {
             _.each(category.value, (value) => {
@@ -407,15 +408,18 @@ export class AxisOptionConverter {
               }
             });
           });
-          min = min > 0
-            ? Math.ceil(min - ((max - min) * 0.05))
-            : min;
+          calculateMin = Math.ceil(min - ((max - min) * 0.05))
+          // min = min > 0
+          //   ? calculateMin >= 0 ? calculateMin : min
+          //   : min;
           max = max == null ? 0 : max;
         }
         else {
-          min = data.info.minValue > 0
-            ? Math.ceil(data.info.minValue - ((data.info.maxValue - data.info.minValue) * 0.05))
-            : data.info.minValue;
+          calculateMin = Math.ceil(data.info.minValue - ((data.info.maxValue - data.info.minValue) * 0.05))
+          min = data.info.minValue;
+          // min = data.info.minValue > 0
+          //   ? calculateMin >= 0 ? calculateMin : min
+          //   : data.info.minValue;
           max = data.info.maxValue;
         }
 
@@ -425,18 +429,25 @@ export class AxisOptionConverter {
 
         // 기준선 변경시
         let baseline = 0;
-        if( axisOption[index].baseline != 0 ) {
+        if( axisOption[index].baseline && axisOption[index].baseline != 0 ) {
           baseline = axisOption[index].baseline
         }
 
         // 축 범위 자동설정이 설정되지 않았고
         // 오토스케일 적용시
         if( baseline == 0 && axisOption[index].grid.autoScaled ) {
-          // 적용
-          option.min = min > 0
-            ? Math.ceil(min - ((max - min) * 0.05))
-            : min;
-          option.max = max;
+          // // 적용
+          // option.min = min > 0
+          //   ? Math.ceil(min - ((max - min) * 0.05))
+          //   : min;
+          // option.max = max;
+
+          delete option.min;
+          delete option.max;
+          option.scale = true;
+        }
+        else {
+          delete option.scale;
         }
       }
     });

discovery-frontend/src/app/common/component/chart/option/ui-option/ui-pie-chart.ts

@@ -13,15 +13,19 @@
  */
 
 import { UIOption } from '../ui-option';
-import { BarMarkType, LineMarkType, LineMode, LineStyle, PieSeriesViewType, PointShape } from '../define/common';
+import { PieSeriesViewType } from '../define/common';
+
 /**
  * 파이차트 화면 UI에 필요한 옵션
  * Version 2.0
  */
 export interface UIPieChart extends UIOption {
 
-  // Bar Chart 표시 방식
+  // Chart 표시 방식
   markType: PieSeriesViewType;
+
+  // 기타외 표시개수
+  maxCategory?: number;
 }