Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #24679: File picker is broken in 8.0 #5582

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Fixes #24679: File picker is broken in 8.0 #5582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 0 additions & 37 deletions webapp/sources/rudder/rudder-web/src/main/elm/sources/FileManager/wrapper.js
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,18 +593,12 @@ function createBadgeAgentPolicyModeMixed(data){
}

function showFileManager(idField){

console.log(idField)
fm.ports.onOpen.send(null);

fm.ports.close.subscribe(function(files) {
console.log(files)

if(files.length > 0){
var inputField = $("#" + idField + "-fileInput")
inputField.val(files[0].substring(1));
}

});
}

Expand Down
67 changes: 47 additions & 20 deletions ...es/rudder/rudder-web/src/main/webapp/secure/configurationManager/directiveManagement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<title>Rudder - Directives Management</title>
<link media="screen" data-lift="with-cached-resource" href="/style/rudder/rudder-directives.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-filemanager.css" />
<script type="text/javascript" data-lift="with-cached-resource" src="/javascript/rudder/tree-tag-plugin.js"></script>
<script type="text/javascript" data-lift="with-cached-resource" src="/javascript/rudder/directive.js"></script>
<script type="text/javascript" data-lift="with-cached-resource" src="/javascript/rudder/elm/rudder-directivecompliance.js"></script>
Expand All @@ -15,7 +16,7 @@
<div data-lift="configuration.DirectiveManagement.head"></div>

<div class="rudder-template">

<div id="filemanager-editor"></div>

<div class="template-sidebar sidebar-left">

Expand All @@ -34,25 +35,6 @@ <h1>Directives</h1>
</div>
</div>
<div data-lift="configuration.DirectiveManagement.userLibrary" ></div>
<script>
var main = document.getElementById("filters-app")
var initValues = {
contextPath : contextPath,
objectType : "directive"
};
filterApp = Elm.Filters.init({node: main, flags: initValues});
filterApp.ports.toggleTree.subscribe(function(result) {
toggleTree('#activeTechniquesTree', this);
});
filterApp.ports.searchTree.subscribe(function(filters) {
$("#activeTechniquesTree").jstree("searchtag", filters.filter, filters.tags, {"key":false , "value":false});
});
filterApp.ports.sendFilterTags.subscribe(function(tags) {
if (typeof tagsApp === "undefined") return false;
tagsApp.ports.getFilterTags.send(tags);
});
$(".bsTooltip").bsTooltip({container: "#boxDirectiveTree" })
</script>
</div>
</div>

Expand Down Expand Up @@ -111,5 +93,50 @@ <h4>Characteristics</h4>
</div>
</div>
</div>
<script>
var hasWriteRights = false;
</script>
<lift:authz role="directive_write">
<script>
var hasWriteRights = true;
</script>
</lift:authz>
<script>
var baseUrl = contextPath ? contextPath : "/rudder";
var apiPath = baseUrl + '/secure/api/sharedfile';

var container = document.getElementById("filemanager-editor");
var fm = Elm.FileManager.init({
node: container,
flags: {
api: apiPath,
thumbnailsUrl: apiPath,
downloadsUrl: apiPath,
dir: "/",
hasWriteRights : hasWriteRights,
initRun : true
}
});
fm.ports.errorNotification.subscribe(function(errorMessage) {
createErrorNotification(errorMessage);
});

var main = document.getElementById("filters-app")
var initValues = {
contextPath : contextPath,
objectType : "directive"
};
filterApp = Elm.Filters.init({node: main, flags: initValues});
filterApp.ports.toggleTree.subscribe(function(result) {
toggleTree('#activeTechniquesTree', this);
});
filterApp.ports.searchTree.subscribe(function(filters) {
$("#activeTechniquesTree").jstree("searchtag", filters.filter, filters.tags, {"key":false , "value":false});
});
filterApp.ports.sendFilterTags.subscribe(function(tags) {
if (typeof tagsApp === "undefined") return false;
tagsApp.ports.getFilterTags.send(tags);
});
$(".bsTooltip").bsTooltip({container: "#boxDirectiveTree" })
</script>
</lift:surround>
12 changes: 0 additions & 12 deletions ...er/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,6 @@
height: initial !important;
}
</style>
<link rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-filemanager.css" />

<script>
var hasWriteRights = false;
</script>

<lift:authz role="directive_write">
<script>
var hasWriteRights = true;
</script>
</lift:authz>

<div id="editForm">
<div class="main-header">
<div class="header-title">
Expand Down