Merge pull request #1005 from memphisdev/cloud-adjustments

Cloud adjustments
superstreamlabs · Jun 19, 2023 · c57184a · c57184a
2 parents 6dc30bf + 829790c
commit c57184a
Show file tree

Hide file tree

Showing 21 changed files with 296 additions and 130 deletions.
diff --git a/ui_src/public/index.html b/ui_src/public/index.html
@@ -2,14 +2,6 @@
 <html lang="en">
 
 <head>
-  <!-- Google Tag Manager -->
-<script>
-if (process.env.REACT_APP_CLOUD === 'true') {(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-})(window,document,'script','dataLayer','GTM-5B7H8V5')}</script>
-<!-- End Google Tag Manager -->
   <meta charset="utf-8" />
   <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />

diff --git a/ui_src/src/App.js b/ui_src/src/App.js
@@ -62,13 +62,13 @@ const App = withRouter((props) => {
     const history = useHistory();
     const urlParams = new URLSearchParams(window.location.search);
     const firebase_id_token = urlParams.get('firebase_id_token');
-    const organization_id = urlParams.get('organization_id');
+    const firebase_organization_id = urlParams.get('firebase_organization_id');
     const [cloudLogedIn, setCloudLogedIn] = useState(isCloud() ? false : true);
 
     const handleLoginWithToken = async () => {
         if (firebase_id_token) {
             try {
-                const data = await httpRequest('POST', ApiEndpoints.LOGIN, { firebase_id_token, organization_id }, {}, {}, false);
+                const data = await httpRequest('POST', ApiEndpoints.LOGIN, { firebase_id_token, firebase_organization_id }, {}, {}, false);
                 if (data) {
                     AuthService.saveToLocalStorage(data);
                     try {

diff --git a/ui_src/src/assets/images/noSchemasFound.svg b/ui_src/src/assets/images/noSchemasFound.svg
diff --git a/ui_src/src/assets/images/noTagsFound.svg b/ui_src/src/assets/images/noTagsFound.svg
diff --git a/ui_src/src/components/selectSchema/index.js b/ui_src/src/components/selectSchema/index.js
@@ -52,7 +52,7 @@ const SelectSchema = ({ options, onChange, value, placeholder }) => {
                 notFoundContent={
                     <div className="no-schema-to-display">
                         <img src={placeholderSchema} width="50" height="50" alt="placeholderSchema" />
-                        <p className="title">No schemas found</p>
+                        <p className="title">No schemas yet</p>
                         <p className="sub-title">Get started by creating your first schema</p>
                         <Button
                             className="modal-btn"