-
Notifications
You must be signed in to change notification settings - Fork 14.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:preset-io/superset into lyndsi/sp…
…lit-save-btn
- Loading branch information
Showing
17 changed files
with
327 additions
and
41 deletions.
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
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
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 |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ maintainers: | |
| - name: craig-rueda | ||
| email: [email protected] | ||
| url: https://github.com/craig-rueda | ||
| version: 0.6.6 | ||
| version: 0.7.0 | ||
| dependencies: | ||
| - name: postgresql | ||
| version: 11.1.22 | ||
|
|
||
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
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
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
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
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
59 changes: 59 additions & 0 deletions
59
superset-frontend/src/components/GenericLink/GenericLink.test.tsx
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,59 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import { render, screen } from 'spec/helpers/testing-library'; | ||
| import { GenericLink } from './GenericLink'; | ||
|
|
||
| test('renders', () => { | ||
| render(<GenericLink to="/explore">Link to Explore</GenericLink>, { | ||
| useRouter: true, | ||
| }); | ||
| expect(screen.getByText('Link to Explore')).toBeVisible(); | ||
| }); | ||
|
|
||
| test('navigates to internal URL', () => { | ||
| render(<GenericLink to="/explore">Link to Explore</GenericLink>, { | ||
| useRouter: true, | ||
| }); | ||
| const internalLink = screen.getByTestId('internal-link'); | ||
| expect(internalLink).toHaveAttribute('href', '/explore'); | ||
| }); | ||
|
|
||
| test('navigates to external URL', () => { | ||
| render( | ||
| <GenericLink to="https://superset.apache.org/"> | ||
| Link to external website | ||
| </GenericLink>, | ||
| { useRouter: true }, | ||
| ); | ||
| const externalLink = screen.getByTestId('external-link'); | ||
| expect(externalLink).toHaveAttribute('href', 'https://superset.apache.org/'); | ||
| }); | ||
|
|
||
| test('navigates to external URL without host', () => { | ||
| render( | ||
| <GenericLink to="superset.apache.org/"> | ||
| Link to external website | ||
| </GenericLink>, | ||
| { useRouter: true }, | ||
| ); | ||
| const externalLink = screen.getByTestId('external-link'); | ||
| expect(externalLink).toHaveAttribute('href', '//superset.apache.org/'); | ||
| }); |
52 changes: 52 additions & 0 deletions
52
superset-frontend/src/components/GenericLink/GenericLink.tsx
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,52 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import { Link, LinkProps } from 'react-router-dom'; | ||
| import { isUrlExternal, parseUrl } from 'src/utils/urlUtils'; | ||
|
|
||
| export const GenericLink = <S,>({ | ||
| to, | ||
| component, | ||
| replace, | ||
| innerRef, | ||
| children, | ||
| ...rest | ||
| }: React.PropsWithoutRef<LinkProps<S>> & | ||
| React.RefAttributes<HTMLAnchorElement>) => { | ||
| if (typeof to === 'string' && isUrlExternal(to)) { | ||
| return ( | ||
| <a data-test="external-link" href={parseUrl(to)} {...rest}> | ||
| {children} | ||
| </a> | ||
| ); | ||
| } | ||
| return ( | ||
| <Link | ||
| data-test="internal-link" | ||
| to={to} | ||
| component={component} | ||
| replace={replace} | ||
| innerRef={innerRef} | ||
| {...rest} | ||
| > | ||
| {children} | ||
| </Link> | ||
| ); | ||
| }; |
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
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,54 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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. | ||
| */ | ||
|
|
||
| import { isUrlExternal, parseUrl } from './urlUtils'; | ||
|
|
||
| test('isUrlExternal', () => { | ||
| expect(isUrlExternal('http://google.com')).toBeTruthy(); | ||
| expect(isUrlExternal('https://google.com')).toBeTruthy(); | ||
| expect(isUrlExternal('//google.com')).toBeTruthy(); | ||
| expect(isUrlExternal('google.com')).toBeTruthy(); | ||
| expect(isUrlExternal('www.google.com')).toBeTruthy(); | ||
| expect(isUrlExternal('mailto:[email protected]')).toBeTruthy(); | ||
|
|
||
| // treat all urls starting with protocol or hostname as external | ||
| // such urls are not handled well by react-router Link component | ||
| expect(isUrlExternal('http://localhost:8888/port')).toBeTruthy(); | ||
| expect(isUrlExternal('https://localhost/secure')).toBeTruthy(); | ||
| expect(isUrlExternal('http://localhost/about')).toBeTruthy(); | ||
| expect(isUrlExternal('HTTP://localhost/about')).toBeTruthy(); | ||
| expect(isUrlExternal('//localhost/about')).toBeTruthy(); | ||
| expect(isUrlExternal('localhost/about')).toBeTruthy(); | ||
|
|
||
| expect(isUrlExternal('/about')).toBeFalsy(); | ||
| expect(isUrlExternal('#anchor')).toBeFalsy(); | ||
| }); | ||
|
|
||
| test('parseUrl', () => { | ||
| expect(parseUrl('http://google.com')).toEqual('http://google.com'); | ||
| expect(parseUrl('//google.com')).toEqual('//google.com'); | ||
| expect(parseUrl('mailto:[email protected]')).toEqual( | ||
| 'mailto:[email protected]', | ||
| ); | ||
| expect(parseUrl('google.com')).toEqual('//google.com'); | ||
| expect(parseUrl('www.google.com')).toEqual('//www.google.com'); | ||
|
|
||
| expect(parseUrl('/about')).toEqual('/about'); | ||
| expect(parseUrl('#anchor')).toEqual('#anchor'); | ||
| }); |
Oops, something went wrong.