Merge pull request #285 from open-source-labs/staging

Update to 0.6.0

Author: mjmiguel

.babelrc

@@ -12,6 +12,7 @@
   "plugins": [
     ["@babel/transform-runtime"],
     ["@babel/proposal-class-properties"],
-    ["@babel/proposal-object-rest-spread"]
+    ["@babel/proposal-object-rest-spread"],
+    ["@babel/plugin-syntax-dynamic-import"]
   ]
 }

.gitignore

@@ -11,6 +11,7 @@ node_modules/
 *.compiled.*
 package-lock.json
 coverage/
+.vscode
 
 # Folder config file #
 ######################
@@ -61,4 +62,8 @@ ehthumbs.db
 protos/
 
 # testing #
-test/snapshot.png
+test/subSuites/*.png
+
+
+# db #
+.env

.travis.yml

@@ -0,0 +1,11 @@
+language: node_js
+node_js:
+  - '10.16.2'
+addons:
+  apt:
+    packages:
+      - xvfb
+before_install:
+  - export DISPLAY=':99.0'
+  - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+cache: npm

README.md

@@ -21,7 +21,7 @@ Swell is currently available for OS X, Linux and Windows.
 Swell is a one-stop shop for sending and monitoring your API requests
 
 * Send and monitor streams over HTTP2 (including SSEs) and WebSockets
-* Create GraphQL queries, mutations, and subscriptions
+* Create GraphQL queries, introspections, mutations, and subscriptions
 * Provides full streaming testing support for gRPC
 * Support for up to six concurrent connections
 * View request/response timing information in an interactive chart
@@ -34,7 +34,7 @@ Swell is a one-stop shop for sending and monitoring your API requests
      style="float: left; margin-right: 10px; margin-bottom : 30px; margin-top : 10px; border: 1px solid black;" /></kbd>
 
 * *Server-Sent Events (SSE)*: Swell displays SSE events one by one as they come in.
-<kbd><img src="./ReadMeGifs/Swell_API_3_SSE.gif"
+<kbd><img src="./ReadMeGifs/Swell_API_SSE.gif"
      style="float: left; margin-right: 10px; margin-bottom : 30px; margin-top : 10px;" /></kbd>
 
 
@@ -47,21 +47,36 @@ Swell is a one-stop shop for sending and monitoring your API requests
 <kbd><img src="./ReadMeGifs/Swell_API_GraphQL_Query.gif"
      style="float: left; margin-right: 10px;margin-bottom : 30px; margin-top : 10px;" /></kbd>
 
-### **Latest Swell v.0.4.0 update**
+
 * *gRPC*: Swell includes full support for all four streaming types of gRPC - unary, client stream, server stream, bidirectional stream
 <kbd><img src="./ReadMeGifs/Swell_API_gRPC.gif"
      style="float: left; margin-right: 10px;margin-bottom : 30px; margin-top : 10px;" /></kbd>
+     
+### **Latest Swell v.0.6.0 update**
+* *New Look*: Improved navigation and faster rendering processes
+<kbd><img src="./ReadMeGifs/ui-showcase.gif"
+     style="float: left; margin-right: 10px;margin-bottom : 30px; margin-top : 10px;" /></kbd>
+
+* *GraphQL*: Schema Introspection and smart code editor features
+<kbd><img src="./ReadMeGifs/introspection.gif"
+     style="float: left; margin-right: 10px;margin-bottom : 30px; margin-top : 10px;" /></kbd>
+     
+* *gRPC*: Front-end for the gRPC composer section has been heavily optimized and refactored. Unnecessary component re-renders, as well as extraneous Redux reducer dispatch actions have been eliminated. 
+<kbd><img src="./ReadMeGifs/Swell_API_gRPC.gif"
+     style="float: left; margin-right: 10px;margin-bottom : 30px; margin-top : 10px;" /></kbd>
 
 ## Additional Features
 * *Collections*: Swell allows you to save collections for easier testing of multiple requests.
+* *Import/Export Collections*: Swell allows you to import and export collections, making it easy to share collections with your team.
 <kbd><img src="./ReadMeGifs/Swell_API_Collections.gif"
      style="float: left; margin-right: 10px; margin-bottom : 30px; margin-top : 10px; border: 1px solid black;" /></kbd>
 
+## How to run tests
 
-* *Import/Export Collections*: Swell allows you to import and export collections, making it easy to share collections with your team.
-<kbd><img src="./ReadMeGifs/Swell_API_ImportExportCol.gif"
-     style="float: left; margin-right: 10px; margin-bottom : 30px; margin-top : 10px; border: 1px solid black;" /></kbd>
+To run functional tests that check for functionality of each API network protocol, use: "npm run test-mocha"
 
+Note: For the HTTP test to work, you will have to add a .env file with any MONGO URI.
+E.g., MONGO_URI = "mongodb+srv://YOUR_URL"
 
 ## Built With
 * Electron
@@ -75,6 +90,16 @@ Swell is a one-stop shop for sending and monitoring your API requests
 
 ## Authors
 
+* **Grace Kim** - [gracekiim](https://github.com/gracekiim)
+* **Alex Sanhueza** - [alexsanhueza](https://github.com/alexsanhueza)
+* **Wyatt Bell** - [wcbell51](https://github.com/wcbell51)
+* **John Madrigal** - [johnmadrigal](https://github.com/johnmadrigal)
+* **Michael Miller** - [mjmiguel](https://github.com/mjmiguel)
+* **Hideaki Aomori** - [h15200](https://github.com/h15200)
+* **Matt Gin** - [chinsonhoag](https://github.com/chunsonhoag)
+* **Nick Healy** - [nickhealy](http://github.com/nickhealy)
+* **Grace Spletzer** - [gspletzer](https://github.com/gspletzer)
+* **Stephanie Wood** - [stephwood](https://github.com/stephwood)
 * **Anthony Terruso** - [discrete projects](https://github.com/discrete-projects)
 * **Brandon Marrero** - [brandon6190](https://github.com/brandon6190)
 * **Jason Ou** - [jasonou1994](https://github.com/jasonou1994)

ReadMeGifs/Swell_API_12_Concurrent_Requests.gif

@@ -0,0 +1,36 @@
+import React from "react";
+import { shallow, configure } from "enzyme";
+import Adapter from "enzyme-adapter-react-16";
+import ResponseEventsDisplay from "../src/client/components/display/ResponseEventsDisplay.jsx";
+import FieldEntryForm from "../src/client/components/composer/NewRequest/FieldEntryForm";
+import SingleReqResContainer from '../src/client/components/containers/SingleReqResContainer'
+
+configure({ adapter: new Adapter() });
+
+describe('HTTP/S requests', () => {
+describe('public API', () => {
+	it('it should GET information from a public API', () => {
+    const props = {
+      newRequestFields: {
+        method: "GET",
+				protocol: "https://",
+				url: "https://pokeapi.co/api/v2/pokemon?limit=2"
+			}
+		};
+		const response = {
+			content: {
+				response: {
+					headers: {
+						status: 200
+					},
+					events: [{'count': 964}]
+				}
+			}
+		}
+		const fieldWrapper = shallow(<FieldEntryForm {...props} />);
+		fieldWrapper.setState({reqResAdd: jest.fn()})
+		const wrapper = shallow(<ResponseEventsDisplay {...response} />);
+		expect(wrapper.find("JSONPretty")).toHaveLength(1);
+	});
+})
+})

ReadMeGifs/Swell_API_6_Concurrent_Eevee_Requests.gif

@@ -0,0 +1,209 @@
+# Do not edit. File was generated by node-gyp's "configure" step
+{
+  "target_defaults": {
+    "cflags": [],
+    "default_configuration": "Release",
+    "defines": [],
+    "include_dirs": [],
+    "libraries": []
+  },
+  "variables": {
+    "asan": 0,
+    "build_v8_with_gn": "false",
+    "coverage": "false",
+    "dcheck_always_on": 0,
+    "debug_nghttp2": "false",
+    "debug_node": "false",
+    "enable_lto": "false",
+    "enable_pgo_generate": "false",
+    "enable_pgo_use": "false",
+    "force_dynamic_crt": 0,
+    "host_arch": "x64",
+    "icu_data_in": "../../deps/icu-small/source/data/in/icudt67l.dat",
+    "icu_default_data": "",
+    "icu_endianness": "l",
+    "icu_gyp_path": "tools/icu/icu-generic.gyp",
+    "icu_locales": "en,root",
+    "icu_path": "deps/icu-small",
+    "icu_small": "true",
+    "icu_ver_major": "67",
+    "is_debug": 0,
+    "llvm_version": "11.0",
+    "napi_build_version": "6",
+    "node_byteorder": "little",
+    "node_debug_lib": "false",
+    "node_enable_d8": "false",
+    "node_install_npm": "true",
+    "node_module_version": 72,
+    "node_no_browser_globals": "false",
+    "node_prefix": "/",
+    "node_release_urlbase": "https://nodejs.org/download/release/",
+    "node_shared": "false",
+    "node_shared_brotli": "false",
+    "node_shared_cares": "false",
+    "node_shared_http_parser": "false",
+    "node_shared_libuv": "false",
+    "node_shared_nghttp2": "false",
+    "node_shared_openssl": "false",
+    "node_shared_zlib": "false",
+    "node_tag": "",
+    "node_target_type": "executable",
+    "node_use_bundled_v8": "true",
+    "node_use_dtrace": "true",
+    "node_use_etw": "false",
+    "node_use_node_code_cache": "true",
+    "node_use_node_snapshot": "true",
+    "node_use_openssl": "true",
+    "node_use_v8_platform": "true",
+    "node_with_ltcg": "false",
+    "node_without_node_options": "false",
+    "openssl_fips": "",
+    "openssl_is_fips": "false",
+    "shlib_suffix": "72.dylib",
+    "target_arch": "x64",
+    "v8_enable_gdbjit": 0,
+    "v8_enable_i18n_support": 1,
+    "v8_enable_inspector": 1,
+    "v8_enable_lite_mode": 0,
+    "v8_no_strict_aliasing": 1,
+    "v8_optimized_debug": 1,
+    "v8_promise_internal_field_count": 1,
+    "v8_random_seed": 0,
+    "v8_trace_maps": 0,
+    "v8_use_siphash": 1,
+    "v8_use_snapshot": 1,
+    "want_separate_host_toolset": 0,
+    "xcode_version": "11.0",
+    "nodedir": "/Users/grace/.electron-gyp/9.2.0",
+    "standalone_static_library": 1,
+    "dry_run": "",
+    "legacy_bundling": "",
+    "save_dev": "",
+    "browser": "",
+    "commit_hooks": "true",
+    "only": "",
+    "viewer": "man",
+    "also": "",
+    "rollback": "true",
+    "sign_git_commit": "",
+    "audit": "true",
+    "usage": "",
+    "runtime": "electron",
+    "fallback_to_build": "true",
+    "globalignorefile": "/usr/local/etc/npmignore",
+    "init_author_url": "",
+    "maxsockets": "50",
+    "shell": "/bin/bash",
+    "build_from_source": "true",
+    "metrics_registry": "https://registry.npmjs.org/",
+    "parseable": "",
+    "shrinkwrap": "true",
+    "init_license": "ISC",
+    "timing": "",
+    "target_platform": "darwin",
+    "if_present": "",
+    "cache_max": "Infinity",
+    "init_author_email": "",
+    "sign_git_tag": "",
+    "cert": "",
+    "git_tag_version": "true",
+    "local_address": "",
+    "long": "",
+    "preid": "",
+    "fetch_retries": "2",
+    "registry": "https://registry.npmjs.org/",
+    "key": "",
+    "message": "%s",
+    "versions": "",
+    "globalconfig": "/usr/local/etc/npmrc",
+    "always_auth": "",
+    "logs_max": "10",
+    "prefer_online": "",
+    "cache_lock_retries": "10",
+    "global_style": "",
+    "update_notifier": "true",
+    "platform": "darwin",
+    "audit_level": "low",
+    "heading": "npm",
+    "fetch_retry_mintimeout": "10000",
+    "offline": "",
+    "read_only": "",
+    "searchlimit": "20",
+    "access": "",
+    "json": "",
+    "allow_same_version": "",
+    "description": "true",
+    "engine_strict": "",
+    "https_proxy": "",
+    "init_module": "/Users/grace/.npm-init.js",
+    "userconfig": "/Users/grace/.npmrc",
+    "cidr": "",
+    "node_version": "12.18.3",
+    "user": "",
+    "target": "9.2.0",
+    "auth_type": "legacy",
+    "editor": "vi",
+    "ignore_prepublish": "",
+    "save": "true",
+    "script_shell": "",
+    "tag": "latest",
+    "before": "",
+    "global": "",
+    "progress": "true",
+    "ham_it_up": "",
+    "optional": "true",
+    "searchstaleness": "900",
+    "bin_links": "true",
+    "force": "",
+    "save_prod": "",
+    "searchopts": "",
+    "depth": "Infinity",
+    "node_gyp": "/usr/local/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js",
+    "rebuild_bundle": "true",
+    "sso_poll_frequency": "500",
+    "unicode": "true",
+    "fetch_retry_maxtimeout": "60000",
+    "ca": "",
+    "save_prefix": "^",
+    "scripts_prepend_node_path": "warn-only",
+    "sso_type": "oauth",
+    "strict_ssl": "true",
+    "tag_version_prefix": "v",
+    "dev": "",
+    "fetch_retry_factor": "10",
+    "group": "20",
+    "save_exact": "",
+    "cache_lock_stale": "60000",
+    "prefer_offline": "",
+    "version": "",
+    "disturl": "https://electronjs.org/headers",
+    "cache_min": "10",
+    "otp": "",
+    "cache": "/Users/grace/.npm",
+    "searchexclude": "",
+    "update_binary": "true",
+    "color": "true",
+    "package_lock": "true",
+    "fund": "true",
+    "package_lock_only": "",
+    "save_optional": "",
+    "user_agent": "npm/6.14.6 node/v12.18.3 darwin x64",
+    "ignore_scripts": "",
+    "cache_lock_wait": "10000",
+    "production": "",
+    "save_bundle": "",
+    "send_metrics": "",
+    "init_version": "1.0.0",
+    "node_options": "",
+    "umask": "0022",
+    "scope": "",
+    "git": "git",
+    "init_author_name": "",
+    "onload_script": "",
+    "tmp": "/var/folders/kc/5h05ytss729963ty9tbxrgxw0000gn/T",
+    "unsafe_perm": "true",
+    "format_package_lock": "true",
+    "link": "",
+    "prefix": "/usr/local"
+  }
+}

ReadMeGifs/Swell_API_6_Concurrent_Requests.gif

@@ -55,7 +55,7 @@ async function sayHellosSs(ctx) {
   const reqMessages = { message: "hello!!! " + ctx.req.name };
   // combine template with reqMessage
   const updatedStream = [...dataStream, reqMessages];
-  const makeStreamData = await hl(updatedStream);
+  const makeStreamData = hl(updatedStream);
   ctx.res = makeStreamData;
   // ends server stream
   ctx.res.end();
@@ -81,7 +81,7 @@ async function sayHelloCs(ctx) {
       .collect()
       .toCallback((err, result) => {
         if (err) return reject(err);
-        console.log("messages ->", messages);
+        // console.log("messages ->", messages);
         ctx.response.res = { message: `received ${messages.length} messages` };
         return resolve();
       });