diff --git a/.release-it-web-ext.json b/.release-it-web-ext.json index f7280ca38..20568ae10 100644 --- a/.release-it-web-ext.json +++ b/.release-it-web-ext.json @@ -22,7 +22,8 @@ "after:bump": [ "npx prettier --write apps/jetstream-web-extension/src/manifest.json", "yarn build:web-extension", - "cd dist/apps/jetstream-web-extension zip -r ../../jetstream-web-extension-${version}.zip *" + "rm -f dist/apps/jetstream-web-extension-${version}.zip *", + "cd dist/apps/jetstream-web-extension && zip -r -9 ../../jetstream-web-extension-${version}.zip *" ], "after:release": "echo Successfully released ${name} v${version}." } diff --git a/apps/jetstream-web-extension/src/assets/icons/jetstream-icon-128.png b/apps/jetstream-web-extension/src/assets/icons/jetstream-icon-128.png new file mode 100644 index 000000000..f0f327851 Binary files /dev/null and b/apps/jetstream-web-extension/src/assets/icons/jetstream-icon-128.png differ diff --git a/apps/jetstream-web-extension/src/assets/icons/jetstream-icon-16.png b/apps/jetstream-web-extension/src/assets/icons/jetstream-icon-16.png new file mode 100644 index 000000000..ebd43f733 Binary files /dev/null and b/apps/jetstream-web-extension/src/assets/icons/jetstream-icon-16.png differ diff --git a/apps/jetstream-web-extension/src/assets/icons/jetstream-icon-32.png b/apps/jetstream-web-extension/src/assets/icons/jetstream-icon-32.png new file mode 100644 index 000000000..8d8e60759 Binary files /dev/null and b/apps/jetstream-web-extension/src/assets/icons/jetstream-icon-32.png differ diff --git a/apps/jetstream-web-extension/src/assets/icons/jetstream-icon-48.png b/apps/jetstream-web-extension/src/assets/icons/jetstream-icon-48.png new file mode 100644 index 000000000..89d588e47 Binary files /dev/null and b/apps/jetstream-web-extension/src/assets/icons/jetstream-icon-48.png differ diff --git a/apps/jetstream-web-extension/src/assets/images/android-icon-144x144.png b/apps/jetstream-web-extension/src/assets/images/android-icon-144x144.png deleted file mode 100644 index 6099f9791..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/android-icon-144x144.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/android-icon-192x192.png b/apps/jetstream-web-extension/src/assets/images/android-icon-192x192.png deleted file mode 100644 index d3a775809..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/android-icon-192x192.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/android-icon-36x36.png b/apps/jetstream-web-extension/src/assets/images/android-icon-36x36.png deleted file mode 100644 index 41f0867f1..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/android-icon-36x36.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/android-icon-48x48.png b/apps/jetstream-web-extension/src/assets/images/android-icon-48x48.png deleted file mode 100644 index dd91bd6ea..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/android-icon-48x48.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/android-icon-72x72.png b/apps/jetstream-web-extension/src/assets/images/android-icon-72x72.png deleted file mode 100644 index 3d99d3adf..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/android-icon-72x72.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/android-icon-96x96.png b/apps/jetstream-web-extension/src/assets/images/android-icon-96x96.png deleted file mode 100644 index c4b63f85c..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/android-icon-96x96.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/apple-icon-114x114.png b/apps/jetstream-web-extension/src/assets/images/apple-icon-114x114.png deleted file mode 100644 index e0e19eb0d..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/apple-icon-114x114.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/apple-icon-120x120.png b/apps/jetstream-web-extension/src/assets/images/apple-icon-120x120.png deleted file mode 100644 index cc3fbce9f..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/apple-icon-120x120.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/apple-icon-144x144.png b/apps/jetstream-web-extension/src/assets/images/apple-icon-144x144.png deleted file mode 100644 index 6099f9791..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/apple-icon-144x144.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/apple-icon-152x152.png b/apps/jetstream-web-extension/src/assets/images/apple-icon-152x152.png deleted file mode 100644 index a0720d970..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/apple-icon-152x152.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/apple-icon-180x180.png b/apps/jetstream-web-extension/src/assets/images/apple-icon-180x180.png deleted file mode 100644 index 969126154..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/apple-icon-180x180.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/apple-icon-57x57.png b/apps/jetstream-web-extension/src/assets/images/apple-icon-57x57.png deleted file mode 100644 index da80aeeca..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/apple-icon-57x57.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/apple-icon-60x60.png b/apps/jetstream-web-extension/src/assets/images/apple-icon-60x60.png deleted file mode 100644 index 7fbf77774..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/apple-icon-60x60.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/apple-icon-72x72.png b/apps/jetstream-web-extension/src/assets/images/apple-icon-72x72.png deleted file mode 100644 index 3d99d3adf..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/apple-icon-72x72.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/apple-icon-76x76.png b/apps/jetstream-web-extension/src/assets/images/apple-icon-76x76.png deleted file mode 100644 index 396f1baf5..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/apple-icon-76x76.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/apple-icon-precomposed.png b/apps/jetstream-web-extension/src/assets/images/apple-icon-precomposed.png deleted file mode 100644 index 722c6b5d5..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/apple-icon-precomposed.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/apple-icon.png b/apps/jetstream-web-extension/src/assets/images/apple-icon.png deleted file mode 100644 index 722c6b5d5..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/apple-icon.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/browserconfig.xml b/apps/jetstream-web-extension/src/assets/images/browserconfig.xml deleted file mode 100644 index c55414822..000000000 --- a/apps/jetstream-web-extension/src/assets/images/browserconfig.xml +++ /dev/null @@ -1,2 +0,0 @@ - -#ffffff \ No newline at end of file diff --git a/apps/jetstream-web-extension/src/assets/images/favicon-16x16.png b/apps/jetstream-web-extension/src/assets/images/favicon-16x16.png deleted file mode 100644 index 61aaa3726..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/favicon-16x16.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/favicon-32x32.png b/apps/jetstream-web-extension/src/assets/images/favicon-32x32.png deleted file mode 100644 index 093695bae..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/favicon-32x32.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/favicon-96x96.png b/apps/jetstream-web-extension/src/assets/images/favicon-96x96.png deleted file mode 100644 index c4b63f85c..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/favicon-96x96.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/favicon.ico b/apps/jetstream-web-extension/src/assets/images/favicon.ico deleted file mode 100644 index 14ed3c946..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/favicon.ico and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/jetstream-icon-inverse.svg b/apps/jetstream-web-extension/src/assets/images/jetstream-icon-inverse.svg deleted file mode 100644 index 40c928944..000000000 --- a/apps/jetstream-web-extension/src/assets/images/jetstream-icon-inverse.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/jetstream-web-extension/src/assets/images/jetstream-icon-white-bg.png b/apps/jetstream-web-extension/src/assets/images/jetstream-icon-white-bg.png deleted file mode 100644 index 9601c8129..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/jetstream-icon-white-bg.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/jetstream-icon.png b/apps/jetstream-web-extension/src/assets/images/jetstream-icon.png deleted file mode 100644 index 2b4fdc596..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/jetstream-icon.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/jetstream-logo-1200w.png b/apps/jetstream-web-extension/src/assets/images/jetstream-logo-1200w.png deleted file mode 100644 index 66e6c4976..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/jetstream-logo-1200w.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/jetstream-logo-v1-200w.png b/apps/jetstream-web-extension/src/assets/images/jetstream-logo-v1-200w.png deleted file mode 100644 index 0887d4045..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/jetstream-logo-v1-200w.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/jetstream-logo.svg b/apps/jetstream-web-extension/src/assets/images/jetstream-logo.svg deleted file mode 100644 index f59b01ab4..000000000 --- a/apps/jetstream-web-extension/src/assets/images/jetstream-logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/jetstream-web-extension/src/assets/images/manifest.json b/apps/jetstream-web-extension/src/assets/images/manifest.json deleted file mode 100644 index 30ec8a764..000000000 --- a/apps/jetstream-web-extension/src/assets/images/manifest.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "Jetstream", - "icons": [ - { - "src": "/assets/images/android-icon-36x36.png", - "sizes": "36x36", - "type": "image/png", - "density": "0.75" - }, - { - "src": "/assets/images/android-icon-48x48.png", - "sizes": "48x48", - "type": "image/png", - "density": "1.0" - }, - { - "src": "/assets/images/android-icon-72x72.png", - "sizes": "72x72", - "type": "image/png", - "density": "1.5" - }, - { - "src": "/assets/images/android-icon-96x96.png", - "sizes": "96x96", - "type": "image/png", - "density": "2.0" - }, - { - "src": "/assets/images/android-icon-144x144.png", - "sizes": "144x144", - "type": "image/png", - "density": "3.0" - }, - { - "src": "/assets/images/android-icon-192x192.png", - "sizes": "192x192", - "type": "image/png", - "density": "4.0" - } - ] -} diff --git a/apps/jetstream-web-extension/src/assets/images/ms-icon-144x144.png b/apps/jetstream-web-extension/src/assets/images/ms-icon-144x144.png deleted file mode 100644 index 6099f9791..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/ms-icon-144x144.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/ms-icon-150x150.png b/apps/jetstream-web-extension/src/assets/images/ms-icon-150x150.png deleted file mode 100644 index 0b8d0fd19..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/ms-icon-150x150.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/ms-icon-310x310.png b/apps/jetstream-web-extension/src/assets/images/ms-icon-310x310.png deleted file mode 100644 index 14ce50e3a..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/ms-icon-310x310.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/assets/images/ms-icon-70x70.png b/apps/jetstream-web-extension/src/assets/images/ms-icon-70x70.png deleted file mode 100644 index 8381e1941..000000000 Binary files a/apps/jetstream-web-extension/src/assets/images/ms-icon-70x70.png and /dev/null differ diff --git a/apps/jetstream-web-extension/src/components/Button.tsx b/apps/jetstream-web-extension/src/components/Button.tsx index 1c8f2224a..a244148a9 100644 --- a/apps/jetstream-web-extension/src/components/Button.tsx +++ b/apps/jetstream-web-extension/src/components/Button.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/react'; import { isValidSalesforceRecordId, useInterval } from '@jetstream/shared/ui-utils'; import { Maybe } from '@jetstream/types'; -import { Grid, GridCol, Icon, OutsideClickHandler } from '@jetstream/ui'; +import { Grid, GridCol, OutsideClickHandler } from '@jetstream/ui'; import { fromAppState, JetstreamIcon, JetstreamLogo } from '@jetstream/ui-core'; import { sendMessage } from '@jetstream/web-extension-utils'; import { useEffect, useState } from 'react'; @@ -31,6 +31,32 @@ function getRecordPageRecordId() { return recordId; } +const PAGE_LINKS = [ + { + link: '/query', + label: 'Query Records', + }, + { + link: '/load', + label: 'Load Records', + }, + { + link: '/automation-control', + label: 'Automation Control', + }, + { + link: '/permissions-manager', + label: 'Manage Permissions', + }, + { + link: '/deploy-metadata', + label: 'Deploy and Compare Metadata', + }, + { + link: '/apex', + label: 'Anonymous Apex', + }, +]; export function Button() { const [isOnSalesforcePage] = useState( () => !!document.querySelector('body.sfdcBody, body.ApexCSIPage, #auraLoadingBox') || location.host.endsWith('visualforce.com') @@ -86,26 +112,6 @@ export function Button() { } }, [isOnSalesforcePage, setSalesforceOrgs, setSelectedOrgId]); - // async function handleClick() { - // console.log('click'); - - // if (sfHost) { - // getSession(sfHost).then(async (session) => { - // console.log('session', session); - // // split by `!` to get the org id - // if (session) { - // const conn = new Connection({ - // instanceUrl: `https://${session.hostname}`, - // accessToken: session.key, - // }); - // console.log(conn); - // const results = await conn.identity(); - // console.log(results); - // } - // }); - // } - // } - if (!isOnSalesforcePage || !sfHost) { return null; } @@ -143,7 +149,6 @@ export function Button() { `} onClick={() => setIsOpen(true)} > - {/* href={`${chrome.runtime.getURL('app.html')}?host=${sfHost}`} */} {isOpen && ( @@ -159,43 +164,32 @@ export function Button() { className="slds-popover" onOutsideClick={() => setIsOpen(false)} > - - {/* TODO: optimize the logo */} - -
+
+ -
- + +
- {/* FIXME: better type safety on the params */} - - - Query Records - - - - - Load Records - - + {PAGE_LINKS.map((item) => ( + + + {item.label} + + + ))} {recordId && ( <>
diff --git a/apps/jetstream-web-extension/src/jetstream-web-extension-icon.png b/apps/jetstream-web-extension/src/jetstream-web-extension-icon.png new file mode 100644 index 000000000..4d9069ba5 Binary files /dev/null and b/apps/jetstream-web-extension/src/jetstream-web-extension-icon.png differ diff --git a/apps/jetstream-web-extension/src/manifest.json b/apps/jetstream-web-extension/src/manifest.json index bfaf83a29..11d7ee291 100644 --- a/apps/jetstream-web-extension/src/manifest.json +++ b/apps/jetstream-web-extension/src/manifest.json @@ -3,10 +3,13 @@ "description": "Jetstream is a set of tools that supercharge your administration of Salesforce.com.", "version": "0.0.1", "manifest_version": 3, - "action": { - "default_popup": "popup.html" + "icons": { + "16": "assets/icons/jetstream-icon-16.png", + "32": "assets/icons/jetstream-icon-32.png", + "48": "assets/icons/jetstream-icon-48.png", + "128": "assets/icons/jetstream-icon-128.png" }, - "permissions": ["storage", "cookies", "activeTab"], + "permissions": ["storage", "cookies"], "host_permissions": [ "https://*.cloudforce.com/*", "https://*.force.com/*", @@ -18,10 +21,6 @@ "background": { "service_worker": "serviceWorker.js" }, - "options_ui": { - "page": "options.html", - "open_in_tab": true - }, "content_scripts": [ { "matches": [ diff --git a/apps/jetstream-web-extension/src/pages/options/Options.tsx b/apps/jetstream-web-extension/src/pages/options/Options.tsx index 7fde53e81..8df4898ef 100644 --- a/apps/jetstream-web-extension/src/pages/options/Options.tsx +++ b/apps/jetstream-web-extension/src/pages/options/Options.tsx @@ -5,34 +5,7 @@ initAndRenderReact(); export function Component() { function handleClick() { - console.log('click'); - - // chrome.tabs.query({ active: true, lastFocusedWindow: true }, (tabs) => { - // console.log('tabs', tabs); - // const url = tabs?.[0]?.url; - // console.log('url', url); - // if (url) { - // sendMessage({ message: 'GET_SESSION', data: { salesforceHost: new URL(url).host } }).then(async (session) => { - // console.log('session', session); - // // split by `!` to get the org id - // if (session) { - // const result = await apiGetRest({ - // method: 'GET', - // session, - // url: '/services/data', - // }); - // console.log(result); - // // const conn = new Connection({ - // // instanceUrl: `https://${session.hostname}`, - // // accessToken: session.key, - // // }); - // // console.log(conn); - // // const results = await conn.identity(); - // // console.log(results); - // } - // }); - // } - // }); + // TODO: } return ( diff --git a/apps/jetstream-web-extension/src/pages/popup/Popup.tsx b/apps/jetstream-web-extension/src/pages/popup/Popup.tsx index 09d03f50e..dd5a91ffa 100644 --- a/apps/jetstream-web-extension/src/pages/popup/Popup.tsx +++ b/apps/jetstream-web-extension/src/pages/popup/Popup.tsx @@ -8,33 +8,6 @@ initAndRenderReact(); export function Component() { function handleClick() { console.log('click'); - - // chrome.tabs.query({ active: true, lastFocusedWindow: true }, (tabs) => { - // console.log('tabs', tabs); - // const url = tabs?.[0]?.url; - // console.log('url', url); - // if (url) { - // sendMessage({ message: 'GET_SESSION', data: { salesforceHost: new URL(url).host } }).then(async (session) => { - // console.log('session', session); - // // split by `!` to get the org id - // // if (session) { - // // const result = await apiGetRest({ - // // method: 'GET', - // // session, - // // url: '/services/data', - // // }); - // // console.log(result); - // // // const conn = new Connection({ - // // // instanceUrl: `https://${session.hostname}`, - // // // accessToken: session.key, - // // // }); - // // // console.log(conn); - // // // const results = await conn.identity(); - // // // console.log(results); - // // } - // }); - // } - // }); } return ( diff --git a/apps/jetstream-web-extension/src/serviceWorker.ts b/apps/jetstream-web-extension/src/serviceWorker.ts index 7f4f343fb..3b4378f34 100644 --- a/apps/jetstream-web-extension/src/serviceWorker.ts +++ b/apps/jetstream-web-extension/src/serviceWorker.ts @@ -45,17 +45,6 @@ chrome.runtime.onInstalled.addListener(async () => { console.log('Jetstream Extension successfully installed!'); }); -chrome.runtime.onStartup.addListener(() => console.log('[SW EVENT] onStartup')); -chrome.runtime.onSuspend.addListener(() => console.log('[SW EVENT] onSuspend')); -chrome.runtime.onConnect.addListener((ev) => console.log('[SW EVENT] onConnect', ev)); -chrome.runtime.onConnectExternal.addListener((ev) => console.log('[SW EVENT] onConnectExternal', ev)); -chrome.runtime.onMessageExternal.addListener((ev) => console.log('[SW EVENT] onMessageExternal', ev)); -chrome.runtime.onRestartRequired.addListener((ev) => console.log('[SW EVENT] onRestartRequired', ev)); -chrome.runtime.onSuspendCanceled.addListener(() => console.log('[SW EVENT] onSuspendCanceled')); -chrome.runtime.onUpdateAvailable.addListener((ev) => console.log('[SW EVENT] onUpdateAvailable', ev)); -chrome.runtime.onUserScriptConnect.addListener((ev) => console.log('[SW EVENT] onUserScriptConnect', ev)); -chrome.runtime.onUserScriptMessage.addListener((ev) => console.log('[SW EVENT] onUserScriptMessage', ev)); - chrome.runtime.onMessage.addListener( (request: Message['request'], sender: chrome.runtime.MessageSender, sendResponse: (response: MessageResponse) => void) => { console.log('[SW EVENT] onMessage', request); diff --git a/libs/shared/ui-core/src/icons/JetstreamIcon.tsx b/libs/shared/ui-core/src/icons/JetstreamIcon.tsx index 8b4d1b425..c30e35592 100644 --- a/libs/shared/ui-core/src/icons/JetstreamIcon.tsx +++ b/libs/shared/ui-core/src/icons/JetstreamIcon.tsx @@ -9,8 +9,6 @@ export const JetstreamIcon: FunctionComponent> = ( stroke-linejoin: round; stroke-miterlimit: 2; `} - width="100%" - height="100%" viewBox="0 0 181 180" {...props} > diff --git a/libs/shared/ui-core/src/orgs/OrgInfoPopover.tsx b/libs/shared/ui-core/src/orgs/OrgInfoPopover.tsx index 0ff495476..6f09a910c 100644 --- a/libs/shared/ui-core/src/orgs/OrgInfoPopover.tsx +++ b/libs/shared/ui-core/src/orgs/OrgInfoPopover.tsx @@ -190,10 +190,10 @@ export const OrgInfoPopover: FunctionComponent = ({ } content={ -
+
{loading && } {hasError && ( -
+