-
Notifications
You must be signed in to change notification settings - Fork 73
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes #16337: Node details displays \"search\" form during page loading
- Loading branch information
Showing
8 changed files
with
130 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
...sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Node.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| ************************************************************************************* | ||
| * Copyright 2018 Normation SAS | ||
| ************************************************************************************* | ||
| * | ||
| * This file is part of Rudder. | ||
| * | ||
| * Rudder is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * In accordance with the terms of section 7 (7. Additional Terms.) of | ||
| * the GNU General Public License version 3, the copyright holders add | ||
| * the following Additional permissions: | ||
| * Notwithstanding to the terms of section 5 (5. Conveying Modified Source | ||
| * Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General | ||
| * Public License version 3, when you create a Related Module, this | ||
| * Related Module is not considered as a part of the work and may be | ||
| * distributed under the license agreement of your choice. | ||
| * A "Related Module" means a set of sources files including their | ||
| * documentation that, without modification of the Source Code, enables | ||
| * supplementary functions or services in addition to those offered by | ||
| * the Software. | ||
| * | ||
| * Rudder is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with Rudder. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| ************************************************************************************* | ||
| */ | ||
|
|
||
| package com.normation.rudder.web.snippet.node | ||
|
|
||
| import bootstrap.liftweb.RudderConfig | ||
| import com.normation.box._ | ||
| import com.normation.inventory.domain.NodeId | ||
| import com.normation.rudder.web.components.ShowNodeDetailsFromNode | ||
| import net.liftweb.common._ | ||
| import net.liftweb.http.S | ||
| import net.liftweb.http.StatefulSnippet | ||
|
|
||
| /** | ||
| * | ||
| * Snippet that handle the "searchNodes" page. | ||
| * | ||
| * Two main feature: | ||
| * - diplay details of a node | ||
| * - search for nodes based on a query | ||
| * | ||
| * Node details are ALWAYS load via Ajax (see parseHashtag method). | ||
| * Hashtag modification are detected with the hashchange" events, | ||
| * supported since ie8/ff3.6/chrome5/safari5 - as to say, | ||
| * immemorial times (see http://caniuse.com/hashchange for details) | ||
| * | ||
| */ | ||
|
|
||
| class Node extends StatefulSnippet with Loggable { | ||
|
|
||
| private[this] val getFullGroupLibrary = RudderConfig.roNodeGroupRepository.getFullGroupLibrary _ | ||
|
|
||
| private[this] val groupLibrary = getFullGroupLibrary().toBox match { | ||
| case Full(x) => x | ||
| case eb:EmptyBox => | ||
| val e = eb ?~! "Major error: can not get the node group library" | ||
| logger.error(e.messageChain) | ||
| throw new Exception(e.messageChain) | ||
| } | ||
|
|
||
| var dispatch : DispatchIt = { | ||
| case "details" => S.param("nodeId") match { | ||
| case eb: EmptyBox => | ||
| _ => <p>No node ID was given in URL. How did you get there?</p> | ||
| case Full(nodeId) => | ||
| val displayCompliance = S.param("displayCompliance") match { | ||
| case Full("true") => true | ||
| case _ => false | ||
| } | ||
| _ => new ShowNodeDetailsFromNode(new NodeId(nodeId), groupLibrary).display(false, displayCompliance) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/node.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <lift:surround with="common-layout" at="content"> | ||
|
|
||
| <head> | ||
| <title>Rudder - Search Nodes</title> | ||
| <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-tags.css" media="screen"> | ||
| <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-node.css" media="screen"> | ||
| <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/angular/elastic.min.js"></script> | ||
| <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/rudder/angular/auditMode.js"></script> | ||
| <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/rudder/angular/nodeProperties.js"></script> | ||
| </head> | ||
|
|
||
| <div class="portlet"> | ||
| <div class="portlet-header page-title">Nodes</div> | ||
| <div class="portlet-content"> | ||
| <div data-lift="node.SearchNodes.head"></div> | ||
| <div class="inner-portlet"> | ||
| <div class="inner-portlet-content"> | ||
| <div class="node-tab-content"> | ||
| <div id="serverDetails"> | ||
| <div data-lift="node.Node.details"></div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </lift:surround> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters