diff --git a/ui_src/src/components/sdkExsample/index.js b/ui_src/src/components/sdkExsample/index.js index 1cd48ff83..08af8db37 100644 --- a/ui_src/src/components/sdkExsample/index.js +++ b/ui_src/src/components/sdkExsample/index.js @@ -18,6 +18,7 @@ import * as monaco from 'monaco-editor'; import { PROTOCOL_CODE_EXAMPLE, SDK_CODE_EXAMPLE, selectLngOption, selectProtocolLngOptions } from '../../const/codeExample'; import { + LOCAL_STORAGE_ACCOUNT_ID, LOCAL_STORAGE_BROKER_HOST, LOCAL_STORAGE_ENV, LOCAL_STORAGE_REST_GW_HOST, @@ -63,12 +64,14 @@ const SdkExample = ({ consumer, showTabs = true, stationName, username, connecti localStorage.getItem(LOCAL_STORAGE_ENV) === 'docker' ? 'localhost' : localStorage.getItem(LOCAL_STORAGE_BROKER_HOST) - ? localStorage.getItem(LOCAL_STORAGE_BROKER_HOST) - : 'memphis.memphis.svc.cluster.local'; + ? localStorage.getItem(LOCAL_STORAGE_BROKER_HOST) + : 'memphis.memphis.svc.cluster.local'; codeEx.producer = codeEx.producer?.replaceAll('', host); codeEx.consumer = codeEx.consumer?.replaceAll('', host); codeEx.producer = codeEx.producer?.replaceAll('', stationName); codeEx.consumer = codeEx.consumer?.replaceAll('', stationName); + codeEx.producer = codeEx.producer?.replaceAll('', localStorage.getItem(LOCAL_STORAGE_ACCOUNT_ID)); + codeEx.consumer = codeEx.consumer?.replaceAll('', localStorage.getItem(LOCAL_STORAGE_ACCOUNT_ID)); if (username) { codeEx.producer = codeEx.producer?.replaceAll('', username); codeEx.consumer = codeEx.consumer?.replaceAll('', username); @@ -86,6 +89,20 @@ const SdkExample = ({ consumer, showTabs = true, stationName, username, connecti codeEx.consumer = codeEx.consumer?.replaceAll('connection_token', 'password'); codeEx.producer = codeEx.producer?.replaceAll('', ''); codeEx.consumer = codeEx.consumer?.replaceAll('', ''); + } else { + const accountId = localStorage.getItem(LOCAL_STORAGE_ACCOUNT_ID) + const regexPatternGo = `, memphis\.AccountId\("${accountId}"\)`; + codeEx.producer = codeEx.producer?.replaceAll(regexPatternGo, ""); + codeEx.consumer = codeEx.consumer?.replaceAll(regexPatternGo, ""); + const regexPatternJs = `accountId: '${accountId}'`; + codeEx.producer = codeEx.producer?.replaceAll(regexPatternJs, ""); + codeEx.consumer = codeEx.consumer?.replaceAll(regexPatternJs, ""); + codeEx.producer = codeEx.producer?.replaceAll(regexPatternJs, ""); + codeEx.consumer = codeEx.consumer?.replaceAll(regexPatternJs, ""); + + const regexPatternPython = `, account_id="${accountId}"`; + codeEx.producer = codeEx.producer?.replaceAll(regexPatternPython, ""); + codeEx.consumer = codeEx.consumer?.replaceAll(regexPatternPython, ""); } setCodeExample(codeEx); } diff --git a/ui_src/src/const/codeExample.js b/ui_src/src/const/codeExample.js index 987f8e140..3e349d6b6 100644 --- a/ui_src/src/const/codeExample.js +++ b/ui_src/src/const/codeExample.js @@ -24,7 +24,8 @@ export const SDK_CODE_EXAMPLE = { memphisConnection = await memphis.connect({ host: '', username: '', - connectionToken: '' + connectionToken: '', + accountId: '' }); const producer = await memphisConnection.producer({ @@ -55,7 +56,8 @@ export const SDK_CODE_EXAMPLE = { memphisConnection = await memphis.connect({ host: '', username: '', - connectionToken: '' + connectionToken: '', + accountId: '' }); const consumer = await memphisConnection.consumer({ @@ -99,7 +101,8 @@ export const SDK_CODE_EXAMPLE = { memphisConnection = await memphis.connect({ host: '', username: '', - connectionToken: '' + connectionToken: '', + accountId: '' }); const producer = await memphisConnection.producer({ @@ -130,7 +133,8 @@ export const SDK_CODE_EXAMPLE = { memphisConnection = await memphis.connect({ host: '', username: '', - connectionToken: '' + connectionToken: '', + accountId: '' }); const consumer = await memphisConnection.consumer({ @@ -169,7 +173,7 @@ import ( ) func main() { - conn, err := memphis.Connect("", "", memphis.ConnectionToken("")) + conn, err := memphis.Connect("", "", memphis.ConnectionToken(""), memphis.AccountId("")) if err != nil { os.Exit(1) } @@ -204,7 +208,7 @@ import ( ) func main() { - conn, err := memphis.Connect("", "", memphis.ConnectionToken("")) + conn, err := memphis.Connect("", "", memphis.ConnectionToken(""), memphis.AccountId("")) if err != nil { os.Exit(1) } @@ -254,7 +258,7 @@ from memphis import Memphis, Headers, MemphisError, MemphisConnectError, Memphis async def main(): try: memphis = Memphis() - await memphis.connect(host="", username="", connection_token="") + await memphis.connect(host="", username="", connection_token="", account_id="") producer = await memphis.producer(station_name="", producer_name="") # you can send the message parameter as dict as well headers = Headers() @@ -289,7 +293,7 @@ async def main(): try: memphis = Memphis() - await memphis.connect(host="", username="", connection_token="") + await memphis.connect(host="", username="", connection_token="", account_id="") consumer = await memphis.consumer(station_name="", consumer_name="", consumer_group="") consumer.set_context({"key": "value"})