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

Issue 2912: Support folder browsing for static resources #2917

Merged
merged 8 commits into from
Nov 9, 2022
Merged

Issue 2912: Support folder browsing for static resources #2917

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5fbcdd9
Issue 2912: Support folder browsing for static resources
okolesn Nov 8, 2022
960af38
Issue 2912: Support folder browsing for static resources - freemarker…
okolesn Nov 8, 2022
0552570
Issue 2912: Support folder browsing for static resources + styles
okolesn Nov 9, 2022
5b0c948
Issue #2912 Check path type in the cloud
mzueva Nov 9, 2022
96c3267
Issue 2912: Support folder browsing for static resources + fix veloci…
okolesn Nov 9, 2022
68553c4
Issue #2912 Relative paths handling
mzueva Nov 9, 2022
b18faa9
Issue #2912 Support folder browsing in share srv
mzueva Nov 9, 2022
5bbfd0a
Issue #2912 Support folder browsing in share srv
mzueva Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Issue 2912: Support folder browsing for static resources + fix veloci… 
…ty template loading
  • Loading branch information
@okolesn
okolesn committed Nov 9, 2022
commit 96c3267c56018b1e6aa02fdd1d56f272128cf258
6 changes: 1 addition & 5 deletions api/src/main/java/com/epam/pipeline/manager/preference/SystemPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,12 +1092,8 @@ public class SystemPreferences {

// Static Resources Group
public static final StringPreference STATIC_RESOURCES_FOLDER_TEMPLATE_PATH =
new StringPreference("static.resources.folder.template.path", "classpath:views/",
new StringPreference("static.resources.folder.template.path", "classpath:/views/folder.vm",
STATIC_RESOURCES_GROUP, pass);
public static final StringPreference STATIC_RESOURCES_FOLDER_TEMPLATE =
new StringPreference("static.resources.folder.template", "folder.vm",
STATIC_RESOURCES_GROUP, pass);


private static final Pattern GIT_VERSION_PATTERN = Pattern.compile("(\\d)\\.(\\d)");

Expand Down
23 changes: 9 additions & 14 deletions api/src/main/java/com/epam/pipeline/manager/resource/StaticResourcesService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,16 @@
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.app.Velocity;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.springframework.util.ResourceUtils;

import java.io.ByteArrayInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Comparator;
Expand Down Expand Up @@ -69,31 +70,25 @@ public DataStorageStreamingContent getContent(final String path) {
final DataStorageItemType itemType = dataStorageManager.getItemType(storage, filePath, null);
if (itemType == DataStorageItemType.Folder) {
final List<AbstractDataStorageItem> items = dataStorageManager.getDataStorageItems(storage.getId(),
path, false, null, null).getResults();
final String tmplPath = preferenceManager.getPreference(
filePath, false, null, null).getResults();
final String templatePath = preferenceManager.getPreference(
SystemPreferences.STATIC_RESOURCES_FOLDER_TEMPLATE_PATH);
final String tmplName = preferenceManager.getPreference(SystemPreferences.STATIC_RESOURCES_FOLDER_TEMPLATE);
final String staticResourcesPrefix = preferenceManager.getPreference(SystemPreferences.BASE_API_HOST)
+ STATIC_RESOURCES;
final String html = buildHtml(items, tmplPath, tmplName, staticResourcesPrefix);
final String html = buildHtml(items, templatePath, staticResourcesPrefix);
return new DataStorageStreamingContent(new ByteArrayInputStream(html.getBytes()), filePath);
}
return dataStorageManager.getStreamingContent(storage.getId(), filePath, null);
}

public static String buildHtml(final List<AbstractDataStorageItem> items,
final String templatePath,
final String templateName,
final String staticResourcesPrefix) throws IOException{
final VelocityEngine engine = new VelocityEngine();
engine.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, templatePath);
engine.init();
final Template template = engine.getTemplate(templateName);
final VelocityContext velocityContext = new VelocityContext();
velocityContext.put("items", getHtmlStorageItems(items, staticResourcesPrefix));

final String template = IOUtils.toString(new FileReader(ResourceUtils.getFile(templatePath)));
try (StringWriter out = new StringWriter()) {
template.merge(velocityContext, out);
Velocity.evaluate(velocityContext, out, "folder", template);
return out.getBuffer().toString();
}
}
Expand Down
7 changes: 3 additions & 4 deletions api/src/test/java/com/epam/pipeline/manager/resource/StaticResourceServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@

public class StaticResourceServiceTest extends AbstractSpringTest {

private static final String TEMPLATES_PATH = "classpath:views/";
private static final String TEMPLATE_NAME = "folder.vm";
private static final String TEMPLATES_PATH = "classpath:/views/folder.vm";

@Autowired
private ApplicationContext context;
Expand All @@ -54,8 +53,8 @@ public void getHtmlContentTest() throws IOException {
123, "10/24/20, 9:27:20 PM");
items.add(file2);

assertThat(buildHtml(items, context.getResource(TEMPLATES_PATH).getFile().getAbsolutePath(),
TEMPLATE_NAME, "")).isNotBlank();
assertThat(buildHtml(items, context.getResource(TEMPLATES_PATH).getFile().getAbsolutePath(), ""))
.isNotBlank();
}

private DataStorageFolder getDataStorageFolder(final String name, final String path) {
Expand Down