ci: use thanos-ci:v0.4.0-node as default image

ui: react: fix eslint warnings Signed-off-by: Prem Kumar <[email protected]>
thanos-io · Apr 24, 2020 · aa07da2 · aa07da2
1 parent 6083143
commit aa07da2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 31 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,12 +4,10 @@ version: 2
 defaults: &defaults
   docker:
     # Built by Thanos make docker-ci
-    - image: quay.io/thanos/thanos-ci:v0.3.0
+    - image: quay.io/thanos/thanos-ci:v0.4.0-node
 jobs:
   test:
-    docker:
-      # Build by Thanos make docker-ci; contains node to run tests on React UI
-      - image: quay.io/thanos/thanos-ci:v0.4.0-node
+    <<: *defaults
     working_directory: /go/src/github.com/thanos-io/thanos
     environment:
       GO111MODULE: 'on'

diff --git a/pkg/ui/bindata.go b/pkg/ui/bindata.go
@@ -271,7 +271,7 @@ func pkgUiTemplatesQuery_menuHtml() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "pkg/ui/templates/query_menu.html", size: 1682, mode: os.FileMode(420), modTime: time.Unix(1586945563, 0)}
+	info := bindataFileInfo{name: "pkg/ui/templates/query_menu.html", size: 1682, mode: os.FileMode(420), modTime: time.Unix(1587713715, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -571,7 +571,7 @@ func pkgUiStaticReactAssetManifestJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "pkg/ui/static/react/asset-manifest.json", size: 1150, mode: os.FileMode(420), modTime: time.Unix(1586961156, 0)}
+	info := bindataFileInfo{name: "pkg/ui/static/react/asset-manifest.json", size: 1150, mode: os.FileMode(420), modTime: time.Unix(1587714257, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -591,7 +591,7 @@ func pkgUiStaticReactFaviconIco() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "pkg/ui/static/react/favicon.ico", size: 16958, mode: os.FileMode(420), modTime: time.Unix(1586961129, 0)}
+	info := bindataFileInfo{name: "pkg/ui/static/react/favicon.ico", size: 16958, mode: os.FileMode(420), modTime: time.Unix(1587714246, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -611,7 +611,7 @@ func pkgUiStaticReactIndexHtml() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "pkg/ui/static/react/index.html", size: 2290, mode: os.FileMode(420), modTime: time.Unix(1586961156, 0)}
+	info := bindataFileInfo{name: "pkg/ui/static/react/index.html", size: 2290, mode: os.FileMode(420), modTime: time.Unix(1587714257, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -631,7 +631,7 @@ func pkgUiStaticReactManifestJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "pkg/ui/static/react/manifest.json", size: 310, mode: os.FileMode(493), modTime: time.Unix(1586961129, 0)}
+	info := bindataFileInfo{name: "pkg/ui/static/react/manifest.json", size: 310, mode: os.FileMode(493), modTime: time.Unix(1587714246, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -651,7 +651,7 @@ func pkgUiStaticReactPrecacheManifest13e764b9739a0bc43bda80653214998aJs() (*asse
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "pkg/ui/static/react/precache-manifest.13e764b9739a0bc43bda80653214998a.js", size: 641, mode: os.FileMode(420), modTime: time.Unix(1586961156, 0)}
+	info := bindataFileInfo{name: "pkg/ui/static/react/precache-manifest.13e764b9739a0bc43bda80653214998a.js", size: 641, mode: os.FileMode(420), modTime: time.Unix(1587714257, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -671,7 +671,7 @@ func pkgUiStaticReactServiceWorkerJs() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "pkg/ui/static/react/service-worker.js", size: 1183, mode: os.FileMode(420), modTime: time.Unix(1586961156, 0)}
+	info := bindataFileInfo{name: "pkg/ui/static/react/service-worker.js", size: 1183, mode: os.FileMode(420), modTime: time.Unix(1587714257, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -691,7 +691,7 @@ func pkgUiStaticReactStaticCss23f5e1097ChunkCss() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "pkg/ui/static/react/static/css/2.3f5e1097.chunk.css", size: 151031, mode: os.FileMode(420), modTime: time.Unix(1586961156, 0)}
+	info := bindataFileInfo{name: "pkg/ui/static/react/static/css/2.3f5e1097.chunk.css", size: 151031, mode: os.FileMode(420), modTime: time.Unix(1587714257, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -711,7 +711,7 @@ func pkgUiStaticReactStaticCssMainA6053568ChunkCss() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "pkg/ui/static/react/static/css/main.a6053568.chunk.css", size: 3903, mode: os.FileMode(420), modTime: time.Unix(1586961156, 0)}
+	info := bindataFileInfo{name: "pkg/ui/static/react/static/css/main.a6053568.chunk.css", size: 3903, mode: os.FileMode(420), modTime: time.Unix(1587714257, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -731,7 +731,7 @@ func pkgUiStaticReactStaticJs242f57af3ChunkJs() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "pkg/ui/static/react/static/js/2.42f57af3.chunk.js", size: 1014130, mode: os.FileMode(420), modTime: time.Unix(1586961156, 0)}
+	info := bindataFileInfo{name: "pkg/ui/static/react/static/js/2.42f57af3.chunk.js", size: 1014130, mode: os.FileMode(420), modTime: time.Unix(1587714257, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -751,7 +751,7 @@ func pkgUiStaticReactStaticJsMainA7db5187ChunkJs() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "pkg/ui/static/react/static/js/main.a7db5187.chunk.js", size: 104767, mode: os.FileMode(420), modTime: time.Unix(1586961156, 0)}
+	info := bindataFileInfo{name: "pkg/ui/static/react/static/js/main.a7db5187.chunk.js", size: 104767, mode: os.FileMode(420), modTime: time.Unix(1587714257, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -771,7 +771,7 @@ func pkgUiStaticReactStaticJsRuntimeMain56ad181aJs() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "pkg/ui/static/react/static/js/runtime-main.56ad181a.js", size: 1552, mode: os.FileMode(420), modTime: time.Unix(1586961156, 0)}
+	info := bindataFileInfo{name: "pkg/ui/static/react/static/js/runtime-main.56ad181a.js", size: 1552, mode: os.FileMode(420), modTime: time.Unix(1587714257, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }

diff --git a/pkg/ui/react-app/public/index.html b/pkg/ui/react-app/public/index.html
@@ -10,9 +10,9 @@
     <meta name="theme-color" content="#000000" />
 
     <!--
-      This constant's placeholder magic value is replaced during serving by Prometheus
-      and set to Prometheus's external URL path. It gets prepended to all links back
-      to Prometheus, both for asset loading as well as API accesses.
+      This constant's placeholder magic value is replaced during serving by Thanos
+      and set to Thanos's external URL path. It gets prepended to all links back
+      to Thanos, both for asset loading as well as API accesses.
     -->
     <script>const GLOBAL_PATH_PREFIX='';</script>
     <script>const THANOS_COMPONENT='query';</script>

diff --git a/pkg/ui/react-app/src/thanos/Navbar.tsx b/pkg/ui/react-app/src/thanos/Navbar.tsx
@@ -1,17 +1,6 @@
 import React, { FC, useState } from 'react';
 import { Link } from '@reach/router';
-import {
-  Collapse,
-  Navbar,
-  NavbarToggler,
-  Nav,
-  NavItem,
-  NavLink,
-  UncontrolledDropdown,
-  DropdownToggle,
-  DropdownMenu,
-  DropdownItem,
-} from 'reactstrap';
+import { Collapse, Navbar, NavbarToggler, Nav, NavItem, NavLink } from 'reactstrap';
 import PathPrefixProps from '../types/PathPrefixProps';
 import ThanosComponentProps from './types/ThanosComponentProps';