Merge pull request #1514 from swagger-api/feature/autocomplete-changes

Add the validateSpec action as its own thing

Author: shockey

src/plugins/editor-autosuggest-keywords/get-keywords-for-path.js

@@ -5,7 +5,7 @@ import isPlainObject from "lodash/isPlainObject"
 import toArray from "lodash/toArray"
 import isString from "lodash/isString"
 
-export default function getKeywordsForPath({ system, path, keywordMap}) {
+export default function getKeywordsForPath({ system, path, keywordMap }) {
   keywordMap = Object.assign({}, keywordMap)
 
   // is getting path was not successful stop here and return no candidates

src/plugins/editor/components/editor.jsx

@@ -5,7 +5,7 @@ import { placeMarkerDecorations } from "../editor-helpers/marker-placer"
 import Im, { fromJS } from "immutable"
 import ImPropTypes from "react-immutable-proptypes"
 
-import eq from "lodash/eq"
+import isEqual from "lodash/isEqual"
 import isEmpty from "lodash/isEmpty"
 
 import ace from "brace"
@@ -167,7 +167,7 @@ export default function makeEditor({ editorPluginsToRun }) {
 
     componentWillReceiveProps(nextProps) {
       let { state } = this
-      let hasChanged = (k) => !eq(nextProps[k], this.props[k])
+      let hasChanged = (k) => !isEqual(nextProps[k], this.props[k])
       let wasEmptyBefore = (k) => nextProps[k] && (!this.props[k] || isEmpty(this.props[k]))
 
       this.updateErrorAnnotations(nextProps)

src/plugins/validation/apis/index.js

@@ -4,17 +4,34 @@ import { makeValidationWorker } from "../helpers"
 
 let debouncedValidation = makeValidationWorker()
 
-export const updateResolved = (ori, {errActions, specSelectors}) => (...args) => {
+export const updateResolved = (ori, {specActions}) => (...args) => {
   ori(...args)
+  /*
+    To allow us to remove this, we should prefer the practice of
+    only _composing_ inside of wrappedActions. It keeps us free to
+    remove pieces added by plugins. In this case, I want to toggle validation.
+    But I can't look inside the updateResolved action,
+    I can only remove it ( which isn't desirable ). However I _can_ remove `validateSpec` action,
+    making it a noop. That way, the only overhead I end up with is a bunch of noops inside wrappedActions.
+    Which isn't bad.
+  */
+  const [ spec ] = args
+  specActions.validateSpec(spec)
+}
+
+export const validateSpec = (resolvedSpec) => ({ specSelectors, errActions }) => {
   const isOAS3 = specSelectors.isOAS3 ? specSelectors.isOAS3() : false
   const ourMode = isOAS3 ? "oas3" : "swagger2"
-  debouncedValidation({ mode: ourMode, specSelectors, errActions, resolvedSpec: args[0] })
+  debouncedValidation({ mode: ourMode, specSelectors, errActions, resolvedSpec })
 }
 
 export default function() {
   return {
     statePlugins: {
       spec: {
+        actions: {
+          validateSpec,
+        },
         wrapActions: {
           updateResolved
         }