diff --git a/addons/internal/connector-ui/src/ConnectorPage.jsx b/addons/internal/connector-ui/src/ConnectorPage.jsx
index 0158827da..6a89e20ae 100644
--- a/addons/internal/connector-ui/src/ConnectorPage.jsx
+++ b/addons/internal/connector-ui/src/ConnectorPage.jsx
@@ -19,7 +19,7 @@ import { Check, Field, HintLabels, Notice, RadioCards, Select, Switch, TextInput
import NameList from './NameList'
import PermissionFields, { NoCapsNotice } from './PermissionFields'
import { agentsApi, connectorsApi, setApiLanguage } from './api'
-import { canSave, channelOnly, connectorForm, hasNoCaps, connectorPayload, emptyConnector, listEntries, replaceList, senderLine, usualCaps } from './connector'
+import { DUPLICATE_CONFIRMATION, canSave, channelOnly, duplicateOther, duplicateRefusalName, isDuplicateRefusal, connectorForm, hasNoCaps, connectorPayload, emptyConnector, listEntries, replaceList, senderLine, usualCaps } from './connector'
import { registerConnectorLocales } from './i18n'
import './connector.css'
@@ -67,6 +67,23 @@ function SingleToken({ form, setForm, t }) {
)
}
+// Two enabled connections that are the same bot: both answer every message.
+// The warning names the other one, offers to switch this one off and opens the
+// other. The host decides what is a duplicate (c.duplicate); this only shows it.
+function SameBotNotice({ c, s, busy, onOff, onOpen }) {
+ const other = duplicateOther(c)
+ if (!other) return null
+ return (
+
+
{s('dup.text', { name: other.name })}
+
+
+
+
+
+ )
+}
+
const ONE_LIST = [{ key: 'allow', label: 'allow', hint: 'allowHint', testId: 'connector-allow' }]
/**
@@ -102,6 +119,8 @@ export default function ConnectorPage({ kind, ns, testId, TokenFields = SingleTo
const [confirmed, setConfirmed] = useState(false)
const [busy, setBusy] = useState(false)
const [toDelete, setToDelete] = useState(null)
+ // The question after a save that would make this connection the same bot as another: { other }.
+ const [dupAsk, setDupAsk] = useState(null)
const [openSenders, setOpenSenders] = useState('')
const [kindInfo, setKindInfo] = useState(null)
const [capabilities, setCapabilities] = useState([])
@@ -162,7 +181,15 @@ export default function ConnectorPage({ kind, ns, testId, TokenFields = SingleTo
}, [items])
const agentName = (id) => agents.find((a) => a.id === id)?.name || id
- const open = (c) => { setForm(c); setConfirmed(Boolean(c.accept_any)); setNote(''); setPairedList(null) }
+ const open = (c) => { setForm(c); setConfirmed(Boolean(c.accept_any)); setNote(''); setPairedList(null); setDupAsk(null) }
+ // The question sits by the Save button, at the end of a long form: bring it into view.
+ useEffect(() => {
+ if (dupAsk) document.querySelector('[data-testid="duplicate-confirm"]')?.scrollIntoView?.({ block: 'nearest' })
+ }, [dupAsk])
+ const openById = (id) => {
+ const c = items.find((x) => x.id === id)
+ if (c) open({ ...connectorForm(c), ...(extraForm ? extraForm(c) : {}) })
+ }
const extra = (form) => ({ ...(messaging ? {} : { enabled: false, accept_any: false }), ...(extraBody ? extraBody(form) : {}) })
const check = async (c) => {
try {
@@ -179,14 +206,16 @@ export default function ConnectorPage({ kind, ns, testId, TokenFields = SingleTo
// The server refuses a token that the platform refuses. After a save with
// a new token, the page names the bot the token belongs to.
- const save = async (e) => {
- e.preventDefault()
+ const save = (e) => { e.preventDefault(); return doSave(false) }
+ // confirmDuplicate answers the question of a save that makes the connection a twin of another.
+ const doSave = async (confirmDuplicate) => {
setBusy(true)
setError('')
setNote('')
+ setDupAsk(null)
try {
const token = tokenOf(form).trim()
- const body = connectorPayload(form, kind, token, extra(form))
+ const body = connectorPayload(form, kind, token, { ...extra(form), ...(confirmDuplicate ? { confirm_duplicate: DUPLICATE_CONFIRMATION } : {}) })
const saved = form.id ? await connectorsApi.update(form.id, body) : await connectorsApi.create(body)
setForm(null)
await load()
@@ -195,7 +224,10 @@ export default function ConnectorPage({ kind, ns, testId, TokenFields = SingleTo
setNote(await check(saved))
} catch (err) { setError(t('checkFailed', { reason: err?.message || '' })) }
}
- } catch (err) { fail(err) } finally { setBusy(false) }
+ } catch (err) {
+ if (isDuplicateRefusal(err)) setDupAsk({ other: duplicateRefusalName(err) })
+ else fail(err)
+ } finally { setBusy(false) }
}
// The preset for a saved binding that has no permission on: the usual set,
@@ -260,6 +292,9 @@ export default function ConnectorPage({ kind, ns, testId, TokenFields = SingleTo
{form && (