diff --git a/components/centraldashboard/Dockerfile b/components/centraldashboard/Dockerfile index f959b36367c..f6638e0bc86 100644 --- a/components/centraldashboard/Dockerfile +++ b/components/centraldashboard/Dockerfile @@ -8,6 +8,6 @@ COPY webpack.config.js *.json ./ RUN npm install && npm run build && npm prune --production -EXPOSE 8080 +EXPOSE 8082 ENTRYPOINT ["npm", "start"] diff --git a/components/centraldashboard/Gopkg.lock b/components/centraldashboard/Gopkg.lock deleted file mode 100644 index a7896f8d79e..00000000000 --- a/components/centraldashboard/Gopkg.lock +++ /dev/null @@ -1,356 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - name = "cloud.google.com/go" - packages = ["compute/metadata"] - revision = "aad3f485ee528456e0768f20397b4d9dd941e755" - version = "v0.25.0" - -[[projects]] - name = "github.com/ghodss/yaml" - packages = ["."] - revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" - version = "v1.0.0" - -[[projects]] - name = "github.com/gogo/protobuf" - packages = [ - "proto", - "sortkeys" - ] - revision = "1adfc126b41513cc696b209667c8656ea7aac67c" - version = "v1.0.0" - -[[projects]] - branch = "master" - name = "github.com/golang/glog" - packages = ["."] - revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" - -[[projects]] - name = "github.com/golang/protobuf" - packages = [ - "proto", - "ptypes", - "ptypes/any", - "ptypes/duration", - "ptypes/timestamp" - ] - revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" - version = "v1.1.0" - -[[projects]] - branch = "master" - name = "github.com/google/btree" - packages = ["."] - revision = "e89373fe6b4a7413d7acd6da1725b83ef713e6e4" - -[[projects]] - branch = "master" - name = "github.com/google/gofuzz" - packages = ["."] - revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" - -[[projects]] - name = "github.com/googleapis/gnostic" - packages = [ - "OpenAPIv2", - "compiler", - "extensions" - ] - revision = "7c663266750e7d82587642f65e60bc4083f1f84e" - version = "v0.2.0" - -[[projects]] - branch = "master" - name = "github.com/gregjones/httpcache" - packages = [ - ".", - "diskcache" - ] - revision = "9cad4c3443a7200dd6400aef47183728de563a38" - -[[projects]] - name = "github.com/imdario/mergo" - packages = ["."] - revision = "9316a62528ac99aaecb4e47eadd6dc8aa6533d58" - version = "v0.3.5" - -[[projects]] - name = "github.com/json-iterator/go" - packages = ["."] - revision = "ab8a2e0c74be9d3be70b3184d9acc634935ded82" - version = "1.1.4" - -[[projects]] - name = "github.com/modern-go/concurrent" - packages = ["."] - revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94" - version = "1.0.3" - -[[projects]] - name = "github.com/modern-go/reflect2" - packages = ["."] - revision = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd" - version = "1.0.1" - -[[projects]] - branch = "master" - name = "github.com/petar/GoLLRB" - packages = ["llrb"] - revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" - -[[projects]] - name = "github.com/peterbourgon/diskv" - packages = ["."] - revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" - version = "v2.0.1" - -[[projects]] - name = "github.com/spf13/pflag" - packages = ["."] - revision = "583c0c0531f06d5278b7d917446061adc344b5cd" - version = "v1.0.1" - -[[projects]] - branch = "master" - name = "golang.org/x/crypto" - packages = ["ssh/terminal"] - revision = "a49355c7e3f8fe157a85be2f77e6e269a0f89602" - -[[projects]] - branch = "master" - name = "golang.org/x/net" - packages = [ - "context", - "context/ctxhttp", - "http/httpguts", - "http2", - "http2/hpack", - "idna" - ] - revision = "d0887baf81f4598189d4e12a37c6da86f0bba4d0" - -[[projects]] - branch = "master" - name = "golang.org/x/oauth2" - packages = [ - ".", - "google", - "internal", - "jws", - "jwt" - ] - revision = "ef147856a6ddbb60760db74283d2424e98c87bff" - -[[projects]] - branch = "master" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows" - ] - revision = "1b2967e3c290b7c545b3db0deeda16e9be4f98a2" - -[[projects]] - name = "golang.org/x/text" - packages = [ - "collate", - "collate/build", - "internal/colltab", - "internal/gen", - "internal/tag", - "internal/triegen", - "internal/ucd", - "language", - "secure/bidirule", - "transform", - "unicode/bidi", - "unicode/cldr", - "unicode/norm", - "unicode/rangetable" - ] - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" - -[[projects]] - branch = "master" - name = "golang.org/x/time" - packages = ["rate"] - revision = "fbb02b2291d28baffd63558aa44b4b56f178d650" - -[[projects]] - name = "google.golang.org/appengine" - packages = [ - ".", - "internal", - "internal/app_identity", - "internal/base", - "internal/datastore", - "internal/log", - "internal/modules", - "internal/remote_api", - "internal/urlfetch", - "urlfetch" - ] - revision = "b1f26356af11148e710935ed1ac8a7f5702c7612" - version = "v1.1.0" - -[[projects]] - name = "gopkg.in/inf.v0" - packages = ["."] - revision = "d2d2541c53f18d2a059457998ce2876cc8e67cbf" - version = "v0.9.1" - -[[projects]] - name = "gopkg.in/yaml.v2" - packages = ["."] - revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" - version = "v2.2.1" - -[[projects]] - branch = "master" - name = "k8s.io/api" - packages = [ - "admissionregistration/v1alpha1", - "admissionregistration/v1beta1", - "apps/v1", - "apps/v1beta1", - "apps/v1beta2", - "authentication/v1", - "authentication/v1beta1", - "authorization/v1", - "authorization/v1beta1", - "autoscaling/v1", - "autoscaling/v2beta1", - "batch/v1", - "batch/v1beta1", - "batch/v2alpha1", - "certificates/v1beta1", - "core/v1", - "events/v1beta1", - "extensions/v1beta1", - "networking/v1", - "policy/v1beta1", - "rbac/v1", - "rbac/v1alpha1", - "rbac/v1beta1", - "scheduling/v1alpha1", - "scheduling/v1beta1", - "settings/v1alpha1", - "storage/v1", - "storage/v1alpha1", - "storage/v1beta1" - ] - revision = "183f3326a9353bd6d41430fc80f96259331d029c" - -[[projects]] - name = "k8s.io/apimachinery" - packages = [ - "pkg/api/errors", - "pkg/api/meta", - "pkg/api/resource", - "pkg/apis/meta/v1", - "pkg/apis/meta/v1/unstructured", - "pkg/apis/meta/v1beta1", - "pkg/conversion", - "pkg/conversion/queryparams", - "pkg/fields", - "pkg/labels", - "pkg/runtime", - "pkg/runtime/schema", - "pkg/runtime/serializer", - "pkg/runtime/serializer/json", - "pkg/runtime/serializer/protobuf", - "pkg/runtime/serializer/recognizer", - "pkg/runtime/serializer/streaming", - "pkg/runtime/serializer/versioning", - "pkg/selection", - "pkg/types", - "pkg/util/clock", - "pkg/util/errors", - "pkg/util/framer", - "pkg/util/intstr", - "pkg/util/json", - "pkg/util/net", - "pkg/util/runtime", - "pkg/util/sets", - "pkg/util/validation", - "pkg/util/validation/field", - "pkg/util/wait", - "pkg/util/yaml", - "pkg/version", - "pkg/watch", - "third_party/forked/golang/reflect" - ] - revision = "103fd098999dc9c0c88536f5c9ad2e5da39373ae" - -[[projects]] - name = "k8s.io/client-go" - packages = [ - "discovery", - "kubernetes", - "kubernetes/scheme", - "kubernetes/typed/admissionregistration/v1alpha1", - "kubernetes/typed/admissionregistration/v1beta1", - "kubernetes/typed/apps/v1", - "kubernetes/typed/apps/v1beta1", - "kubernetes/typed/apps/v1beta2", - "kubernetes/typed/authentication/v1", - "kubernetes/typed/authentication/v1beta1", - "kubernetes/typed/authorization/v1", - "kubernetes/typed/authorization/v1beta1", - "kubernetes/typed/autoscaling/v1", - "kubernetes/typed/autoscaling/v2beta1", - "kubernetes/typed/batch/v1", - "kubernetes/typed/batch/v1beta1", - "kubernetes/typed/batch/v2alpha1", - "kubernetes/typed/certificates/v1beta1", - "kubernetes/typed/core/v1", - "kubernetes/typed/events/v1beta1", - "kubernetes/typed/extensions/v1beta1", - "kubernetes/typed/networking/v1", - "kubernetes/typed/policy/v1beta1", - "kubernetes/typed/rbac/v1", - "kubernetes/typed/rbac/v1alpha1", - "kubernetes/typed/rbac/v1beta1", - "kubernetes/typed/scheduling/v1alpha1", - "kubernetes/typed/scheduling/v1beta1", - "kubernetes/typed/settings/v1alpha1", - "kubernetes/typed/storage/v1", - "kubernetes/typed/storage/v1alpha1", - "kubernetes/typed/storage/v1beta1", - "pkg/apis/clientauthentication", - "pkg/apis/clientauthentication/v1alpha1", - "pkg/apis/clientauthentication/v1beta1", - "pkg/version", - "plugin/pkg/client/auth/exec", - "plugin/pkg/client/auth/gcp", - "rest", - "rest/watch", - "third_party/forked/golang/template", - "tools/auth", - "tools/clientcmd", - "tools/clientcmd/api", - "tools/clientcmd/api/latest", - "tools/clientcmd/api/v1", - "tools/metrics", - "tools/reference", - "transport", - "util/cert", - "util/connrotation", - "util/flowcontrol", - "util/homedir", - "util/integer", - "util/jsonpath" - ] - revision = "7d04d0e2a0a1a4d4a1cd6baa432a2301492e4e65" - version = "v8.0.0" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - inputs-digest = "a809ecb2810c12c9ddfa35eb4ed60eedf54c598c42bcbf717c3aa97c5b7fe287" - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/components/centraldashboard/Gopkg.toml b/components/centraldashboard/Gopkg.toml deleted file mode 100644 index bee01f82706..00000000000 --- a/components/centraldashboard/Gopkg.toml +++ /dev/null @@ -1,38 +0,0 @@ -# Gopkg.toml example -# -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" -# -# [prune] -# non-go = false -# go-tests = true -# unused-packages = true - - -[[constraint]] - name = "k8s.io/apimachinery" - revision = "103fd098999dc9c0c88536f5c9ad2e5da39373ae" - -[[constraint]] - name = "k8s.io/client-go" - version = "8.0.0" - -[prune] - go-tests = true - unused-packages = true diff --git a/components/centraldashboard/README.md b/components/centraldashboard/README.md index d0cf83ec018..17801137455 100644 --- a/components/centraldashboard/README.md +++ b/components/centraldashboard/README.md @@ -17,7 +17,7 @@ hot-module reloading: the [public](./public) folder and starts the [webpack-dev-server](https://webpack.js.org/configuration/dev-server/) at http://localhost:8081. - - It also starts the Express API server at http://localhost:8080. Requests + - It also starts the Express API server at http://localhost:8082. Requests from the front-end starting with `/api` are proxied to the Express server. ### Front-End Components @@ -33,4 +33,4 @@ for an example. Run `npm run build && npm start`. This packages the project for production and serves both the front-end and API server on Express at -http://localhost:8080. +http://localhost:8082. diff --git a/components/centraldashboard/app/server.ts b/components/centraldashboard/app/server.ts index 454e8a24d35..b2790d6c608 100644 --- a/components/centraldashboard/app/server.ts +++ b/components/centraldashboard/app/server.ts @@ -3,7 +3,8 @@ import { resolve } from "path"; import process from "process"; const app: express.Application = express(); -const port: number = Number(process.env.PORT) || 8080; +const {PORT, PORT_1} = process.env; +const port: number = Number(PORT) || Number(PORT_1) || 8082; const frontEnd: string = resolve(__dirname, "public"); app.use(express.static(frontEnd)); diff --git a/components/centraldashboard/make-win.ps1 b/components/centraldashboard/make-win.ps1 index a09dd1e47f1..303b59a0d84 100644 --- a/components/centraldashboard/make-win.ps1 +++ b/components/centraldashboard/make-win.ps1 @@ -26,6 +26,7 @@ $CHANGED_FILES = git diff-files --relative=components/centraldashboard $GIT_VERSION = git describe --always if ($CHANGED_FILES) { $GIT_VERSION = "$GIT_VERSION-dirty-$(git diff | sha256sum | cut -c -6)" + Write-AP "!You are building from a dirty branch, it's recommended that you commit and push all changes before building!" } $Date = (Get-Date).ToString("vyyyyMMdd") @@ -40,21 +41,30 @@ switch($step) { --build-arg kubeflowversion=$(git describe --abbrev=0 --tags) ` --label=git-verions=$GIT_VERSION docker tag "${IMG}:$TAG" "${IMG}:latest" - Write-AP "+Built '${IMG}:latest'" - Write-AP "+Built '${IMG}:$TAG'" - break + if ($?) { + Write-AP "x+","nx_Built ","n+${IMG}:latest" + Write-AP "x+","nx_Built ","n+${IMG}:$TAG" + } else { + Write-AP "-Failed to build [${IMG}:$TAG]" + } } "push" { # Build but don't attach the latest tag. This allows manual testing/inspection of the image # first. gcloud docker -- push "${IMG}:$TAG" - Write-AP "+Pushed $IMG with :$TAG tags" + Write-AP $(if ($?) + {"x+","nx_Pushed ","nx+$IMG","nx_ with tag ","nx+:$TAG","n_ tags"}else + {"-Failed to push ${IMG}:$TAG"} + ) } "push-latest" { # Build but don't attach the latest tag. This allows manual testing/inspection of the image # first. gcloud container images add-tag --quiet "${IMG}:$TAG" "${IMG}:latest" --verbosity=info - Write-AP "+Created ${IMG}:latest tags" + Write-AP $(if ($?) + {"x+","nx_Pushed ","nx+${IMG}:latest","n_ tags"}else + {"-Failed to push ${IMG}:latest tags"} + ) } } diff --git a/components/centraldashboard/package-lock.json b/components/centraldashboard/package-lock.json index 1319b5ff0e4..0fe75903227 100644 --- a/components/centraldashboard/package-lock.json +++ b/components/centraldashboard/package-lock.json @@ -2754,6 +2754,16 @@ "sha.js": "^2.4.8" } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + } + }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", @@ -4017,8 +4027,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -4039,14 +4048,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4061,20 +4068,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -4191,8 +4195,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -4204,7 +4207,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4219,7 +4221,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4227,14 +4228,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4253,7 +4252,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -4334,8 +4332,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -4347,7 +4344,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4433,8 +4429,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -4470,7 +4465,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4490,7 +4484,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4534,14 +4527,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/components/centraldashboard/package.json b/components/centraldashboard/package.json index 1bf724ec449..4ba98ed150b 100644 --- a/components/centraldashboard/package.json +++ b/components/centraldashboard/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "description": "Kubeflow Central Dashboard", "scripts": { - "build": "NODE_ENV=production webpack && npm run tslint && npm run build-ts", + "build": "cross-env NODE_ENV=production webpack && npm run tslint && npm run build-ts", "build-ts": "tsc", "build-webpack": "webpack", "debug": "npm run build && npm run watch-debug", @@ -49,7 +49,6 @@ "@webcomponents/webcomponentsjs": "^2.0.0", "body-parser": "^1.18.3", "express": "^4.16.4", - "terser-webpack-plugin": "^1.2.3", "web-animations-js": "^2.3.1" }, "devDependencies": { @@ -61,6 +60,7 @@ "clean-webpack-plugin": "^1.0.1", "concurrently": "^4.1.0", "copy-webpack-plugin": "^5.0.0", + "cross-env": "^5.2.0", "css-loader": "^2.1.0", "eslint": "^5.14.1", "eslint-config-google": "^0.12.0", @@ -73,6 +73,7 @@ "pug": "^2.0.3", "pug-loader": "^2.4.0", "script-ext-html-webpack-plugin": "^2.1.3", + "terser-webpack-plugin": "^1.2.3", "ts-node": "^8.0.2", "tslint": "^5.12.1", "typescript": "^3.3.3333", diff --git a/components/centraldashboard/public/components/main-page.js b/components/centraldashboard/public/components/main-page.js index 14226090cbb..ed4a68a26c2 100644 --- a/components/centraldashboard/public/components/main-page.js +++ b/components/centraldashboard/public/components/main-page.js @@ -78,7 +78,8 @@ export class MainPage extends PolymerElement { primaryViewIndex: {type: Number, value: 0}, homeOrIframeViewIndex: {type: Number, value: 0}, url: {type: String, value: ''}, - buildVersion: {type: String, value: VERSION}, + buildVersion: {type: String, value: '0.4.1'}, + dashVersion: {type: String, value: VERSION}, _devMode: {type: Boolean, value: false}, }; } @@ -91,7 +92,7 @@ export class MainPage extends PolymerElement { } openQuickLink(e) { - const link = e.model.item.link; + const {link} = e.model.item; this.openExternalLink(link); } diff --git a/components/centraldashboard/public/components/main-page.pug b/components/centraldashboard/public/components/main-page.pug index 61a5f6a9d7b..82bd57a84d6 100644 --- a/components/centraldashboard/public/components/main-page.pug +++ b/components/centraldashboard/public/components/main-page.pug @@ -11,16 +11,17 @@ app-drawer-layout.flex(narrow='{{narrowMode}}') aside.flex footer.footer section.privacy Privacy - section.build build version v[[buildVersion]] - app-header-layout(fullbleed='') - app-header(slot='header', fixed='') + section.build build version + span(title="Build: v[[buildVersion]] | Dashboard: v[[dashVersion]]") v[[buildVersion]] + app-header-layout(fullbleed) + app-header(slot='header', fixed) app-toolbar - paper-tabs.bottom(selected='{{primaryViewIndex}}', hides='', hidden$='[[!isZero(homeOrIframeViewIndex)]]') + paper-tabs.bottom(selected='{{primaryViewIndex}}', hides, hidden$='[[!isZero(homeOrIframeViewIndex)]]') paper-tab Dashboard paper-tab(hidden$='[[!_devMode]]') Activity aside#NamespaceSelector(hidden$='[[!_devMode]]') paper-dropdown-menu(label='Namespace') - paper-icon-button#Menu(icon='menu', on-click='toggleSidebar', hides='', hidden$='[[!narrowMode]]') + paper-icon-button#Menu(icon='menu', on-click='toggleSidebar', hides, hidden$='[[!narrowMode]]') neon-animated-pages.flex.layout.vertical(selected='[[homeOrIframeViewIndex]]', entry-animation='fade-in-animation', exit-animation='fade-out-animation') neon-animated-pages#PrimaryView.flex.layout.vertical(selected='[[primaryViewIndex]]', entry-animation='fade-in-animation', exit-animation='fade-out-animation') article#Dashboard @@ -28,9 +29,9 @@ app-drawer-layout.flex(narrow='{{narrowMode}}') template(is='dom-repeat', items='[[gettingStartedItems]]') paper-icon-item iron-icon(icon='[[item.icon]]', slot='item-icon') - paper-item-body(two-line='') + paper-item-body(two-line) div [[item.text]] - aside(secondary='') Lorem ipsum... + aside(secondary) Lorem ipsum... paper-card.Quick-Links(heading='Quick Links') template(is='dom-repeat', items='[[quickLinks]]') article.link @@ -38,6 +39,6 @@ app-drawer-layout.flex(narrow='{{narrowMode}}') paper-icon-button.button(icon='arrow-forward', alt='[[item.text]]', on-click='openQuickLink') article.link.more-coming paper-item-body More coming soon - paper-icon-button.button(icon='arrow-forward', diabled='') + paper-icon-button.button(icon='arrow-forward', diabled) article#Activity iframe#PageFrame.flex(src='[[url]]') diff --git a/components/centraldashboard/webpack.config.js b/components/centraldashboard/webpack.config.js index 518bda6ed5a..1aeda44e1b8 100644 --- a/components/centraldashboard/webpack.config.js +++ b/components/centraldashboard/webpack.config.js @@ -1,6 +1,6 @@ 'use strict'; -const { resolve } = require('path'); +const {resolve} = require('path'); const CleanWebpackPlugin = require('clean-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const DefinePlugin = require('webpack').DefinePlugin; @@ -9,13 +9,13 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin"); const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin'); const TerserPlugin = require('terser-webpack-plugin'); -const NODE_MODULES = /\/node_modules\//; const ENV = process.env.NODE_ENV || 'development'; -const PKG_VERSION = require('./package.json').version; -const SRC = resolve(__dirname, 'public'); -const COMPONENTS = resolve(SRC, 'components'); -const DESTINATION = resolve(__dirname, 'dist', 'public'); -const WEBCOMPONENTS = './node_modules/@webcomponents/webcomponentsjs'; +const NODE_MODULES = /\/node_modules\//; +const PKG_VERSION = require('./package.json').version +const SRC = resolve(__dirname, 'public') +const COMPONENTS = resolve(SRC, 'components') +const DESTINATION = resolve(__dirname, 'dist', 'public') +const WEBCOMPONENTS = './node_modules/@webcomponents/webcomponentsjs' const POLYFILLS = [ { from: resolve(WEBCOMPONENTS, '*.{js,map}'), @@ -33,7 +33,7 @@ const POLYFILLS = [ // external Pug templates and CSS files. const COMPONENT_RULES = [ { - test: /\/components\/.*\.pug$/, + test: /\.pug$/, use: ['pug-loader'] }, { @@ -176,6 +176,6 @@ module.exports = { ], devServer: { port: 8081, - proxy: { '/api': 'http://localhost:8080' } + proxy: {'/api': 'http://localhost:8082'} } -}; +} diff --git a/kubeflow/common/prototypes/centraldashboard.jsonnet b/kubeflow/common/prototypes/centraldashboard.jsonnet index a537a30416f..e3c198c0fbb 100644 --- a/kubeflow/common/prototypes/centraldashboard.jsonnet +++ b/kubeflow/common/prototypes/centraldashboard.jsonnet @@ -3,7 +3,7 @@ // @description centraldashboard Component // @shortDescription centraldashboard // @param name string Name -// @optionalParam image string gcr.io/kubeflow-images-public/centraldashboard:v20190223-v0.4.0-rc.1-152-g1de09b7a Image for the central dashboard +// @optionalParam image string gcr.io/kubeflow-images-public/centraldashboard:v20190301-v0.4.0-rc.1-183-g07eecd2f Image for the central dashboard local centraldashboard = import "kubeflow/common/centraldashboard.libsonnet"; local instance = centraldashboard.new(env, params);