Skip to content

feat: ucc as npm package #31

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

Draft
soleksy-splunk wants to merge 19 commits into
base: main
Choose a base branch
from
Draft

feat: ucc as npm package #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c40c740
chore: add add-on-ucc-framework as ui dependency
vtsvetkov-splunk Feb 17, 2025
4dea502
update packages
vtsvetkov-splunk Feb 19, 2025
394c9af
wip
vtsvetkov-splunk Mar 2, 2025
36ad3be
somewhat working (except custom controls)
vtsvetkov-splunk Mar 4, 2025
074a60c
wip
soleksy-splunk Apr 1, 2025
35a3ba9
custom components class shared via init
soleksy-splunk Apr 3, 2025
619eba6
build by ucc gen ui command
soleksy-splunk Apr 12, 2025
8d6f9b1
lazy loaded components
soleksy-splunk Apr 12, 2025
c32f099
cleanup
soleksy-splunk Apr 12, 2025
0a5a642
output dir to build script
soleksy-splunk Apr 14, 2025
fb545e6
correct component structure
soleksy-splunk Apr 20, 2025
0aac5cf
use new ucc version
soleksy-splunk May 19, 2025
f8c77e2
align lock
soleksy-splunk May 19, 2025
6be82e7
remove lib in additional packaging
soleksy-splunk May 19, 2025
3c7a6dc
fix linters
soleksy-splunk May 20, 2025
a900689
add upload to appinspect arfitifacts
soleksy-splunk May 20, 2025
ae961dc
updated appinspect push
soleksy-splunk May 20, 2025
8e8d6e6
result?
soleksy-splunk May 20, 2025
8ad720d
result?
soleksy-splunk May 20, 2025
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
7 changes: 6 additions & 1 deletion .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,12 @@ jobs:
with:
app_path: build/package
included_tags: ${{ matrix.tags }}

- name: upload-manual-check-appinspect
uses: actions/upload-artifact@v4
if: always()
with:
name: appinspect-api-html-report-${{ matrix.tags }}
path: appinspect_result.json
psa-test:
runs-on: ubuntu-22.04
needs:
Expand Down
6 changes: 6 additions & 0 deletions additional_packaging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import os
from os import path
import shutil


def additional_packaging(addon_name: str) -> None:
Expand All @@ -16,3 +17,8 @@ def additional_packaging(addon_name: str) -> None:
return_code = os.system(build_ui_script)
if return_code != 0:
os._exit(os.WEXITSTATUS(return_code))

lib_dir = f"output/{addon_name}/appserver/static/js/lib"
print(f"Removing {lib_dir}", path.exists(lib_dir), path.isdir(lib_dir))
if path.exists(lib_dir) and path.isdir(lib_dir):
shutil.rmtree(lib_dir)
1 change: 1 addition & 0 deletions appinspect_result.json
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 40 additions & 0 deletions package/appserver/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<!--
~ Copyright 2025 Splunk Inc.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<%! 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>${_('Loading')}</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/entry_page.js" %>

<script type="module" src="${make_url(page_path)}"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pytest-splunk-addon==5.4.1
splunk-add-on-ucc-framework==5.58.0
splunk-add-on-ucc-framework==5.65.0
2 changes: 1 addition & 1 deletion scripts/build_ui.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ else
npm --prefix "$SCRIPT_DIR/../ui" install
fi

npm --prefix "$SCRIPT_DIR/../ui" run build
npm --prefix "$SCRIPT_DIR/../ui" run ucc-gen
Loading