Merge pull request #507 from MetaCell/development

Merge latest development to master

deployment/helm/templates/certs/letsencrypt.yaml

@@ -1,6 +1,6 @@
 {{- if and (not .Values.local) (not (not .Values.tls)) }}
-apiVersion: cert-manager.io/v1alpha2
-kind: ClusterIssuer
+apiVersion: cert-manager.io/v1
+kind: Issuer
 metadata:
   name: {{ printf "%s-%s" "letsencrypt" .Values.namespace }}
 spec:
@@ -12,5 +12,5 @@ spec:
     solvers:
     - http01:
         ingress:
-          ingressName: geppetto-meta-ingress
+          class: nginx
 {{ end }}

deployment/helm/templates/ingress.yaml

@@ -4,32 +4,38 @@
     http:
       paths:
       - path: /(.*)
+        pathType: ImplementationSpecific
         backend:
-          serviceName: {{ .app.harness.service.name }}{{- if (and .app.harness.secured $secured_gatekeepers) }}-gk{{- end }}
-          servicePort: {{- if (and .app.harness.secured $secured_gatekeepers) }} 8080 {{- else }} {{ .app.harness.service.port | default 80  }}{{- end }}
+          service:
+            name: {{ .app.harness.service.name }}{{- if (and .app.harness.secured $secured_gatekeepers) }}-gk{{- end }}
+            port:
+              number: {{- if (and .app.harness.secured $secured_gatekeepers) }} 8080 {{- else }} {{ .app.harness.service.port | default 80  }}{{- end }}
 {{- end }}
 {{- define "deploy_utils.ingress.service" }}
   {{ $domain := .root.Values.domain }}
   {{ $secured_gatekeepers := and .root.Values.secured_gatekeepers }}
   {{ $app := get .root.Values.apps (print .service_name | snakecase) }}
       - path: /proxy/{{ $app.harness.service.name }}/(.*)
+        pathType: ImplementationSpecific
         backend:
-          serviceName: {{ $app.harness.service.name }}{{- if (and $app.harness.secured $secured_gatekeepers) }}-gk{{- end }}
-          servicePort: {{- if (and $app.harness.secured $secured_gatekeepers) }} 8080 {{- else }} {{ $app.harness.service.port | default 80  }}{{- end }}
+          service:
+            name: {{ $app.harness.service.name }}{{- if (and $app.harness.secured $secured_gatekeepers) }}-gk{{- end }}
+            port:
+              number: {{- if (and $app.harness.secured $secured_gatekeepers) }} 8080 {{- else }} {{ $app.harness.service.port | default 80  }}{{- end }}
 {{- end }}
 {{- if .Values.ingress.enabled }}
 {{ $domain := .Values.domain }}
 {{ $tls := not (not .Values.tls) }}
 {{ $mainapp := .Values.mainapp }}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Values.ingress.name | quote }}
   annotations:
     kubernetes.io/ingress.class: nginx
     {{- if and (not .Values.local) $tls }}
     kubernetes.io/tls-acme: 'true'
-    cert-manager.io/cluster-issuer: {{ printf "%s-%s" "letsencrypt" .Values.namespace }}
+    cert-manager.io/issuer: {{ printf "%s-%s" "letsencrypt" .Values.namespace }}
     {{- end }}
     nginx.ingress.kubernetes.io/ssl-redirect: {{ (and $tls .Values.ingress.ssl_redirect) | quote }}
     nginx.ingress.kubernetes.io/proxy-body-size: '250m'

examples/redux-react-app/src/app/icons.js

@@ -1,3 +1,5 @@
+import * as React from 'react';
+
 export const CloseIcon = (props) => (
   <svg
     width={8}

geppetto-showcase/package.json

@@ -56,9 +56,9 @@
     "@fortawesome/react-fontawesome": "^0.1.9",
     "@material-ui/core": "4.11.4",
     "@material-ui/icons": "^4.11.2",
-    "@metacell/geppetto-meta-client": "file:.yalc/@metacell/geppetto-meta-client",
-    "@metacell/geppetto-meta-core": "file:.yalc/@metacell/geppetto-meta-core",
-    "@metacell/geppetto-meta-ui": "file:.yalc/@metacell/geppetto-meta-ui",
+    "@metacell/geppetto-meta-client": "^1.2.0",
+    "@metacell/geppetto-meta-core": "^1.2.0",
+    "@metacell/geppetto-meta-ui": "^1.2.0",
     "@nosferatu500/react-sortable-tree": "3.0.5",
     "@types/node": "^15.0.2",
     "@types/react": "^17.0.5",

geppetto-showcase/yarn.lock

@@ -961,7 +961,7 @@
     core-js "^2.6.12"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.19.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.4.tgz#a42f814502ee467d55b38dd1c256f53a7b885c78"
   integrity sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==
@@ -1307,35 +1307,21 @@
     react-is "^16.8.0 || ^17.0.0"
 
 "@metacell/geppetto-meta-client@file:.yalc/@metacell/geppetto-meta-client":
-  version "1.0.9"
+  version "1.2.1"
   dependencies:
     "@material-ui/core" "^4.1.3"
-    "@metacell/geppetto-meta-core" "1.0.9"
-    "@metacell/geppetto-meta-ui" "1.0.9"
     pako "^1.0.3"
     react "^17.0.2"
     react-redux "^7.2.3"
     react-rnd "^7.3.0"
     redux "^4.1.0"
     url-join "^4.0.0"
 
-"@metacell/[email protected]":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@metacell/geppetto-meta-core/-/geppetto-meta-core-1.0.9.tgz#e45d981bc532474bb5297d81f406e51ec2f1da91"
-  integrity sha512-h4GunNPwgNVYbXBRgt2AkgcBz/AnXKqSyoIhHze5Ihuo0sE4rysW7ouH6Gog1/NoDx7P9s9bgYwe5vpuzsxRFQ==
-
 "@metacell/geppetto-meta-core@file:.yalc/@metacell/geppetto-meta-core":
-  version "1.0.9"
-
-"@metacell/[email protected]":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@metacell/geppetto-meta-ui/-/geppetto-meta-ui-1.0.9.tgz#e3f1f8e554349b556cf13602b05b1e1209f7caa8"
-  integrity sha512-bXdi318RTXLHnrSCTUSU7SxxYl/PBCwhd96uUlPuVU6s+OYNzm2LyVf36blpdUjTTEkD8JFNHGr86rckXo9cnA==
-  dependencies:
-    babel-plugin-import-less "^0.1.6"
+  version "1.2.1"
 
 "@metacell/geppetto-meta-ui@file:.yalc/@metacell/geppetto-meta-ui":
-  version "1.0.9"
+  version "1.2.1"
 
 "@nodelib/[email protected]":
   version "2.1.5"
@@ -2620,14 +2606,6 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-import-less@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-import-less/-/babel-plugin-import-less-0.1.6.tgz#3e7fc439798c917f8e91dde5d6eed4fa9e90ae81"
-  integrity sha512-WflzVhiAj+vuwur5veOQVh2PEitdmK9z+qUnJ7L1NOOnFrHWKqGWe1LKSNqnK0qwMR9nlLQ8eRCxRoorE8JzsA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/runtime" "^7.0.0"
-
 babel-plugin-polyfill-corejs2@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"

geppetto.js/geppetto-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metacell/geppetto-meta-client",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Geppetto web frontend. Geppetto is an open-source platform to build web-based tools to visualize and simulate neuroscience data and models.",
   "keywords": [
     "geppetto",
@@ -48,8 +48,8 @@
     "less": "^3.9.0"
   },
   "peerDepedencies": {
-    "@metacell/geppetto-meta-core": "1.2.0",
-    "@metacell/geppetto-meta-ui": "1.2.0"
+    "@metacell/geppetto-meta-core": "1.2.1",
+    "@metacell/geppetto-meta-ui": "1.2.1"
   },
   "buildOptions": {
     "emitEntryPoint": true,

geppetto.js/geppetto-client/src/common/middleware/geppettoMiddleware.js

@@ -21,7 +21,6 @@ export function callbacksMiddleware ({ getState, dispatch }) {
         console.log(geppettoVersion);
       }
 
-      console.debug(action);
       var actionTriggered = false;
       if (callbacksList[action.type] !== undefined && callbacksList[action.type].size > 0) {
         callbacksList[action.type].forEach(item => {

geppetto.js/geppetto-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metacell/geppetto-meta-core",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "The core functionality of geppetto-meta to build and simulate neuroscience data and models.",
   "keywords": [
     "geppetto",

geppetto.js/geppetto-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metacell/geppetto-meta-ui",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "React components from geppetto-meta to create neuroscience applications and visualize data.",
   "repository": {
     "type": "git",
@@ -62,7 +62,7 @@
     "@fortawesome/react-fontawesome": "^0.1.9",
     "@material-ui/core": "4.11.4",
     "@material-ui/icons": "^4.11.2",
-    "@metacell/geppetto-meta-core": "1.2.0",
+    "@metacell/geppetto-meta-core": "1.2.1",
     "aframe": "<1.1.0",
     "aframe-slice9-component": ">=1.0.0",
     "ami.js": ">=0.32.0",
@@ -71,6 +71,7 @@
     "d3": "7.6.1",
     "d3-plugins-dist": "^3.2.0",
     "file-saver": "^2.0.2",
+    "griddle-react": "^1.13.1",
     "html-to-image": "^1.9.0",
     "jszip": "^3.2.1",
     "mathjs": "^3.5.3",

geppetto.js/geppetto-ui/src/3d-canvas/Canvas.js

@@ -224,7 +224,7 @@ class Canvas extends Component {
   }
 
   getCanvasElement () {
-    return this.sceneRef && this.sceneRef.current.getElementsByTagName('canvas')[0]
+    return this.sceneRef.current && this.sceneRef.current.getElementsByTagName('canvas')[0]
   }
 
   defaultCaptureControlsHandler (action) {

geppetto.js/geppetto-ui/src/list-viewer/utils/Griddle.js

@@ -5,8 +5,11 @@ import {
   compose
 } from 'redux';
 
+import Griddle, { plugins } from 'griddle-react';
+
 const { CorePlugin: corePlugin } = plugins
 
+
 class GriddleNoReduxBrowserExtension extends Griddle {
 
   constructor (props) {