Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-4436: 

- Minor UX tweaks.
- Updating imports due to refactoring of Registry models.
- Fixing checkstyle issues.
This commit is contained in:
Matt Gilman 2017-12-15 09:49:13 -05:00 committed by Bryan Bende
parent 416b86145f
commit c5b0931e55
No known key found for this signature in database
GPG Key ID: A0DDA9ED50711C39
9 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
View File

@ -1289,7 +1289,7 @@ public interface NiFiServiceFacade {
* Returns a FlowComparisonEntity that contains all of the local modifications since the Process Group
* was last synchronized with the Flow Registry
*
* @param processGroupId
* @param processGroupId the ID of the Process Group
* @return a FlowComparisonEntity that contains all of the local modifications since the Process Group
* was last synchronized with the Flow Registry
* @throws IllegalStateException if the Process Group with the given ID is not under version control
@ -1455,8 +1455,8 @@ public interface NiFiServiceFacade {
* update the contents of that Process Group
* @return the Process Group
*/
ProcessGroupEntity updateProcessGroupContents(NiFiUser user, Revision revision, String groupId, VersionControlInformationDTO versionControlInfo, VersionedFlowSnapshot snapshot, String componentIdSeed,
boolean verifyNotModified, boolean updateSettings, boolean updateDescendantVersionedFlows);
ProcessGroupEntity updateProcessGroupContents(NiFiUser user, Revision revision, String groupId, VersionControlInformationDTO versionControlInfo, VersionedFlowSnapshot snapshot,
String componentIdSeed, boolean verifyNotModified, boolean updateSettings, boolean updateDescendantVersionedFlows);
// ----------------------------------------
// Component state methods

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
View File

@ -87,6 +87,7 @@ import org.apache.nifi.history.History;
import org.apache.nifi.history.HistoryQuery;
import org.apache.nifi.history.PreviousValue;
import org.apache.nifi.registry.ComponentVariableRegistry;
import org.apache.nifi.registry.authorization.Permissions;
import org.apache.nifi.registry.bucket.Bucket;
import org.apache.nifi.registry.client.NiFiRegistryException;
import org.apache.nifi.registry.flow.FlowRegistry;
@ -115,7 +116,6 @@ import org.apache.nifi.registry.flow.mapping.InstantiatedVersionedProcessGroup;
import org.apache.nifi.registry.flow.mapping.InstantiatedVersionedProcessor;
import org.apache.nifi.registry.flow.mapping.InstantiatedVersionedRemoteGroupPort;
import org.apache.nifi.registry.flow.mapping.NiFiRegistryFlowMapper;
import org.apache.nifi.registry.model.authorization.Permissions;
import org.apache.nifi.remote.RemoteGroupPort;
import org.apache.nifi.remote.RootGroupPort;
import org.apache.nifi.reporting.Bulletin;

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/import-flow-version-dialog.jsp
View File

@ -25,7 +25,7 @@
</div>
</div>
<div class="setting">
<div class="setting-name">Location</div>
<div class="setting-name">Bucket</div>
<div class="setting-field">
<div id="import-flow-version-bucket-combo"></div>
<div id="import-flow-version-bucket" class="hidden"></div>

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/save-flow-version-dialog.jsp
View File

@ -19,14 +19,13 @@
<div class="dialog-content">
<div class="setting">
<div class="setting-name">Registry</div>
<div id="save-flow-version-registry-container" class="setting-field">
<div class="setting-field">
<div id="save-flow-version-registry-combo" class="hidden"></div>
<div id="save-flow-version-registry" class="hidden"></div>
<div id="save-flow-version-label"></div>
</div>
</div>
<div class="setting">
<div class="setting-name">Location</div>
<div class="setting-name">Bucket</div>
<div class="setting-field">
<div id="save-flow-version-bucket-combo" class="hidden"></div>
<div id="save-flow-version-bucket" class="hidden"></div>
@ -34,10 +33,11 @@
</div>
<div class="setting">
<div class="setting-name">Name</div>
<div class="setting-field">
<div id="save-flow-version-registry-container" class="setting-field">
<span id="save-flow-version-process-group-id" class="hidden"></span>
<input type="text" id="save-flow-version-name-field" class="setting-input hidden"/>
<div id="save-flow-version-name" class="hidden"></div>
<div id="save-flow-version-label"></div>
</div>
</div>
<div class="setting">

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css
View File

@ -224,7 +224,7 @@ div.progress-label {
height: 85px;
}
#save-flow-version-registry-combo, #save-flow-version-registry {
#save-flow-version-name-field, #save-flow-version-name {
width: 100%;
margin-right: 10px;
}

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/flow-status.css
View File

@ -67,6 +67,10 @@
padding-left: 5px;
}
#flow-status-container {
width: 90%;
}
#search-container {
overflow: hidden;
height: 32px;

9
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
View File

@ -609,14 +609,6 @@
});
};
// define a function for update the flow status dimensions
var updateFlowStatusContainerSize = function () {
$('#flow-status-container').css({
'width': ((($('#nifi-logo').width() + $('#component-container').width())/$(window).width())*100)*2 + '%'
});
};
updateFlowStatusContainerSize();
// listen for events to go to components
$('body').on('GoTo:Component', function (e, item) {
nfCanvasUtils.showComponent(item.parentGroupId, item.id);
@ -641,7 +633,6 @@
}
updateGraphSize();
updateFlowStatusContainerSize();
// resize shell when appropriate
var shell = $('#shell-dialog');

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
View File

@ -541,7 +541,9 @@
}
// check the selection for version control information
return versionControlInformation.state !== 'LOCALLY_MODIFIED' && versionControlInformation.state !== 'LOCALLY_MODIFIED_AND_STALE';
return versionControlInformation.state !== 'LOCALLY_MODIFIED' &&
versionControlInformation.state !== 'LOCALLY_MODIFIED_AND_STALE' &&
versionControlInformation.state !== 'SYNC_FAILURE';
};
/**

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/views/nf-ng-breadcrumbs-directive-view.html
View File

@ -22,7 +22,7 @@ limitations under the License.
<span ng-if="separatorFunc(crumb.parentBreadcrumb)" style="margin: 0 12px;">
&raquo;
</span>
<span ng-if="isTracking(crumb)" title="{{getVersionControlTooltip(crumb)}}" class="{{getVersionControlClass(crumb)}}" style="margin: 0 6px;"></span>
<span ng-if="isTracking(crumb)" title="{{getVersionControlTooltip(crumb)}}" class="{{getVersionControlClass(crumb)}}" style="margin-right: 6px;"></span>
<span class="link"
ng-class="(highlightCrumbId === crumb.id) ? 'link-bold' : ''"
ng-click="clickFunc(crumb.id)">