Populate share link if it's already saved

ZenUml · Nov 4, 2023 · a9dfadb · a9dfadb
1 parent 34bf6e8
commit a9dfadb
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 24 deletions.
diff --git a/firebase-functions/paddle-webhook/.env b/firebase-functions/paddle-webhook/.env
@@ -1,2 +1,2 @@
-LARASITE_HOST=18.139.29.58
-LARASITE_PORT=8000
+LARASITE_HOST=sequence-diagram.zenuml.com
+LARASITE_PORT=80
diff --git a/firebase-functions/paddle-webhook/functions/index.js b/firebase-functions/paddle-webhook/functions/index.js
@@ -29,8 +29,8 @@ exports.sync_diagram = functions.https.onRequest(async (req, res) => {
     const user = {name: decoded.name, id: decoded.user_id, email: decoded.email, email_verified: decoded.email_verified, picture: decoded.picture};
 
     const options = {
-        hostname: process.env.LARASITE_HOST || '18.139.29.58',
-        port: process.env.LARASITE_PORT || 8000,
+        hostname: process.env.LARASITE_HOST || '18.141.198.134',
+        port: process.env.LARASITE_PORT || 80,
         path: '/diagrams',
         method: 'POST',
         headers: {

diff --git a/src/components/ContentWrap.jsx b/src/components/ContentWrap.jsx
@@ -1008,7 +1008,7 @@ export default class ContentWrap extends Component {
 										</Button>
 									}
 									content={
-										<SharePanel id={0} dsl={''} image={''} />
+										<SharePanel id={0} dsl={''} image={''} shareLink={this.props.currentItem.shareLink} />
 									}
 								/>
 								<Button

diff --git a/src/components/SharePanel.jsx b/src/components/SharePanel.jsx
@@ -14,13 +14,18 @@ export class SharePanel extends Component {
 	}
 
 	componentDidMount() {
-		// TODO: API call to get the link
-		setTimeout(() => {
-			this.setState({
-				isLoading: false,
-				link: 'https://sequencediagram.zenuml.com/preview/1234',
-			})
-		}, 3000);
+		this.setState({
+			isLoading: false,
+			link: this.props.shareLink || 'https://sequencediagram.zenuml.com/preview/1234',
+		});
+
+		// TODO: API call to get the link if props.shareLink is not present
+		// setTimeout(() => {
+		// 	this.setState({
+		// 		isLoading: false,
+		// 		link: props.shareLink || 'https://sequencediagram.zenuml.com/preview/1234',
+		// 	})
+		// }, 3000);
 	}
 
 	handleCopyLink = () => {
@@ -74,4 +79,5 @@ SharePanel.propTypes = {
 	dsl: PropTypes.string,
 	email: PropTypes.string,
 	image: PropTypes.string,
+	shareLink: PropTypes.string,
 };
diff --git a/src/components/app.jsx b/src/components/app.jsx
@@ -18,7 +18,8 @@ import {
 	handleDownloadsPermission,
 	downloadFile,
 	getCompleteHtml,
-	getFilenameFromUrl
+	getFilenameFromUrl,
+	blobToBase64
 } from '../utils';
 import { itemService } from '../itemService';
 import '../db';
@@ -740,17 +741,6 @@ BookLibService.Borrow(id) {
 	}
 
 	async saveCode(key) {
-
-		const blobToBase64 = (blob) => {
-			const reader = new FileReader();
-			reader.readAsDataURL(blob);
-			return new Promise(resolve => {
-				reader.onloadend = () => {
-					resolve(reader.result);
-				};
-			});
-		};
-
 		const imageBlob = await this.contentWrap.getPngBlob();
 
 		this.state.currentItem.imageBase64 = await blobToBase64(imageBlob);

diff --git a/src/utils.js b/src/utils.js
@@ -383,6 +383,16 @@ export function getFilenameFromUrl(url) {
 	return url.match(/\/([^/]*)$/)[1];
 }
 
+export function blobToBase64(blob) {
+	const reader = new FileReader();
+	reader.readAsDataURL(blob);
+	return new Promise(resolve => {
+		reader.onloadend = () => {
+			resolve(reader.result);
+		};
+	});
+}
+
 if (window.IS_EXTENSION) {
 	document.body.classList.add('is-extension');
 } else {