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

CI Migration for SplunkUI #109

Merged
merged 8 commits into from
Mar 1, 2021
Merged

CI Migration for SplunkUI #109

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
1412d6c
Merge pull request #98 from splunk/main
harshilgajera-crest Feb 11, 2021
bd099f4
ucc_ui_lib: migrate to splunk-ui template structure and ci
harshpatel-crest Feb 25, 2021
ef5c95a
removed old ucc ui lib
harshpatel-crest Feb 25, 2021
a949f40
ucc_ui_lib: update build scripts and circle ci config
harshpatel-crest Feb 25, 2021
79d4305
Merge branch 'test/ucc_ui_lib_migration_ci' into test/ci_migration_sp…
harshpatel-crest Feb 26, 2021
d234bfb
fix the output path for static files
harshpatel-crest Feb 26, 2021
6d08509
fix: commented oauth realated logic from ucc-gen temporarily
harshpatel-crest Feb 26, 2021
6328fdf
fix: title in input and configuration page templates
harshpatel-crest Feb 26, 2021
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
31 changes: 31 additions & 0 deletions ...ucc_framework/ucc_ui_lib/src/main/resources/splunk/appserver/templates/configuration.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<%!
app_name = cherrypy.request.path_info.split('/')[3]

%>\
<!doctype html>
<html class="no-js" lang="">

<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title>${_('Configuration')}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="apple-touch-icon" href="apple-touch-icon.png">
</head>

<body>
<script src="${make_url('/config?autoload=1')}" crossorigin="use-credentials"></script>
<script src="${make_url('/static/js/i18n.js')}"></script>
<script src="${make_url('/i18ncatalog?autoload=1')}"></script>
<script>
__splunkd_partials__ = ${json_decode(splunkd)};
</script>

<%
page_path = "/static/app/" + app_name + "/js/build/" + page + ".js"
%>

<script src="${make_url(page_path)}"></script>
</body>

</html>
4 changes: 2 additions & 2 deletions ...rces/splunk/appserver/templates/base.html → ...es/splunk/appserver/templates/inputs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title>${_('Loading...')}</title>
<title>${_('Inputs')}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="apple-touch-icon" href="apple-touch-icon.png">
</head>
Expand All @@ -22,7 +22,7 @@
</script>

<%
page_path = "/static/app/" + app_name + "/pages/" + page + ".js"
page_path = "/static/app/" + app_name + "/js/build/" + page + ".js"
%>

<script src="${make_url(page_path)}"></script>
Expand Down
2 changes: 1 addition & 1 deletion ...cc_framework/ucc_ui_lib/src/main/resources/splunk/default/data/ui/views/configuration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<view template="${package.name}:/templates/base.html" type="html" isDashboard="False">
<view template="${package.name}:/templates/configuration.html" type="html" isDashboard="False">
<label>Configuration</label>
</view>
2 changes: 1 addition & 1 deletion ...dd_on_ucc_framework/ucc_ui_lib/src/main/resources/splunk/default/data/ui/views/inputs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<view template="${package.name}:/templates/base.html" type="html" isDashboard="False">
<view template="${package.name}:/templates/inputs.html" type="html" isDashboard="False">
<label>Inputs</label>
</view>