From 284ec6b5027af583d0bc9f2331e8a717cf3d4c54 Mon Sep 17 00:00:00 2001
From: Kin Ueng <kueng@us.ibm.com>
Date: Thu, 9 Nov 2017 10:39:10 -0600
Subject: [PATCH 1/5] Add the guide release date

---
 .../circuit-breaker/circuit-breaker-guide.html                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/interactive-guides/circuit-breaker/circuit-breaker-guide.html b/html/interactive-guides/circuit-breaker/circuit-breaker-guide.html
index e7748fcf..69b303c3 100644
--- a/html/interactive-guides/circuit-breaker/circuit-breaker-guide.html
+++ b/html/interactive-guides/circuit-breaker/circuit-breaker-guide.html
@@ -38,5 +38,6 @@
 - interactive-guides/circuit-breaker/circuit-breaker-callback
 - interactive-guides/circuit-breaker/circuit-breaker-guide
 duration: 25 minutes
+date: 2017-10-03
 permalink: /guides/circuit-breaker
 ---

From 8dce66ccecef3554e98335ee7eef511d6c3183b7 Mon Sep 17 00:00:00 2001
From: Kin Ueng <31117513+kinueng@users.noreply.github.com>
Date: Fri, 10 Nov 2017 14:59:26 -0600
Subject: [PATCH 2/5] Revert "Add the guide release date"

---
 .../circuit-breaker/circuit-breaker-guide.html                   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/html/interactive-guides/circuit-breaker/circuit-breaker-guide.html b/html/interactive-guides/circuit-breaker/circuit-breaker-guide.html
index 69b303c3..e7748fcf 100644
--- a/html/interactive-guides/circuit-breaker/circuit-breaker-guide.html
+++ b/html/interactive-guides/circuit-breaker/circuit-breaker-guide.html
@@ -38,6 +38,5 @@
 - interactive-guides/circuit-breaker/circuit-breaker-callback
 - interactive-guides/circuit-breaker/circuit-breaker-guide
 duration: 25 minutes
-date: 2017-10-03
 permalink: /guides/circuit-breaker
 ---

From da9daad30ecfc0257695a5b54537b870b58fb349 Mon Sep 17 00:00:00 2001
From: steven1046 <stevenzvonek1992@gmail.com>
Date: Mon, 13 Nov 2017 08:44:21 -0600
Subject: [PATCH 3/5] Refactor the editor error codes from the callback file
 into the common editor.js code

---
 .../circuit-breaker-callback.js               | 96 +++----------------
 1 file changed, 14 insertions(+), 82 deletions(-)

diff --git a/js/interactive-guides/circuit-breaker/circuit-breaker-callback.js b/js/interactive-guides/circuit-breaker/circuit-breaker-callback.js
index adcf5e1d..3d972dca 100644
--- a/js/interactive-guides/circuit-breaker/circuit-breaker-callback.js
+++ b/js/interactive-guides/circuit-breaker/circuit-breaker-callback.js
@@ -195,7 +195,7 @@ var circuitBreakerCallBack = (function() {
             var content = contentManager.getEditorContents(stepName);
             var paramsToCheck = [];
             if (__checkCircuitBreakerAnnotationInContent(content, paramsToCheck, stepName) === true) {
-                __closeErrorBoxEditor(stepName);
+                editor.closeErrorBoxEditor(stepName);
                 contentManager.markCurrentInstructionComplete(stepName);
                 contentManager.setPodContentWithRightSlide(stepName,
                   /*
@@ -210,7 +210,7 @@ var circuitBreakerCallBack = (function() {
             } else {
                 // display error
 
-                __createErrorLinkForCallBack(stepName, true);
+                editor.createErrorLinkForCallBack(stepName, true);
             }
         };
         editor.addSaveListener(__showPodWithCircuitBreaker);
@@ -255,7 +255,7 @@ var circuitBreakerCallBack = (function() {
             }
 
             if (updateSuccess) {
-                __closeErrorBoxEditor(stepName);
+                editor.closeErrorBoxEditor(stepName);
                 if (stepName === "ConfigureFailureThresholdParams") {
                     var stepPod = contentManager.getPod("ConfigureFailureThresholdParams", 0).accessPodContent();
                     var breadcrumbElement = stepPod.find('.failureThresholdSteps > .stepProgression > .tabContainer-tabs > .nav-tabs');
@@ -307,7 +307,7 @@ var circuitBreakerCallBack = (function() {
                 );
             } else {
                 // display error and provide link to fix it
-                __createErrorLinkForCallBack(stepName, true);
+                editor.createErrorLinkForCallBack(stepName, true);
             }
         };
         editor.addSaveListener(__showPodWithCircuitBreakerAndFallback);
@@ -316,7 +316,7 @@ var circuitBreakerCallBack = (function() {
     var __listenToEditorForCircuitBreakerAnnotationChanges = function(editor){
         var __listenToContentChanges = function(editorInstance, changes) {
             // Get pod from contentManager
-            var cb = contentManager.getCircuitBreaker(editor.getStepName());            
+            var cb = contentManager.getPlayground(editor.getStepName());            
             // Get the parameters from the editor and send to the circuitBreaker
             var content = editor.getEditorContent();
             try{
@@ -377,71 +377,6 @@ var circuitBreakerCallBack = (function() {
         }
     };
 
-    var __createButton = function(buttonId, buttonName, className, method, ariaLabel) {
-        return $('<button/>', {
-            type: 'button',
-            text: buttonName,
-            id: buttonId,
-            class: className,
-            click: method,
-            'aria-label': ariaLabel
-        });
-    };
-
-    var __closeErrorBoxEditor = function(stepName) {
-        var step = $("[data-step=" + stepName + "]");
-        var editorError = step.find(".alertFrame").first();
-
-        if (editorError.length) {
-            editorError.addClass("hidden");
-        }
-    };
-
-    var __createErrorLinkForCallBack = function(stepName, isSave, fallback) {
-        var idHere = "here_button_error_editor_" + stepName;
-        var idClose = "close_button_error_editor_" + stepName;
-        var idError = "error_" + stepName;
-
-        var thisStepName = stepName;
-        var thisIsSave = isSave;
-        var thisFallback = fallback;
-
-        var handleOnClickAnnotation = function() {
-            __correctEditorError(thisStepName, thisIsSave, thisFallback);
-        };
-
-        var handleOnClickClose = function() {
-            __closeErrorBoxEditor(thisStepName);
-        };
-
-        var step = $("[data-step=" + stepName + "]");
-        var editorError = step.find(".alertFrame").first();
-        if (editorError.length) {
-            editorError.removeClass("hidden");
-
-            var errorLink = editorError.find("#" + idError).first();
-            if (errorLink.length) {
-                // button exists
-                // unbind the previous click of this button id
-                // before bind it to a new onclick
-                $("#" + idHere).unbind("click");
-                $("#" + idHere).bind("click", handleOnClickAnnotation);
-            } else {
-
-                var hereButton = __createButton(idHere, messages.hereButton, "here_button_error_editor", handleOnClickAnnotation, "Here");
-                var closeButton = __createButton(idClose, "", "glyphicon glyphicon-remove-circle close_button_error_editor", handleOnClickClose, "Close error");
-                var strMsg = "Error detected. To fix the error click ";
-                //var strMsg = utils.formatString(messages.editorErrorLink, [hereButton]);
-
-                var spanStr = '<span id=\"' + idError + '\">' + strMsg;
-                editorError.append(spanStr);
-                editorError.append(hereButton);
-                editorError.append(closeButton);
-                editorError.append('</span>');
-            }
-        }
-    };
-
     var __correctEditorError = function(stepName, isSave, fallback) {
         // correct annotation/method
         if (stepName === "AddFallBack") {
@@ -467,8 +402,6 @@ var circuitBreakerCallBack = (function() {
         } else {
             __addCircuitBreakerAnnotation(stepName);
         }
-        // hide the error box
-        __closeErrorBoxEditor(stepName);
         // call save editor
         if (isSave === true) {
            __saveButtonEditor(stepName);
@@ -755,7 +688,7 @@ var circuitBreakerCallBack = (function() {
             } else {
                 // display error
 
-                __createErrorLinkForCallBack(stepName);
+                editor.createErrorLinkForCallBack(stepName, true, __correctEditorError);
             }
         }
     };
@@ -931,25 +864,25 @@ var circuitBreakerCallBack = (function() {
         root.find(".circuitBreakerReset").on("click", function(){
             cb.closeCircuit();
         });
-        contentManager.setCircuitBreaker(stepName, cb, 0);
+        contentManager.setPlayground(stepName, cb, 0);
     };
 
-    var __saveServerXML = function() {
+    var __saveServerXML = function(editor) {
         var stepName = stepContent.getCurrentStepName();
         var content = contentManager.getEditorContents(stepName);
         if (__checkMicroProfileFaultToleranceFeatureContent(content)) {
-            __closeErrorBoxEditor(stepName);
+            editor.closeEditorErrorBox(stepName);
             var stepName = stepContent.getCurrentStepName();
             contentManager.markCurrentInstructionComplete(stepName);
         } else {
             // display error to fix it
-            __createErrorLinkForCallBack(stepName, true);
+            editor.createErrorLinkForCallBack(stepName, true, __correctEditorError);
         }
     };
 
     var __listenToEditorForFeatureInServerXML = function(editor) {
-        var saveServerXML = function() {
-            __saveServerXML();
+        var saveServerXML = function(editor) {
+            __saveServerXML(editor);
         };
         editor.addSaveListener(saveServerXML);
     };
@@ -958,7 +891,8 @@ var circuitBreakerCallBack = (function() {
         if (event.type === "click" ||
            (event.type === "keypress" && (event.which === 13 || event.which === 32))) {
             // Click or 'Enter' or 'Space' key event...
-            __saveServerXML();
+            contentManager.saveEditor(stepContent.getCurrentStepName());
+            // __saveServerXML();
         }
     };
 
@@ -979,8 +913,6 @@ var circuitBreakerCallBack = (function() {
         enterButtonURLCheckBalance: __enterButtonURLCheckBalance,
         saveButtonEditorButton: __saveButtonEditorButton,
         refreshButtonBrowser: __refreshButtonBrowser,
-        correctEditorError: __correctEditorError,
-        closeErrorBoxEditor: __closeErrorBoxEditor,
         saveServerXMLButton: __saveServerXMLButton,
         listenToEditorForFeatureInServerXML: __listenToEditorForFeatureInServerXML
     };

From 2e703d75f4dce2cfc53e9d1c5839a4a31b7806f3 Mon Sep 17 00:00:00 2001
From: steven1046 <stevenzvonek1992@gmail.com>
Date: Mon, 13 Nov 2017 08:51:27 -0600
Subject: [PATCH 4/5] Fix more calls for refactoring the common error code

---
 .../circuit-breaker/circuit-breaker-callback.js        | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/js/interactive-guides/circuit-breaker/circuit-breaker-callback.js b/js/interactive-guides/circuit-breaker/circuit-breaker-callback.js
index 3d972dca..24802f72 100644
--- a/js/interactive-guides/circuit-breaker/circuit-breaker-callback.js
+++ b/js/interactive-guides/circuit-breaker/circuit-breaker-callback.js
@@ -195,7 +195,6 @@ var circuitBreakerCallBack = (function() {
             var content = contentManager.getEditorContents(stepName);
             var paramsToCheck = [];
             if (__checkCircuitBreakerAnnotationInContent(content, paramsToCheck, stepName) === true) {
-                editor.closeErrorBoxEditor(stepName);
                 contentManager.markCurrentInstructionComplete(stepName);
                 contentManager.setPodContentWithRightSlide(stepName,
                   /*
@@ -209,8 +208,7 @@ var circuitBreakerCallBack = (function() {
                 );
             } else {
                 // display error
-
-                editor.createErrorLinkForCallBack(stepName, true);
+                editor.createErrorLinkForCallBack(stepName, true, __correctEditorError);
             }
         };
         editor.addSaveListener(__showPodWithCircuitBreaker);
@@ -255,7 +253,6 @@ var circuitBreakerCallBack = (function() {
             }
 
             if (updateSuccess) {
-                editor.closeErrorBoxEditor(stepName);
                 if (stepName === "ConfigureFailureThresholdParams") {
                     var stepPod = contentManager.getPod("ConfigureFailureThresholdParams", 0).accessPodContent();
                     var breadcrumbElement = stepPod.find('.failureThresholdSteps > .stepProgression > .tabContainer-tabs > .nav-tabs');
@@ -286,7 +283,7 @@ var circuitBreakerCallBack = (function() {
             } else {
                 // display error
 
-                __createErrorLinkForCallBack(stepName, true);
+                editor.createErrorLinkForCallBack(stepName, true, __correctEditorError);
             }
         };
         editor.addSaveListener(__hideEditor);
@@ -300,14 +297,13 @@ var circuitBreakerCallBack = (function() {
             var fallbackMethod = "private Service fallbackService()";
             if (__checkFallbackAnnotationContent(content) === true &&
                 __checkFallbackMethodContent(content) === true) {
-                __closeErrorBoxEditor(stepName);
                 contentManager.markCurrentInstructionComplete(stepName);
                 contentManager.setPodContentWithRightSlide(stepName,
                     "<img src='/guides/iguide-circuit-breaker/html/interactive-guides/circuit-breaker/images/added-fallback.svg' alt='Check Balance microservice with Circuit Breaker and Fallback policies' class='picInPod'>"
                 );
             } else {
                 // display error and provide link to fix it
-                editor.createErrorLinkForCallBack(stepName, true);
+                editor.createErrorLinkForCallBack(stepName, true, __correctEditorError);
             }
         };
         editor.addSaveListener(__showPodWithCircuitBreakerAndFallback);

From 4a9dd19e8d469c5d9ed78c1a419fef868572128b Mon Sep 17 00:00:00 2001
From: Kin Ueng <kueng@us.ibm.com>
Date: Fri, 17 Nov 2017 15:27:58 -0600
Subject: [PATCH 5/5] Add release date

---
 .../circuit-breaker/circuit-breaker-guide.html                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/interactive-guides/circuit-breaker/circuit-breaker-guide.html b/html/interactive-guides/circuit-breaker/circuit-breaker-guide.html
index e7748fcf..d89e6aee 100644
--- a/html/interactive-guides/circuit-breaker/circuit-breaker-guide.html
+++ b/html/interactive-guides/circuit-breaker/circuit-breaker-guide.html
@@ -38,5 +38,6 @@
 - interactive-guides/circuit-breaker/circuit-breaker-callback
 - interactive-guides/circuit-breaker/circuit-breaker-guide
 duration: 25 minutes
+releasedate: 2017-10-03
 permalink: /guides/circuit-breaker
 ---