Merge pull request #64 from jumpserver/dev

Dev

.dockerignore

-*
-!dist
-!nginx.conf
-!i18n
+dist
+node_modules

Dockerfile

+FROM node:10 as stage-build
+WORKDIR /data
+ADD ./package.json /data/package.json
+ADD ./package-lock.json /data/package-lock.json
+RUN npm i
+ADD . /data
+RUN npm run-script build
+
+
 FROM nginx:alpine
-COPY ./dist /opt/luna/
-COPY ./i18n /opt/luna/i18n/
+COPY --from=stage-build /data/dist /opt/luna/
+COPY i18n /opt/luna/i18n
 COPY nginx.conf /etc/nginx/conf.d/default.conf

package.json

@@ -70,7 +70,7 @@
     "tslib": "^1.9.0",
     "utf-8-validate": "^5.0.2",
     "uuid-js": "^0.7.5",
-    "xterm": "^3.3.0",
+    "xterm": "3.3.0",
     "zone.js": "0.8.20"
   },
   "devDependencies": {
@@ -94,6 +94,6 @@
     "protractor": "^5.4.2",
     "ts-node": "3.3.0",
     "tslint": "5.9.1",
-    "typescript": "2.4.2"
+    "typescript": "2.6.2"
   }
 }

src/app/elements/asset-tree/asset-tree.component.ts

@@ -268,7 +268,7 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
     if (!zTreeObj) {
       return null;
     }
-    const _keywords = this.query;
+    const _keywords = this.query.toLowerCase();
     const nodes = zTreeObj.transformToArray(zTreeObj.getNodes());
     if (!_keywords) {
       if (this.hiddenNodes) {
@@ -289,9 +289,9 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
     const matchedNodes = zTreeObj.getNodesByFilter(function(node) {
       if (node.meta.type === 'asset') {
         const host = node.meta.asset;
-        return host.hostname.indexOf(_keywords) !== -1 || host.ip.indexOf(_keywords) !== -1;
+        return host.hostname.toLowerCase().indexOf(_keywords) !== -1 || host.ip.indexOf(_keywords) !== -1;
       } else {
-        return node.name.indexOf(_keywords) !== -1;
+        return node.name.toLowerCase().indexOf(_keywords) !== -1;
       }
     });
     matchedNodes.forEach((node) => {

src/environments/environment.prod.ts

@@ -2,5 +2,5 @@ export const environment = {
   production: true
 };
 // export const version = '1.3.0-{{BUILD_NUMBER}} GPLv2.';
-export const version = '1.4.9-101 GPLv2.';
+export const version = '1.4.10-101 GPLv2.';
 // export const version = '1.4.1-{{BUILD_NUMBER}} GPLv2.';