diff --git a/ui/dev/nginx-dev-local-microservices.conf b/ui/dev/nginx-dev-local-microservices.conf index 4a72c1d..91b9cdf 100644 --- a/ui/dev/nginx-dev-local-microservices.conf +++ b/ui/dev/nginx-dev-local-microservices.conf @@ -27,24 +27,11 @@ http { proxy_set_header Host $host; } - # muncher handles most API requests location /api { proxy_pass http://172.17.0.1:8080; proxy_redirect off; proxy_set_header Host $host; - } - - # split endpoint between loader for POSTs and muncher for all other operations - location /api/v1/compendium { - proxy_pass http://172.17.0.1:8088; - proxy_redirect off; - proxy_set_header Host $host; proxy_read_timeout 30m; - - # For requests that *are not* a POST, pass to muncher - limit_except POST { - proxy_pass http://172.17.0.1:8080; - } } location ~* \.io { diff --git a/ui/dev/nginx-share.conf b/ui/dev/nginx-share.conf index ce83ae6..694a4e6 100644 --- a/ui/dev/nginx-share.conf +++ b/ui/dev/nginx-share.conf @@ -5,6 +5,7 @@ proxy_pass http://muncher:8080; proxy_redirect off; proxy_set_header Host $host; + proxy_read_timeout 30m; } location ~* ^/api/v1/compendium/[^/]+/binding { @@ -15,20 +16,6 @@ proxy_set_header Host $host; } - location /api/v1/compendium { - include nginx-cors.conf; - - proxy_pass http://loader:8088; - proxy_redirect off; - proxy_set_header Host $host; - proxy_read_timeout 30m; - - # For requests that *are not* a POST, pass to muncher - limit_except POST { - proxy_pass http://muncher:8080; - } - } - location ~* \.io { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -76,14 +63,6 @@ proxy_pass http://shipper:8087; } - location /api/v1/inspection { - include nginx-cors.conf; - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_pass http://inspecter:8091; - } - location /api/v1/bindings { include nginx-cors.conf; diff --git a/ui/docker-compose-dev.yml b/ui/docker-compose-dev.yml index 9b027a9..f808980 100644 --- a/ui/docker-compose-dev.yml +++ b/ui/docker-compose-dev.yml @@ -84,7 +84,7 @@ services: # - elasticsearch muncher: - image: o2rproject/o2r-muncher:0.27.0 + image: o2rproject/o2r-muncher:0.30.0 depends_on: - mongodb - configmongodb @@ -102,6 +102,7 @@ services: - DEBUG=*,-mquery,-express:*,-express-session,-body-parser:* - "MUNCHER_META_TOOL_CONTAINER=o2rproject/o2r-meta:1447d43" + #- "MUNCHER_META_TOOL_CONTAINER=meta:dev" #- MUNCHER_META_TOOL_CONTAINER_RM=false - MUNCHER_SAVE_IMAGE_TARBALL=false # saves space and time during dev - MUNCHER_CONTAINERIT_IMAGE=o2rproject/containerit:geospatial-0.6.0.9000 @@ -110,22 +111,6 @@ services: #- "MUNCHER_META_TOOL_CONTAINER=meta:dev" #- MUNCHER_ALLOW_INVALID_METADATA=true - loader: - image: o2rproject/o2r-loader:0.12.0 - depends_on: - - mongodb - - configmongodb - volumes: - - o2rstorage:/tmp/o2r - - /var/run/docker.sock:/var/run/docker.sock - environment: - - "LOADER_MONGODB=mongodb://mongodb:27017/" - - LOADER_PORT=8088 - - DEBUG=*,-mquery,-express:*,-express-session,-body-parser:* - - LOADER_VOLUME=ui_o2rstorage - - "LOADER_META_TOOL_CONTAINER=o2rproject/o2r-meta:1447d43" - #- "LOADER_META_TOOL_CONTAINER=meta:dev" - informer: image: o2rproject/o2r-informer:0.5.0 depends_on: @@ -186,14 +171,6 @@ services: SHIPPER_BASE_PATH: "/tmp/o2r" PYTHONUNBUFFERED: "0" - inspecter: - image: o2rproject/o2r-inspecter:0.0.1 - volumes: - - o2rstorage:/tmp/o2r - environment: - - INSPECTER_PORT=8091 - - DEBUGME=inspecter - bindings: #image: o2rproject/o2r-bindings:latest build: ./bindings @@ -245,7 +222,6 @@ services: #- finder - muncher - informer - - loader - shipper - bindings - ui diff --git a/ui/docker-compose.yml b/ui/docker-compose.yml index c30105c..87974f4 100644 --- a/ui/docker-compose.yml +++ b/ui/docker-compose.yml @@ -43,7 +43,7 @@ services: - "1234:1234" muncher: - image: o2rproject/o2r-muncher:0.27.0 + image: o2rproject/o2r-muncher:0.30.0 depends_on: - mongodb - configmongodb @@ -61,6 +61,7 @@ services: - DEBUG=*,-mquery,-express:*,-express-session,-body-parser:* - "MUNCHER_META_TOOL_CONTAINER=o2rproject/o2r-meta:1447d43" + #- "MUNCHER_META_TOOL_CONTAINER=meta:dev" #- MUNCHER_META_TOOL_CONTAINER_RM=false - MUNCHER_SAVE_IMAGE_TARBALL=false # saves space and time during dev - MUNCHER_CONTAINERIT_IMAGE=o2rproject/containerit:geospatial-0.6.0.9000 @@ -68,23 +69,7 @@ services: - "MUNCHER_CONTAINERIT_BASE_IMAGE=rocker/geospatial:3.6.2" #- "MUNCHER_META_TOOL_CONTAINER=meta:dev" #- MUNCHER_ALLOW_INVALID_METADATA=true - - loader: - image: o2rproject/o2r-loader:0.12.0 - depends_on: - - mongodb - - configmongodb - volumes: - - o2rstorage:/tmp/o2r - - /var/run/docker.sock:/var/run/docker.sock - environment: - - "LOADER_MONGODB=mongodb://mongodb:27017/" - - LOADER_PORT=8088 - - DEBUG=*,-mquery,-express:*,-express-session,-body-parser:* - - LOADER_VOLUME=ui_o2rstorage - - "LOADER_META_TOOL_CONTAINER=o2rproject/o2r-meta:1447d43" - #- "LOADER_META_TOOL_CONTAINER=meta:dev" - + informer: image: o2rproject/o2r-informer:0.5.0 depends_on: @@ -128,14 +113,6 @@ services: SHIPPER_BASE_PATH: "/tmp/o2r" PYTHONUNBUFFERED: "0" - inspecter: - image: o2rproject/o2r-inspecter:0.0.1 - volumes: - - o2rstorage:/tmp/o2r - environment: - - INSPECTER_PORT=8091 - - DEBUGME=inspecter - bindings: image: o2rproject/o2r-bindings:latest #build: ./bindings @@ -167,7 +144,6 @@ services: - bouncer - muncher - informer - - loader - shipper - bindings ports: diff --git a/ui/package-lock.json b/ui/package-lock.json index b2fdc3f..2fab55a 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -1927,6 +1927,11 @@ } } }, + "@react-leaflet/core": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@react-leaflet/core/-/core-1.0.2.tgz", + "integrity": "sha512-QbleYZTMcgujAEyWGki8Lx6cXQqWkNtQlqf5c7NImlIp8bKW66bFpez/6EVatW7+p9WKBOEOVci/9W7WW70EZg==" + }, "@rollup/plugin-node-resolve": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz", @@ -2164,11 +2169,6 @@ "resolved": "https://registry.npmjs.org/@types/base16/-/base16-1.0.2.tgz", "integrity": "sha512-oYO/U4VD1DavwrKuCSQWdLG+5K22SLPem2OQaHmFcQuwHoVeGC+JGVRji2MUqZUAIQZHEonOeVfAX09hYiLsdg==" }, - "@types/component-emitter": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz", - "integrity": "sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==" - }, "@types/eslint": { "version": "7.2.6", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.6.tgz", @@ -3466,11 +3466,6 @@ "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" }, - "backo2": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", - "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=" - }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -3536,11 +3531,6 @@ "resolved": "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz", "integrity": "sha1-4pf2DX7BAUp6lxo568ipjAtoHnA=" }, - "base64-arraybuffer": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz", - "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=" - }, "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -4263,11 +4253,6 @@ "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" }, - "component-bind": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", - "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=" - }, "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", @@ -4971,11 +4956,6 @@ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, - "deepmerge": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", - "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==" - }, "default-gateway": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", @@ -5463,46 +5443,6 @@ "once": "^1.4.0" } }, - "engine.io-client": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-4.0.5.tgz", - "integrity": "sha512-1lkn0QdekHQPMTcxUh8LqIuxQHNtKV5GvqkQzmZ1rYKAvB6puMm13U7K1ps3OQZ4joE46asQiAKrcdL9weNEVw==", - "requires": { - "base64-arraybuffer": "0.1.4", - "component-emitter": "~1.3.0", - "debug": "~4.1.0", - "engine.io-parser": "~4.0.1", - "has-cors": "1.1.0", - "parseqs": "0.0.6", - "parseuri": "0.0.6", - "ws": "~7.2.1", - "xmlhttprequest-ssl": "~1.5.4", - "yeast": "0.1.2" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "ws": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz", - "integrity": "sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==" - } - } - }, - "engine.io-parser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.2.tgz", - "integrity": "sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg==", - "requires": { - "base64-arraybuffer": "0.1.4" - } - }, "enhanced-resolve": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz", @@ -7130,20 +7070,6 @@ "mime-types": "^2.1.12" } }, - "formik": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/formik/-/formik-2.2.6.tgz", - "integrity": "sha512-Kxk2zQRafy56zhLmrzcbryUpMBvT0tal5IvcifK5+4YNGelKsnrODFJ0sZQRMQboblWNym4lAW3bt+tf2vApSA==", - "requires": { - "deepmerge": "^2.1.1", - "hoist-non-react-statics": "^3.3.0", - "lodash": "^4.17.14", - "lodash-es": "^4.17.14", - "react-fast-compare": "^2.0.1", - "tiny-warning": "^1.0.2", - "tslib": "^1.10.0" - } - }, "formik-persist": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/formik-persist/-/formik-persist-1.1.0.tgz", @@ -7484,11 +7410,6 @@ "function-bind": "^1.1.1" } }, - "has-cors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", - "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=" - }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -11694,16 +11615,6 @@ "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==" }, - "parseqs": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz", - "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==" - }, - "parseuri": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz", - "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==" - }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -15080,51 +14991,6 @@ "kind-of": "^3.2.0" } }, - "socket.io-client": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-3.0.4.tgz", - "integrity": "sha512-qMvBuS+W9JIN2mkfAWDCxuIt+jpIKDf8C0604zEqx1JrPaPSS6cN0F3B2GYWC83TqBeVJXW66GFxWV3KD88n0Q==", - "requires": { - "@types/component-emitter": "^1.2.10", - "backo2": "1.0.2", - "component-bind": "1.0.0", - "component-emitter": "~1.3.0", - "debug": "~4.1.0", - "engine.io-client": "~4.0.0", - "parseuri": "0.0.6", - "socket.io-parser": "~4.0.1" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "socket.io-parser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.2.tgz", - "integrity": "sha512-Bs3IYHDivwf+bAAuW/8xwJgIiBNtlvnjYRc4PbXgniLmcP1BrakBoq/QhO24rgtgW7VZ7uAaswRGxutUnlAK7g==", - "requires": { - "@types/component-emitter": "^1.2.10", - "component-emitter": "~1.3.0", - "debug": "~4.1.0" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - } - } - }, "sockjs": { "version": "0.3.20", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz", @@ -17967,11 +17833,6 @@ "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" }, - "xmlhttprequest-ssl": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", - "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=" - }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", @@ -18058,11 +17919,6 @@ "fd-slicer": "~1.1.0" } }, - "yeast": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", - "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=" - }, "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/ui/package.json b/ui/package.json index b78211d..8431ddd 100644 --- a/ui/package.json +++ b/ui/package.json @@ -11,6 +11,7 @@ "dependencies": { "@material-ui/core": "^4.11.2", "@material-ui/icons": "^4.5.1", + "@react-leaflet/core": "^1.0.2", "core-js": "^3.8.1", "csv-string": "^4.0.1", "formik": "^1.5.8",