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.

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

feat: Add iframe/widget endpoint for displaying widgets #4938

Merged
merged 2 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
3 changes: 3 additions & 0 deletions .github/workflows/update-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,18 @@ jobs:
echo "WEB_VERSION=$(npm info @deephaven/code-studio@latest version)" >> $GITHUB_OUTPUT
echo "GRID_VERSION=$(npm info @deephaven/embed-grid@latest version)" >> $GITHUB_OUTPUT
echo "CHART_VERSION=$(npm info @deephaven/embed-chart@latest version)" >> $GITHUB_OUTPUT
echo "WIDGET_VERSION=$(npm info @deephaven/embed-widget@latest version)" >> $GITHUB_OUTPUT
- name: Update deephaven-core
env:
WEB_VERSION: ${{steps.web_versions.outputs.WEB_VERSION}}
GRID_VERSION: ${{steps.web_versions.outputs.GRID_VERSION}}
CHART_VERSION: ${{steps.web_versions.outputs.CHART_VERSION}}
WIDGET_VERSION: ${{steps.web_versions.outputs.WIDGET_VERSION}}
run: |
sed -i "s/^ARG WEB_VERSION=.*/ARG WEB_VERSION=$WEB_VERSION/" ./web/client-ui/Dockerfile
sed -i "s/^ARG GRID_VERSION=.*/ARG GRID_VERSION=$GRID_VERSION/" ./web/client-ui/Dockerfile
sed -i "s/^ARG CHART_VERSION=.*/ARG CHART_VERSION=$CHART_VERSION/" ./web/client-ui/Dockerfile
sed -i "s/^ARG WIDGET_VERSION=.*/ARG WIDGET_VERSION=WIDGET_VERSION/" ./web/client-ui/Dockerfile
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public JettyBackedGrpcServer(
context.setInitParameter(DefaultServlet.CONTEXT_INIT + "dirAllowed", "false");

// Cache all of the appropriate assets folders
for (String appRoot : List.of("/ide/", "/iframe/table/", "/iframe/chart/")) {
for (String appRoot : List.of("/ide/", "/iframe/table/", "/iframe/chart/", "/iframe/widget/")) {
context.addFilter(NoCacheFilter.class, appRoot + "*", EnumSet.noneOf(DispatcherType.class));
context.addFilter(CacheFilter.class, appRoot + "assets/*", EnumSet.noneOf(DispatcherType.class));
}
Expand Down
10 changes: 10 additions & 0 deletions web/client-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ WORKDIR /usr/src/app
ARG WEB_VERSION=0.56.0
ARG GRID_VERSION=0.56.0
ARG CHART_VERSION=0.56.0
ARG WIDGET_VERSION=0.56.0

# Pull in the published code-studio package from npmjs and extract is
RUN set -eux; \
Expand All @@ -31,3 +32,12 @@ RUN set -eux; \
mv package/build iframe/chart; \
rm -r package; \
rm deephaven-embed-chart-${CHART_VERSION}.tgz;

# Pull in the published embed-widget package from npmjs and extract is
RUN set -eux; \
npm pack @deephaven/embed-widget@${WIDGET_VERSION}; \
tar --touch -xf deephaven-embed-widget-${WIDGET_VERSION}.tgz; \
mkdir -p iframe; \
mv package/build iframe/widget; \
rm -r package; \
rm deephaven-embed-widget-${WIDGET_VERSION}.tgz;
Loading