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

Embeddable grid in iframes #1904

Merged
merged 4 commits into from
Feb 8, 2022
Merged

Embeddable grid in iframes #1904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
692be49
Pull in @deephaven/embed-grid for iframes
mofojed Jan 25, 2022
ff077ed
Change from 'embed-grid' to 'iframe/table' path
mofojed Jan 27, 2022
0ae629d
Use the published release instead of an alpha release
mofojed Jan 31, 2022
5174e80
Specify both IDE and embed-grid in the same Dockerfile
mofojed Feb 8, 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
3 changes: 3 additions & 0 deletions envoy/contents/envoy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ static_resources:
- match: # Application mode layout storage at this path
prefix: "/layouts"
route: { cluster: web }
- match: # Embed a widget for iframe support at this path
prefix: "/iframe"
route: { cluster: web }
- match: # Any GRPC call is assumed to be forwarded to the real service
prefix: "/"
route:
Expand Down
15 changes: 13 additions & 2 deletions web/client-ui/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,19 @@ WORKDIR /usr/src/app

ARG WEB_VERSION=0.9.1

# Pull in the published package from npmjs and extract is
# Pull in the published code-studio package from npmjs and extract is
RUN set -eux; \
npm pack @deephaven/code-studio@${WEB_VERSION}; \
tar --touch -xf deephaven-code-studio-${WEB_VERSION}.tgz; \
rm deephaven-code-studio-${WEB_VERSION}.tgz;
mv package/build ide; \
rm -r package; \
rm deephaven-code-studio-${WEB_VERSION}.tgz;

# Pull in the published embed-grid package from npmjs and extract is
RUN set -eux; \
npm pack @deephaven/embed-grid@${WEB_VERSION}; \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just verifying - we expect code-studio and embed-grid to always be in-sync with their versions?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, they should.

tar --touch -xf deephaven-embed-grid-${WEB_VERSION}.tgz; \
mkdir iframe; \
mv package/build iframe/table; \
rm -r package; \
rm deephaven-embed-grid-${WEB_VERSION}.tgz;
4 changes: 2 additions & 2 deletions web/client-ui/client-ui.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ def ui = Docker.registerDockerTask(project, 'ui') {
from file('Dockerfile')
}
parentContainers = [ Docker.registryTask(project, 'node') ]
containerOutPath = '/usr/src/app/package/build'
containerOutPath = '/usr/src/app/'
imageName = 'deephaven/dhide:local-build'
copyOut {
into dhUi.get().dir('ide')
into dhUi.get()
}
}

Expand Down