cleanup

facet-tech · Feb 1, 2021 · 0a92883 · 0a92883
1 parent 178a787
commit 0a92883
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 22 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -42,7 +42,7 @@ function App() {
     load();
 
 
-  }, [setIsPluginEnabled, isPluginEnabled, showSideBar]);
+  }, [setIsPluginEnabled, isDomainWhitelisted, isPluginEnabled, showSideBar]);
 
   // removing width/height hack
   if ((isPluginEnabled && isDomainWhitelisted) || isDevelopment()) {

diff --git a/src/AppProvider.jsx b/src/AppProvider.jsx
@@ -25,7 +25,7 @@ const AppProvider = ({ children }) => {
   const { enqueueSnackbar } = useSnackbar();
 
   const [isPluginEnabled, setIsPluginEnabled] = isDevelopment() ? useState(true) : useState(false);
-  const [showSideBar, setShowSideBar] = isDevelopment() ? useState(true) : useState(false);
+  const [showSideBar, setShowSideBar] = useState(true);
   const [loadingSideBar, setLoadingSideBar] = isDevelopment() ? useState(false) : useState(true);
   const [isDomainWhitelisted, setIsDomainWhitelisted] = isDevelopment() ? useState(true) : useState(false);
 

diff --git a/src/facetTreeSideBar/FacetTreeSideBar.jsx b/src/facetTreeSideBar/FacetTreeSideBar.jsx
@@ -223,23 +223,19 @@ export default function FacetTreeSideBar() {
     });
   const activateDeactivateElement = showSideBar
     ? (
-      <CustomIconButtonContainer onClick={() => {
+      <FacetIconButton iconWidth="30" iconHeight="30" size="medium" title="Enable" key="edit" fill={color.ice} name="edit" onClick={() => {
         if (!isDevelopment()) {
           setLoadingSideBar(true);
         }
         sideBarHandler();
-      }} title="Disable" >
-        <FacetImage onMouseOver={(e) => { e.currentTarget.src = facetLogo }} onMouseOut={(e) => { e.currentTarget.src = facetLogoIce }} width="27" height="27" title="facet" src={facetLogoIce} />
-      </CustomIconButtonContainer>
+      }} />
     ) : (
-      <CustomIconButtonContainer onClick={() => {
+      <FacetIconButton iconWidth="30" iconHeight="30" size="medium" title="Disable" key="edit-outline" name="edit-outline" onClick={() => {
         if (!isDevelopment()) {
-          setLoadingSideBar(true);
+          setLoadingSideBar(false);
         }
         sideBarHandler();
-      }} title="Enable">
-        <FacetImage onMouseOver={(e) => { e.currentTarget.src = facetLogoIce }} onMouseOut={(e) => { e.currentTarget.src = facetLogo }} width="27" height="27" title="facet" src={facetLogo} />
-      </CustomIconButtonContainer>
+      }} />
     );
 
   return (
@@ -296,8 +292,8 @@ export default function FacetTreeSideBar() {
             </div>
             <div className={classes.drawerHeader}>
               {activateDeactivateElement}
-              <FacetIconButton iconWidth="30" iconHeight="30" size="medium" name="trash-2-outline" onClick={() => { reset(); }} title="Delete All" aria-label="Delete All" />
-              <FacetIconButton iconWidth="30" iconHeight="30" size="medium" title="save" name="save-outline" onClick={() => { onSaveClick(); }} aria-label="add" />
+              <FacetIconButton key="trash-2-outline" iconWidth="30" iconHeight="30" size="medium" name="trash-2-outline" onClick={() => { reset(); }} title="Delete All" aria-label="Delete All" />
+              <FacetIconButton key="save" iconWidth="30" iconHeight="30" size="medium" title="save" name="save-outline" onClick={() => { onSaveClick(); }} aria-label="add" />
             </div>
           </div>
           <Divider style={{ backgroundColor: color.lightGray }} />

diff --git a/src/highlighter.js b/src/highlighter.js
@@ -334,7 +334,7 @@ const scriptHasAlreadyBeenInjected = () => {
         if (found) {
             return;
         }
-        if (script.getAttribute('src') && script.getAttribute('src').includes('facet.run')) {
+        if (script.getAttribute('src') && script.getAttribute('src').includes('https://api.facet.run/js')) {
             found = true;
         }
     });
@@ -345,7 +345,6 @@ const initializeSingletonValues = async (eSBar) => {
     workspaceId = await getKeyFromLocalStorage(api.workspace.workspaceId);
     let getDomainRes = await getOrPostDomain(workspaceId);
     domainId = getDomainRes.response.id;
-    getFacetResponse = await getFacet(domainId);
     enqueueSnackbar = eSBar;
 }
 

diff --git a/src/index.jsx b/src/index.jsx
@@ -18,6 +18,7 @@ import 'typeface-roboto';
 import FacetSnackbar from './shared/FacetSnackbar';
 import AmplifyService from './services/AmplifyService';
 import WelcomeAbroadStandalone from './shared/WelcomeAbroad/WelcomeAbroadStandalone';
+import isDevelopment from './utils/isDevelopment';
 
 // duplicate code
 const keys = {
@@ -26,12 +27,55 @@ const keys = {
   'FACET_EXTENSION_ALREADY_INTEGRATED': 'FACET_EXTENSION_ALREADY_INTEGRATED',
 }
 
+
+const snackbarConfig = {
+  autoHideDuration: 5000,
+  vertical: 'bottom',
+  horizontal: 'left'
+};
+
 function getFacetExtensionCookie(key) {
   const value = `; ${document.cookie}`;
   const parts = value.split(`; ${key}=`);
   if (parts.length === 2) return JSON.parse(parts.pop().split(';').shift());
 }
 
+if (isDevelopment()) {
+  if (isActivelyBeingDebugged(domIds.facetizer)) {
+    ReactDOM.render(
+      <React.StrictMode>
+        <div style={{ width: `${styles.drawerWidth}px`, height: '100%' }} id="facet-sidebar">
+          <SnackbarProvider
+            style={{ height: '100%' }}
+            maxSnack={4}
+            disableWindowBlurListener
+            autoHideDuration={snackbarConfig.autoHideDuration}
+            iconVariant={{
+              error: '✖️',
+              warning: '⚠️',
+            }}
+            anchorOrigin={{
+              vertical: snackbarConfig.vertical,
+              horizontal: snackbarConfig.horizontal,
+            }}
+            content={(key, message) => (
+              <FacetSnackbar id={key} {...message} />
+            )}
+          >
+            <AppProvider>
+              <CoreProvider>
+                <App />
+              </CoreProvider>
+            </AppProvider>
+          </SnackbarProvider>
+
+        </div>
+      </React.StrictMode >,
+      document.getElementById(domIds.facetizer),
+    );
+  }
+}
+
 (async () => {
   try {
     await chrome.runtime.sendMessage({
@@ -61,12 +105,6 @@ function getFacetExtensionCookie(key) {
 
       Amplify.configure(awsExports);
 
-      const snackbarConfig = {
-        autoHideDuration: 5000,
-        vertical: 'bottom',
-        horizontal: 'left'
-      }
-
       // TODO fix duplication
       if (process.env.NODE_ENV !== 'development') {
         Sentry.init({

diff --git a/src/shared/constant.js b/src/shared/constant.js
@@ -143,7 +143,7 @@ const appId = 'hpkpjkdhgldjhcopdkmljdgceeojoglh';
 
 // helper during local debugging
 const isActivelyBeingDebugged = (id) => {
-    const activelyDebuggingElementIds = [domIds.authentication];
+    const activelyDebuggingElementIds = [domIds.facetizer];
     if (!isDevelopment()) {
         return true;
     }