ben.carrasco/jambonz-webapp
1
0
Fork 0
mirror of https://github.com/jambonz/jambonz-webapp.git synced 2025-12-19 05:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

add special field for Carriers in env vars (#561)

Browse Source 
* add special field for Carriers in env vars

* wip

* wip
This commit is contained in:
Hoan Luu Huu
2025-09-05 19:04:24 +07:00
committed by GitHub
parent f7f4a2e7b1
commit 6836a99635
3 changed files with 96 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/types.ts
View File

@@ -1,4 +1,10 @@
import type { Language, Model, Vendor, VoiceLanguage } from "src/vendor/types";
import type {
JambonzResourceOptions,
Language,
Model,
Vendor,
VoiceLanguage,
} from "src/vendor/types";
/** Simple types */
@@ -825,6 +831,8 @@ export interface AppEnvProperty {
obscure?: boolean;
uiHint?: "input" | "textarea" | "filepicker";
enum?: string[];
jambonzResource?: "carriers";
jambonzResourceOptions?: JambonzResourceOptions[];
}
export interface AppEnv {

103
src/containers/internal/views/applications/form.tsx
View File

@@ -25,6 +25,7 @@ import {
useServiceProviderData,
useApiData,
getAppEnvSchema,
getSPVoipCarriers,
} from "src/api";
import {
ROUTE_INTERNAL_ACCOUNTS,
@@ -588,6 +589,51 @@ export const ApplicationForm = ({ application }: ApplicationFormProps) => {
setFallbackSpeechRecognizerLabel(tmp);
};
const fetchAppEnvJambonzResources = async (appEnv: AppEnv) => {
if (appEnv) {
const promises = Object.entries(appEnv).map(async ([key, value]) => {
const { jambonzResource } = value;
switch (jambonzResource) {
case "carriers":
const carriers = await getSPVoipCarriers(
currentServiceProvider?.service_provider_sid || "",
{
page: 1,
page_size: 10000,
...(user?.account_sid && {
account_sid: user.account_sid,
}),
},
);
if (carriers.json.total) {
return {
key,
jambonzResourceOptions: carriers.json.data.map((carrier) => ({
name: carrier.name,
value: carrier.name,
})),
};
}
break;
default:
break;
}
return { key, jambonzResourceOptions: null };
});
const results = await Promise.all(promises);
// Merge the results back into appEnv
results.forEach(({ key, jambonzResourceOptions }) => {
if (jambonzResourceOptions) {
appEnv[key].jambonzResourceOptions = jambonzResourceOptions;
}
});
}
return appEnv;
};
useEffect(() => {
if (callWebhook && callWebhook.url) {
// Clear any existing timeout to prevent multiple requests
@@ -599,19 +645,26 @@ export const ApplicationForm = ({ application }: ApplicationFormProps) => {
appEnvTimeoutRef.current = setTimeout(() => {
getAppEnvSchema(callWebhook.url)
.then(({ json }) => {
setAppEnv(json);
const defaultEnvVars = Object.keys(json).reduce((acc, key) => {
const value = json[key];
if (value?.default) {
return { ...acc, [key]: value.default };
}
return acc;
}, {});
// fetch app env jambonz_resource
fetchAppEnvJambonzResources(json).then((updatedEnv) => {
setAppEnv(updatedEnv);
const defaultEnvVars = Object.keys(updatedEnv).reduce(
(acc, key) => {
const value = updatedEnv[key];
if (value?.default) {
return { ...acc, [key]: value.default };
}
return acc;
},
{},
);
setEnvVars((prev) => ({
...defaultEnvVars,
...(prev || {}),
}));
setEnvVars((prev) => ({
...defaultEnvVars,
...(prev || {}),
}));
});
// Default value
})
.catch((error) => {
setMessage(error.msg);
@@ -873,9 +926,13 @@ export const ApplicationForm = ({ application }: ApplicationFormProps) => {
};
const isDropdown =
webhook.webhookEnv![key].type === "string" &&
(webhook.webhookEnv![key].enum?.length || 0) >
0;
(webhook.webhookEnv![key].type === "string" &&
(webhook.webhookEnv![key].enum?.length ||
0) > 0) ||
hasLength(
webhook.webhookEnv![key]
.jambonzResourceOptions,
);
const textAreaSpecificProps = {
rows: 6,
@@ -888,15 +945,19 @@ export const ApplicationForm = ({ application }: ApplicationFormProps) => {
? ObscureInput
: webhook.webhookEnv![key].uiHint || "input";
if (isDropdown) {
const options =
webhook.webhookEnv![key]
.jambonzResourceOptions ||
webhook.webhookEnv![key].enum!.map(
(option) => ({
name: option,
value: option,
}),
);
return (
<Selector
{...commonProps}
options={webhook.webhookEnv![
key
].enum!.map((option) => ({
name: option,
value: option,
}))}
options={options}
/>
);
}

5
src/vendor/types.ts vendored
View File

@@ -34,6 +34,11 @@ export interface LabelOptions {
value: string;
}
export interface JambonzResourceOptions {
name: string;
value: string;
}
export interface Region {
name: string;
value: string;