Revert "Link to full node log from the window"

Author: svanoort

rest-api/src/main/java/com/cloudbees/workflow/rest/endpoints/RunAPI.java

@@ -39,7 +39,6 @@
 import org.jenkinsci.plugins.workflow.support.steps.input.InputStepExecution;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
-import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -97,7 +96,7 @@ public RunExt doIndex() {
         return doDescribe();
     }
 
-    @Restricted(NoExternalUse.class) // WebMethod
+    @Restricted(DoNotUse.class) // WebMethod
     @ServeJson
     public RunExt doDescribe() {
         return RunExt.create(getRun()).createWrapper();

rest-api/src/main/java/com/cloudbees/workflow/rest/external/AtomFlowNodeExt.java

@@ -25,7 +25,6 @@
 
 import com.cloudbees.workflow.rest.endpoints.flownode.Log;
 import com.cloudbees.workflow.rest.hal.Link;
-import com.cloudbees.workflow.util.ModelUtil;
 import org.jenkinsci.plugins.workflow.actions.ErrorAction;
 import org.jenkinsci.plugins.workflow.actions.LogAction;
 import org.jenkinsci.plugins.workflow.graph.FlowNode;
@@ -70,10 +69,8 @@ public static AtomFlowNodeExt create(FlowNode node, String execNodeName, ExecDur
         // It would be super awesome if we didn't need to make a throwaway object
         basic.addBasicNodeData(node, execNodeName, duration, startTimeMillis, status, error);
         if (basic.getStatus() != StatusExt.NOT_EXECUTED && Stapler.getCurrentRequest() != null) {
-            LogAction la = node.getAction(LogAction.class);
-            if (la != null) {
+            if (node.getAction(LogAction.class) != null) {
                 basic.get_links().setLog(Link.newLink(Log.getUrl(node)));
-                basic.get_links().setConsole(Link.newLink(ModelUtil.getFullItemUrl(node) + la.getUrlName()));
             }
         }
         basic.addParentNodeRefs(node);

rest-api/src/main/java/com/cloudbees/workflow/rest/external/FlowNodeExt.java

@@ -143,10 +143,7 @@ public void setPauseDurationMillis(long pauseDurationMillis) {
     }
 
     public static final class FlowNodeLinks extends Links {
-        /** Link to rest API for the console */
         private Link log;
-        /** Link to the human consumable console page */
-        private Link console;
 
         @JsonInclude(JsonInclude.Include.NON_NULL)
         public Link getLog() {
@@ -156,15 +153,6 @@ public Link getLog() {
         public void setLog(Link log) {
             this.log = log;
         }
-
-        @JsonInclude(JsonInclude.Include.NON_NULL)
-        public Link getConsole() {
-            return console;
-        }
-
-        public void setConsole(Link console) {
-            this.console = console;
-        }
     }
 
     public static FlowNodeExt create(FlowNode node) {

rest-api/src/test/java/com/cloudbees/workflow/rest/endpoints/FlowNodeAPITest.java

@@ -25,7 +25,6 @@
 
 import com.cloudbees.workflow.Util;
 import com.cloudbees.workflow.rest.external.AtomFlowNodeExt;
-import com.cloudbees.workflow.rest.external.FlowNodeExt;
 import com.cloudbees.workflow.rest.external.FlowNodeLogExt;
 import com.cloudbees.workflow.rest.external.RunExt;
 import com.cloudbees.workflow.rest.external.StageNodeExt;
@@ -134,10 +133,8 @@ private void assert_log_ok(JenkinsRule.WebClient webClient, JSONReadWrite jsonRe
         jsonResponse = stageDescription.getWebResponse().getContentAsString();
         StageNodeExt stageDesc = jsonReadWrite.fromString(jsonResponse, StageNodeExt.class);
 
-        FlowNodeExt.FlowNodeLinks links = stageDesc.getStageFlowNodes().get(0).get_links();
-        String logUrl = links.getLog().href;
+        String logUrl = stageDesc.getStageFlowNodes().get(0).get_links().getLog().href;
         Assert.assertEquals("/jenkins/job/Noddy%20Job/1/execution/node/6/wfapi/log", logUrl);
-        Assert.assertEquals("/jenkins/job/Noddy%20Job/1/execution/node/6/log", links.getConsole().href);
 
         Page nodeLog = webClient.goTo(Util.removeRootUrl(logUrl), "application/json");
         jsonResponse = nodeLog.getWebResponse().getContentAsString();

ui/src/main/js/view/templates/stage-logs.hbs

@@ -4,14 +4,11 @@
         {{#if this._links.log.href}}
         <div class="node-log-frame {{this.status}}" cbwf-controller="node-log" objectUrl="{{this._links.log.href}}">
             <div class="node-name"><span class="glyphicon glyphicon-collapse-down" title="Expand"></span><span class="glyphicon glyphicon-collapse-up" title="Collapse"></span>
-                <a class="log-link" href="{{this._links.console.href}}">
                 {{this.name}}
                 {{#if this.parameterDescription}}
-                    -- {{this.parameterDescription}}
+                    -- {{this.parameterDescription}} --
                 {{/if}}
-                </a>
                 {{#if this.durationMillis}} (self time {{formatTime this.durationMillis}}){{/if}}
-
             </div>
             <div class="log-details"></div>
         </div>
@@ -22,4 +19,4 @@
         {{/if}}
         {{/ifCond}}
     {{/each}}
-</div>
+</div>