rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: cloudlink url

Browse Source
This commit is contained in:
Mo
2022-01-03 10:47:33 -06:00
parent f405333898
commit 4153c81638
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/ComponentView/index.tsx
View File

@@ -238,7 +238,7 @@ export const ComponentView: FunctionalComponent<IProps> = observer(
ref={iframeRef}
data-component-viewer-id={componentViewer.identifier}
frameBorder={0}
src={application.componentManager.urlForComponent(component) || ''}
src={componentViewer.url || ''}
sandbox="allow-scripts allow-top-navigation-by-user-activation allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-modals allow-forms allow-downloads"
>
Loading

18
app/assets/javascripts/preferences/panes/ExtensionPane.tsx
View File

@@ -1,6 +1,7 @@
import { PreferencesGroup, PreferencesSegment } from '@/preferences/components';
import { WebApplication } from '@/ui_models/application';
import { ComponentViewer, SNComponent } from '@standardnotes/snjs/dist/@types';
import { ComponentViewer, SNComponent } from '@standardnotes/snjs';
import { FeatureIdentifier } from '@standardnotes/features';
import { observer } from 'mobx-react-lite';
import { FunctionComponent } from 'preact';
import { ExtensionItem } from './extensions-segments';
@@ -16,10 +17,23 @@ interface IProps {
preferencesMenu: PreferencesMenu;
}
const urlOverrideForExtension = (extension: SNComponent) => {
if (extension.identifier === FeatureIdentifier.CloudLink) {
return 'https://extensions.standardnotes.org/components/cloudlink';
} else {
return undefined;
}
};
export const ExtensionPane: FunctionComponent<IProps> = observer(
({ extension, application, appState, preferencesMenu }) => {
const [componentViewer] = useState<ComponentViewer>(
application.componentManager.createComponentViewer(extension)
application.componentManager.createComponentViewer(
extension,
undefined,
undefined,
urlOverrideForExtension(extension)
)
);
const latestVersion =
preferencesMenu.extensionsLatestVersions.getVersion(extension);

2
package.json
View File

@@ -89,7 +89,7 @@
"@reach/tooltip": "^0.16.2",
"@standardnotes/features": "1.20.3",
"@standardnotes/sncrypto-web": "1.5.3",
"@standardnotes/snjs": "2.31.20",
"@standardnotes/snjs": "2.31.21",
"mobx": "^6.3.5",
"mobx-react-lite": "^3.2.2",
"preact": "^10.5.15",

8
yarn.lock
View File

@@ -2655,10 +2655,10 @@
buffer "^6.0.3"
libsodium-wrappers "^0.7.9"
"@standardnotes/snjs@2.31.20":
version "2.31.20"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.31.20.tgz#f33f35aae09ab0ce2652adc1a0c91852a3c00062"
integrity sha512-rPHHzPKdNe546Zis9UCpO1pNU0Wd6P0y7nxlDzpitqGsXFEdBbcGbPkdw6tBIvQ2KvpkL0/U50FrzRU6NteXLg==
"@standardnotes/snjs@2.31.21":
version "2.31.21"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.31.21.tgz#6821a47fa22d676682566b8be56932a6eca6a55f"
integrity sha512-U2sWYlfi6xj3s4U18UkrH+BNm7ckNuhHV0Upi7Zd8QCzokpHTDPYysq1j5cC1cnCODXR24ZR/thWiOGNx3zODw==
dependencies:
"@standardnotes/auth" "3.8.1"
"@standardnotes/common" "1.2.1"