Windows build fix (#159)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

dashboard/.gitignore

@@ -11,4 +11,3 @@ dump.rdb
 /tslint.json
 *.DS_Store
 locales/_build/
-locales/**/*.js

dashboard/client/i18n.ts

@@ -44,7 +44,7 @@ export class LocalizationStore {
   async load(locale: string) {
     const catalog = await import(
       /* webpackMode: "lazy", webpackChunkName: "locale/[request]" */
-      `@lingui/loader!../locales/${locale}/messages.po`
+      `../locales/${locale}/messages.js`
     );
     return _i18n.load(locale, catalog);
   }
@@ -59,4 +59,4 @@ export class LocalizationStore {
   }
 }
 
-export const i18nStore = new LocalizationStore();
+export const i18nStore = new LocalizationStore();

dashboard/locales/en/messages.js

@@ -0,0 +1 @@
+/* eslint-disable */module.exports={localeData:{"plurals":function(n,ord){var s=String(n).split("."),v0=!s[1],t0=Number(s[0])==n,n10=t0&&s[0].slice(-1),n100=t0&&s[0].slice(-2);if(ord)return n10==1&&n100!=11?"one":n10==2&&n100!=12?"two":n10==3&&n100!=13?"few":"other";return n==1&&v0?"one":"other"}},messages:{"(as a percentage of request)":"(as a percentage of request)","(empty) (Allowing the specific traffic to all pods in this namespace)":"(empty) (Allowing the specific traffic to all pods in this namespace)","<0>Filtered</0>: {itemsCount} / {allItemsCount}":["<0>Filtered</0>: ",["itemsCount"]," / ",["allItemsCount"]],"<0>Your browser does not support all Kontena Lens features. </0> Please consider using another browser.":"<0>Your browser does not support all Kontena Lens features. </0> Please consider using another browser.","<0>{0}</0> successfully created":["<0>",["0"],"</0> successfully created"],"API Group":"API Group","Access Control":"Access Control","Access Modes":"Access Modes","Account Name":"Account Name","Active":"Active","Add Namespace":"Add Namespace","Add RoleBinding":"Add RoleBinding","Add bindings to {name}":["Add bindings to ",["name"]],"Add field":"Add field","Additional Printer Columns":"Additional Printer Columns","Addresses":"Addresses","Affinities":"Affinities","Age":"Age","All groups":"All groups","All logs":"All logs","All namespaces":"All namespaces","Allocatable":"Allocatable","Allow Privilege Escalation":"Allow Privilege Escalation","Allowed CSI Drivers":"Allowed CSI Drivers","Allowed Capabilities":"Allowed Capabilities","Allowed Flex Volumes":"Allowed Flex Volumes","Allowed Host Paths":"Allowed Host Paths","Allowed Proc Mount Types":"Allowed Proc Mount Types","Allowed Runtime Class Names":"Allowed Runtime Class Names","Allowed Unsafe Sysctls":"Allowed Unsafe Sysctls","Annotations":"Annotations","Api Groups":"Api Groups","App Version":"App Version","App crash at <0>{pageUrl}</0>":["App crash at <0>",["pageUrl"],"</0>"],"Applying..":"Applying..","Apps":"Apps","Are you sure you want to drain <0>{nodeName}</0>?":["Are you sure you want to drain <0>",["nodeName"],"</0>?"],"Arguments":"Arguments","Auth App Role":"Auth App Role","Back":"Back","Backends":"Backends","Binding":"Binding","Binding targets":"Binding targets","Bindings":"Bindings","Build version":"Build version","Bytes consumed on this filesystem":"Bytes consumed on this filesystem","Bytes received by all containers":"Bytes received by all containers","Bytes sent by Ingress controller with error status":"Bytes sent by Ingress controller with error status","Bytes sent by Ingress controller with successful status":"Bytes sent by Ingress controller with successful status","Bytes sent, status 2xx":"Bytes sent, status 2xx","Bytes sent, status 5xx":"Bytes sent, status 5xx","Bytes transmitted from all containers":"Bytes transmitted from all containers","CA Bundle":"CA Bundle","CPU":"CPU","CPU capacity":"CPU capacity","CPU cores usage":"CPU cores usage","CPU limits":"CPU limits","CPU requests":"CPU requests","CPU:":"CPU:","Cancel":"Cancel","Capacity":"Capacity","Certificates":"Certificates","Chart":"Chart","Chart Release <0>{0}</0> successfully created.":["Chart Release <0>",["0"],"</0> successfully created."],"Chart: {0}":["Chart: ",["0"]],"Charts":"Charts","Checking update":"Checking update","Claim":"Claim","Claim Name":"Claim Name","Close":"Close","Close (Ctrl+W)":"Close (Ctrl+W)","Cloud API Token Secret":"Cloud API Token Secret","Cluster":"Cluster","Cluster IP":"Cluster IP","Cluster Issuers":"Cluster Issuers","Command":"Command","Common Name":"Common Name","Compact view":"Compact view","Completions":"Completions","Component stack":"Component stack","Condition":"Condition","Conditions":"Conditions","Config Maps":"Config Maps","Config copied to clipboard":"Config copied to clipboard","ConfigMap <0>{0}</0> successfully updated.":["ConfigMap <0>",["0"],"</0> successfully updated."],"ConfigMaps":"ConfigMaps","Configuration":"Configuration","Connection":"Connection","Container":"Container","Container CPU cores usage":"Container CPU cores usage","Container CPU requests":"Container CPU requests","Container memory limits":"Container memory limits","Container memory requests":"Container memory requests","Container memory usage":"Container memory usage","Container runtime":"Container runtime","Containers":"Containers","Context":"Context","Controlled By":"Controlled By","Controlled by":"Controlled by","Conversion":"Conversion","Copy to clipboard":"Copy to clipboard","Cordon":"Cordon","Count":"Count","Create":"Create","Create Namespace":"Create Namespace","Create ResourceQuota":"Create ResourceQuota","Create Role":"Create Role","Create Secret":"Create Secret","Create Service Account":"Create Service Account","Create new ResourceQuota":"Create new ResourceQuota","Create new Role":"Create new Role","Create new RoleBinding":"Create new RoleBinding","Create new Secret":"Create new Secret","Create new Service Account":"Create new Service Account"Line truncated

dashboard/locales/ru/messages.js

@@ -0,0 +1 @@
+/* eslint-disable */module.exports={localeData:{"plurals":function(n,ord){var s=String(n).split("."),i=s[0],v0=!s[1],i10=i.slice(-1),i100=i.slice(-2);if(ord)return"other";return v0&&i10==1&&i100!=11?"one":v0&&i10>=2&&i10<=4&&(i100<12||i100>14)?"few":v0&&i10==0||v0&&i10>=5&&i10<=9||v0&&i100>=11&&i100<=14?"many":"other"}},messages:{"(as a percentage of request)":"(as a percentage of request)","(empty) (Allowing the specific traffic to all pods in this namespace)":"(\u041F\u0443\u0441\u0442\u043E) (\u0414\u043E\u043F\u0443\u0441\u043A\u0430\u0435\u0442\u0441\u044F \u0442\u0440\u0430\u0444\u0438\u043A \u043A\u043E \u0432\u0441\u0435\u043C \u043F\u043E\u0434\u0430\u043C \u0432 \u0434\u0430\u043D\u043D\u043E\u0439 \u043E\u0431\u043B\u0430\u0441\u0442\u0438 \u0438\u043C\u0435\u043D)","<0>Filtered</0>: {itemsCount} / {allItemsCount}":["<0>\u041E\u0442\u0444\u0438\u043B\u044C\u0442\u0440\u043E\u0432\u0430\u043D\u043E</0>: ",["itemsCount"]," / ",["allItemsCount"]],"<0>Your browser does not support all Kontena Lens features. </0> Please consider using another browser.":"<0>\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0432\u0441\u0435 \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u0438 Kontena Lens. </0> \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430 \u0440\u0430\u0441\u0441\u043C\u043E\u0442\u0440\u0438\u0442\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435 \u0434\u0440\u0443\u0433\u043E\u0433\u043E \u0441\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E\u0433\u043E \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0430.","<0>{0}</0> successfully created":["<0>",["0"],"</0> successfully created"],"API Group":"API Group","Access Control":"\u041A\u043E\u043D\u0442\u0440\u043E\u043B\u044C \u0434\u043E\u0441\u0442\u0443\u043F\u0430","Access Modes":"\u0420\u0435\u0436\u0438\u043C\u044B \u0434\u043E\u0441\u0442\u0443\u043F\u0430","Account Name":"\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0430\u043A\u043A\u0430\u0443\u043D\u0442\u0430","Active":"\u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0439","Add Namespace":"\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C Namespace","Add RoleBinding":"\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u0440\u0438\u0432\u044F\u0437\u043A\u0443 \u0440\u043E\u043B\u0435\u0439","Add bindings to {name}":["\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u0440\u0438\u0432\u044F\u0437\u043A\u0438 \u043A ",["name"]],"Add field":"\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u043E\u043B\u0435","Additional Printer Columns":"Additional Printer Columns","Addresses":"\u0410\u0434\u0440\u0435\u0441\u0430","Affinities":"\u0410\u0444\u0444\u0438\u043D\u0438\u0442\u0435\u0442\u044B","Age":"\u0412\u043E\u0437\u0440\u0430\u0441\u0442","All groups":"All groups","All logs":"\u0412\u0441\u0435 \u043B\u043E\u0433\u0438","All namespaces":"All namespaces","Allocatable":"Allocatable","Allow Privilege Escalation":"Allow Privilege Escalation","Allowed CSI Drivers":"Allowed CSI Drivers","Allowed Capabilities":"Allowed Capabilities","Allowed Flex Volumes":"Allowed Flex Volumes","Allowed Host Paths":"Allowed Host Paths","Allowed Proc Mount Types":"Allowed Proc Mount Types","Allowed Runtime Class Names":"Allowed Runtime Class Names","Allowed Unsafe Sysctls":"Allowed Unsafe Sysctls","Annotations":"\u0410\u043D\u043D\u043E\u0442\u0430\u0446\u0438\u0438","Api Groups":"API \u0433\u0440\u0443\u043F\u043F\u044B","App Version":"\u0412\u0435\u0440\u0441\u0438\u044F \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F","App crash at <0>{pageUrl}</0>":["\u0421\u0431\u043E\u0439 \u0440\u0430\u0431\u043E\u0442\u044B \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u043D\u0430 <0>",["pageUrl"],"</0>"],"Applying..":"\u041F\u0440\u0438\u043C\u0435\u043D\u0435\u043D\u0438\u0435..","Apps":"\u041F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F","Are you sure you want to drain <0>{nodeName}</0>?":["\u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u043A\u043E\u043C\u0430\u043D\u0434\u0443 drain \u0434\u043B\u044F \u043D\u043E\u0434\u044B <0>",["nodeName"],"</0>?"],"Arguments":"\u0410\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B","Auth App Role":"Auth App Role","Back":"\u041D\u0430\u0437\u0430\u0434","Backends":"\u0411\u044D\u043A\u0435\u043D\u0434\u044B","Binding":"\u041F\u0440\u0438\u0432\u044F\u0437\u043A\u0430","Binding targets":"\u0426\u0435\u043B\u0438 \u043F\u0440\u0438\u0432\u044F\u0437\u043A\u0438","Bindings":"\u041F\u0440\u0438\u0432\u044F\u0437\u043A\u0438","Build version":"\u0412\u0435\u0440\u0441\u0438\u044F \u0431\u0438\u043B\u0434\u0430","Bytes consumed on this filesystem":"\u0411\u0430\u0439\u0442\u044B, \u043F\u043E\u0442\u0440\u0435\u0431\u043B\u044F\u0435\u043C\u044B\u0435 \u0432 \u0444\u0430\u0439\u043B\u043E\u0432\u043E\u0439 \u0441\u0438\u0441\u0442\u0435\u043C\u0435","Bytes received 
Line truncated

dashboard/locales/ru/messages.po

@@ -1080,8 +1080,8 @@ msgstr "IP балансировщика нагрузки"
 msgid "Loading"
 msgstr "Загрузка"
 
-#: client/components/+workloads-pods/pod-menu.tsx:67
-#: client/components/+workloads-pods/pod-menu.tsx:68
+#: client/components/+workloads-pods/pod-menu.tsx:86
+#: client/components/+workloads-pods/pod-menu.tsx:87
 msgid "Logs"
 msgstr "Логи"
 
@@ -1503,7 +1503,7 @@ msgstr "Селектор подов"
 msgid "Pod Status"
 msgstr "Статус подов"
 
-#: client/components/+workloads-pods/pod-menu.tsx:44
+#: client/components/+workloads-pods/pod-menu.tsx:63
 msgid "Pod shell"
 msgstr "Командная строка пода"
 
@@ -1967,7 +1967,7 @@ msgid "Set quota"
 msgstr "Установить квоту"
 
 #: client/components/+nodes/node-menu.tsx:48
-#: client/components/+workloads-pods/pod-menu.tsx:45
+#: client/components/+workloads-pods/pod-menu.tsx:64
 msgid "Shell"
 msgstr "Командная строка"
 

dashboard/package.json

@@ -2,12 +2,12 @@
   "name": "kontena-lens",
   "version": "0.0.0",
   "scripts": {
-    "dev": "yarn extract && webpack-cli --watch --cache --progress --output-path ../static/build/client/",
-    "build": "yarn extract && env NODE_ENV=production webpack -p --progress --output-path ../static/build/client/",
+    "dev": "yarn compile && webpack-cli --watch --cache --progress --output-path ../static/build/client/",
+    "build": "webpack -p --progress --output-path ../static/build/client/",
     "test": "jest --config './test/jest.config.js'",
     "add-locale": "lingui add-locale",
-    "extract": "lingui extract --clean",
-    "compile": "lingui compile"
+    "lingui-extract": "lingui extract --clean",
+    "lingui-compile": "lingui compile"
   },
   "dependencies": {
     "axios": "^0.19.0",

dashboard/webpack.config.ts

@@ -9,8 +9,8 @@ export default () => {
   const { IS_PRODUCTION } = config;
   const srcDir = path.resolve(process.cwd(), CLIENT_DIR);
   const buildDir = path.resolve(process.cwd(), BUILD_DIR, CLIENT_DIR);
-  const sassCommonVarsFile = path.resolve(srcDir, "components/vars.scss");
   const tsConfigClientFile = path.resolve(srcDir, "tsconfig.json");
+  const sassCommonVarsFile = "./components/vars.scss"; // needs to be relative for Windows
 
   return {
     entry: {
@@ -45,7 +45,7 @@ export default () => {
             extractComments: {
               condition: "some",
               banner: [
-                `Kontena Lens. Copyright ${new Date().getFullYear()} by Lakend Labs, Inc. All rights reserved.`
+                `Lens. Copyright ${new Date().getFullYear()} by Lakend Labs, Inc. All rights reserved.`
               ].join("\n")
             }
           })