-
Notifications
You must be signed in to change notification settings - Fork 192
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: embed url service #1297
Merged
Merged
feat: embed url service #1297
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,162 @@ | ||
/* | ||
|
||
MIT License | ||
|
||
Copyright (c) 2023 Looker Data Sciences, Inc. | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in all | ||
copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
SOFTWARE. | ||
|
||
*/ | ||
|
||
import { EmbedUrl, ContentType } from './EmbedUrl' | ||
|
||
describe('EmbedUrl', () => { | ||
const dashboardUrl = 'https://example.com/dashboards/123' | ||
const dashboardEmbedUrl = 'https://example.com/embed/dashboards/123' | ||
const exploreUrl = 'https://example.com/explore/456' | ||
const lookUrl = 'https://example.com/embed/looks/789' | ||
const invalidUrl = 'https://example.com' | ||
|
||
describe('constructor', () => { | ||
it('should set searchParams and path properties if present', () => { | ||
const url = `${dashboardUrl}?param1=value1` | ||
const targetUrl = new EmbedUrl(url) | ||
expect(targetUrl.searchParams).toEqual({ param1: 'value1' }) | ||
expect(targetUrl.path).toBe('/dashboards/123') | ||
}) | ||
|
||
it('should support a target url without search params', () => { | ||
const targetUrl = new EmbedUrl(lookUrl) | ||
expect(targetUrl.searchParams).toEqual({}) | ||
expect(targetUrl.path).toBe('/embed/looks/789') | ||
}) | ||
|
||
it('should correctly determine isDashboard, isExplore and isLook properties', () => { | ||
const dashboardTargetUrl = new EmbedUrl(dashboardUrl) | ||
const exploreTargetUrl = new EmbedUrl(exploreUrl) | ||
const lookTargetUrl = new EmbedUrl(lookUrl) | ||
|
||
expect(dashboardTargetUrl.isDashboard).toBe(true) | ||
expect(dashboardTargetUrl.isExplore).toBe(false) | ||
expect(dashboardTargetUrl.isLook).toBe(false) | ||
|
||
expect(exploreTargetUrl.isDashboard).toBe(false) | ||
expect(exploreTargetUrl.isExplore).toBe(true) | ||
expect(exploreTargetUrl.isLook).toBe(false) | ||
|
||
expect(lookTargetUrl.isDashboard).toBe(false) | ||
expect(lookTargetUrl.isExplore).toBe(false) | ||
expect(lookTargetUrl.isLook).toBe(true) | ||
}) | ||
|
||
it('should set content type to invalid for invalid urls', () => { | ||
const targetUrl = new EmbedUrl(invalidUrl) | ||
expect(targetUrl.contentType).toEqual(ContentType.Invalid) | ||
}) | ||
|
||
it('should correctly determine contentType property', () => { | ||
const dashboardTargetUrl = new EmbedUrl(dashboardUrl) | ||
const exploreTargetUrl = new EmbedUrl(exploreUrl) | ||
const lookTargetUrl = new EmbedUrl(lookUrl) | ||
|
||
expect(dashboardTargetUrl.contentType).toBe(ContentType.Dashboard) | ||
expect(exploreTargetUrl.contentType).toBe(ContentType.Explore) | ||
expect(lookTargetUrl.contentType).toBe(ContentType.Look) | ||
}) | ||
|
||
it('should set isThemable property based on contentType', () => { | ||
const dashboardTargetUrl = new EmbedUrl(dashboardUrl) | ||
const exploreTargetUrl = new EmbedUrl(exploreUrl) | ||
const lookTargetUrl = new EmbedUrl(lookUrl) | ||
|
||
expect(dashboardTargetUrl.isThemable).toBe(true) | ||
expect(exploreTargetUrl.isThemable).toBe(true) | ||
expect(lookTargetUrl.isThemable).toBe(false) | ||
}) | ||
}) | ||
|
||
describe('embedUrl', () => { | ||
const overrides = { theme: 'dark' } | ||
|
||
it('should return the correct embed URL if target url has no search params', () => { | ||
const targetUrl = new EmbedUrl(dashboardUrl) | ||
|
||
expect(targetUrl.embedUrl()).toBe(dashboardEmbedUrl) | ||
}) | ||
|
||
it('should be able to exclude search params from target url', () => { | ||
const targetUrl = new EmbedUrl(`${dashboardUrl}?foo=bar`) | ||
|
||
expect(targetUrl.embedUrl(false)).toBe(dashboardEmbedUrl) | ||
}) | ||
|
||
it('should be able to include search params from target url', () => { | ||
const url = new EmbedUrl(`${dashboardUrl}?foo=bar`) | ||
const expectedEmbedUrl = `${dashboardEmbedUrl}?foo=bar` | ||
|
||
expect(url.embedUrl(true)).toBe(expectedEmbedUrl) | ||
}) | ||
|
||
it('should return the correct embed URL with search param overrides', () => { | ||
const url = new EmbedUrl(`${dashboardUrl}?foo=bar`) | ||
const expectedEmbedUrl = `${dashboardEmbedUrl}?theme=dark` | ||
|
||
expect(url.embedUrl(false, overrides)).toBe(expectedEmbedUrl) | ||
}) | ||
|
||
it('should return the correct embed URL with target url search params and overrides', () => { | ||
const url = new EmbedUrl(`${dashboardUrl}?Cool+Filter=Item+Count`) | ||
const expectedEmbedUrl = `${dashboardEmbedUrl}?Cool+Filter=Item+Count&theme=dark` | ||
|
||
expect(url.embedUrl(true, overrides)).toBe(expectedEmbedUrl) | ||
}) | ||
|
||
it('supports json target url search param values', () => { | ||
const url = new EmbedUrl( | ||
`${dashboardEmbedUrl}?_theme={"show_filters_bar":false}` | ||
) | ||
const expectedUrl = `${dashboardEmbedUrl}?_theme=%7B%22show_filters_bar%22%3Afalse%7D&theme=dark` | ||
expect(url.searchParams).toEqual({ | ||
_theme: '{"show_filters_bar":false}', | ||
}) | ||
expect(url.embedUrl(true, overrides)).toEqual(expectedUrl) | ||
}) | ||
|
||
it('supports overrides with json values', () => { | ||
const url = new EmbedUrl(`${dashboardEmbedUrl}?theme=dark`) | ||
const overrides = { _theme: { show_filters_bar: false } } | ||
expect(url.embedUrl(true, overrides)).toEqual( | ||
`${dashboardEmbedUrl}?theme=dark&_theme=%7B%22show_filters_bar%22%3Afalse%7D` | ||
) | ||
}) | ||
|
||
it('overrides should take precedence over the same existing param', () => { | ||
const targetUrl = new EmbedUrl(`${dashboardUrl}?theme=foo`) | ||
const overrides = { theme: 'overrideTheme' } | ||
expect(targetUrl.embedUrl(true, overrides)).toEqual( | ||
`${dashboardEmbedUrl}?theme=overrideTheme` | ||
) | ||
}) | ||
|
||
it('should throw for invalid urls', () => { | ||
const targetUrl = new EmbedUrl(invalidUrl) | ||
expect(() => targetUrl.embedUrl()).toThrow('Invalid content type') | ||
}) | ||
}) | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,139 @@ | ||
/* | ||
|
||
MIT License | ||
|
||
Copyright (c) 2023 Looker Data Sciences, Inc. | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in all | ||
copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
SOFTWARE. | ||
|
||
*/ | ||
|
||
export enum ContentType { | ||
Look = 'look', | ||
Explore = 'explore', | ||
Dashboard = 'dashboard', | ||
Invalid = 'invalid', | ||
} | ||
|
||
const THEMABLE_CONTENT: ContentType[] = [ | ||
ContentType.Dashboard, | ||
ContentType.Explore, | ||
] | ||
|
||
export interface IEmbedUrl { | ||
readonly url: string | ||
readonly path: string | ||
readonly searchParams: Record<string, string> | ||
readonly isDashboard: boolean | ||
readonly isExplore: boolean | ||
readonly isLook: boolean | ||
readonly contentType: ContentType | ||
readonly isThemable: boolean | ||
embedUrl(includeSearchParams: boolean, overrides: Record<string, any>): string | ||
} | ||
|
||
/** | ||
* A class for use when implementer requires components to be context aware | ||
*/ | ||
export class EmbedUrl implements IEmbedUrl { | ||
/** Current url */ | ||
private _url: URL | ||
/** Path of the current page */ | ||
readonly path: string | ||
/** Search string of the current url */ | ||
readonly searchParams: Record<string, string> | ||
/** Determines whether the current URL is for a Dashboard */ | ||
readonly isDashboard: boolean | ||
/** Determines whether the current URL is for an Explore */ | ||
readonly isExplore: boolean | ||
/** Determines whether the current URl is for a Look */ | ||
readonly isLook: boolean | ||
/** Determines if current URL represents themable content */ | ||
readonly isThemable: boolean | ||
/** Type of content the URL represents */ | ||
readonly contentType: ContentType | ||
private readonly _embedUrl: string | ||
|
||
constructor(url = window.location.href) { | ||
this._url = new URL(url) | ||
this.searchParams = Object.fromEntries(this._url.searchParams) | ||
this.path = this._url.pathname | ||
this.isDashboard = /^(\/embed)?\/dashboards\//i.test(this.path) | ||
this.isExplore = /^(\/embed)?\/explore\//i.test(this.path) | ||
this.isLook = /^(\/embed)?\/looks\//i.test(this.path) | ||
this.contentType = this.type() | ||
|
||
if (this.path.startsWith('/embed/')) { | ||
this._embedUrl = `${this._url.origin}${this._url.pathname}` | ||
} else { | ||
this._embedUrl = `${this._url.origin}/embed${this._url.pathname}` | ||
} | ||
|
||
this.isThemable = THEMABLE_CONTENT.includes(this.contentType) | ||
} | ||
|
||
get url() { | ||
return this._url.href | ||
} | ||
|
||
protected type() { | ||
let type: ContentType | ||
if (this.isLook) { | ||
type = ContentType.Look | ||
} else if (this.isExplore) { | ||
type = ContentType.Explore | ||
} else if (this.isDashboard) { | ||
type = ContentType.Dashboard | ||
} else { | ||
type = ContentType.Invalid | ||
} | ||
return type | ||
} | ||
|
||
/** | ||
* Builds the embed target url | ||
* @param includeSearchParams switch determining whether to include search params from target url | ||
* @param overrides any search key values to include in embed url e.g. 'k1=v1&k2=v2' | ||
*/ | ||
embedUrl(includeSearchParams = false, overrides: Record<string, any> = {}) { | ||
if (this.contentType === ContentType.Invalid) { | ||
throw new Error('Invalid content type') | ||
} | ||
|
||
const embedUrlParams = includeSearchParams ? this.searchParams : {} | ||
|
||
if (overrides) { | ||
Object.entries(overrides).forEach(([key, value]) => { | ||
let overrideValue = value | ||
if (typeof value === 'object') { | ||
overrideValue = JSON.stringify(value) | ||
} | ||
embedUrlParams[key] = overrideValue | ||
}) | ||
} | ||
|
||
let searchString = '' | ||
if (Object.keys(embedUrlParams).length > 0) { | ||
searchString = '?' + new URLSearchParams(embedUrlParams).toString() | ||
} | ||
|
||
const url = new URL(`${this._embedUrl}${searchString}`) | ||
return url.href | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I presume this is from a standard we use somewhere on the frontend for constant names?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm, it's how I am used to doing it. I believe I saw @bryans99 doing it similarly as well. I can look through a style guide to make sure though
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See https://google.github.io/styleguide/tsguide.html#identifiers
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think Looker follows the Google style guide for TypeScript