Refactor routing form and destination selector[latest]

Author: shenjinti

locales/en.toml

@@ -586,9 +586,7 @@ action_trunks_title = "Action & trunks"
 action_trunks_desc = "Choose how destinations are selected and how weights are distributed across trunks."
 dest_type_label = "Destination type"
 dest_sip_trunks = "SIP trunks"
-dest_queue = "Queue"
-dest_voicemail = "Voicemail"
-dest_ivr = "IVR"
+dest_other = "Destination"
 selection_algorithm_label = "Selection algorithm"
 hash_key_label = "Hash key"
 trunk_pool_label = "Trunk pool"
@@ -1599,6 +1597,19 @@ loading = "Loading..."
 copied = "Copied"
 url_copied = "Metrics URL copied to clipboard"
 
+[destination_selector]
+extension = "Extension"
+queue = "Queue"
+ivr = "IVR"
+voicemail = "Voicemail"
+uri = "SIP URI"
+search_extension = "Search extension..."
+select_queue = "Select queue..."
+select_ivr = "Select IVR..."
+no_results = "No results"
+voicemail_extension = "Extension number"
+uri_placeholder = "sip:user@domain"
+
 [diagnostics]
 title = "Diagnostics"
 operational_validation = "Operational validation"

locales/zh.toml

@@ -586,9 +586,7 @@ action_trunks_title = "操作与中继"
 action_trunks_desc = "选择目标的选取方式以及各中继的权重分配。"
 dest_type_label = "目标类型"
 dest_sip_trunks = "SIP 中继"
-dest_queue = "队列"
-dest_voicemail = "语音信箱"
-dest_ivr = "IVR"
+dest_other = "其他目标"
 selection_algorithm_label = "选择算法"
 hash_key_label = "哈希字段"
 trunk_pool_label = "中继池"
@@ -1584,6 +1582,19 @@ loading = "加载中..."
 copied = "已复制"
 url_copied = "指标链接已复制到剪贴板"
 
+[destination_selector]
+extension = "分机"
+queue = "队列"
+ivr = "IVR"
+voicemail = "语音信箱"
+uri = "SIP URI"
+search_extension = "搜索分机..."
+select_queue = "选择队列..."
+select_ivr = "选择 IVR..."
+no_results = "无结果"
+voicemail_extension = "分机号码"
+uri_placeholder = "sip:user@domain"
+
 [diagnostics]
 title = "诊断"
 operational_validation = "运行验证"

src/addons/cc

@@ -231,6 +231,13 @@ pub async fn page_queue_create(
     AuthRequired(_): AuthRequired,
 ) -> Response {
     let script_path = format!("{}/queues/new", state.base_path());
+    let forwarding_catalog = if let Some(proxy_config) =
+        crate::console::catalog::load_proxy_config(state.app_state().as_ref())
+    {
+        crate::console::catalog::build_forwarding_catalog(&proxy_config)
+    } else {
+        crate::console::catalog::ForwardingCatalog::empty()
+    };
     state.render_with_headers(
         "queue_detail.html",
         json!({
@@ -242,6 +249,7 @@ pub async fn page_queue_create(
                 "tags": Vec::<String>::new(),
                 "metadata_text": "",
             },
+            "forwarding_catalog": forwarding_catalog,
             "create_url": state.url_for("/queues"),
             "update_url": Value::Null,
             "list_url": state.url_for("/queues"),
@@ -276,6 +284,13 @@ pub async fn page_queue_edit(
     let tags = queue_tags(model.metadata.as_ref());
 
     let script_path = format!("{}/queues/{}", state.base_path(), model.id);
+    let forwarding_catalog = if let Some(proxy_config) =
+        crate::console::catalog::load_proxy_config(state.app_state().as_ref())
+    {
+        crate::console::catalog::build_forwarding_catalog(&proxy_config)
+    } else {
+        crate::console::catalog::ForwardingCatalog::empty()
+    };
     state.render_with_headers(
         "queue_detail.html",
         json!({
@@ -291,6 +306,7 @@ pub async fn page_queue_edit(
                 "metadata_text": metadata_text,
                 "updated_at": model.updated_at.to_rfc3339(),
             },
+            "forwarding_catalog": forwarding_catalog,
             "create_url": state.url_for("/queues"),
             "update_url": state.url_for(&format!("/queues/{}", model.id)),
             "list_url": state.url_for("/queues"),

src/addons/ivr_editor

@@ -211,35 +211,15 @@ <h1 class="text-2xl font-semibold text-slate-900">{{ "queue.title" | t }}</h1>
                                                     d="M13.5 3.5l3 3-8 8H5.5v-3l8-8z" />
                                             </svg>
                                         </a>
-                                        <button type="button" :title="tt('queue.export_queue')"
-                                            class="inline-flex items-center justify-center rounded-full border border-slate-200 p-2 text-slate-500 transition"
-                                            :class="exportingQueueId === queue.id ? 'cursor-not-allowed border-slate-100 text-slate-300' : 'hover:border-indigo-300 hover:text-indigo-600'"
-                                            :disabled="exportingQueueId === queue.id" @click="exportQueue(queue)">
-                                            <span class="sr-only" x-text="tt('queue.export_queue')"></span>
-                                            <template x-if="exportingQueueId === queue.id">
-                                                <svg class="h-4 w-4 animate-spin" viewBox="0 0 24 24" fill="none"
-                                                    stroke="currentColor" stroke-width="1.8">
-                                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                                        d="M12 3v3m6.364 1.636-2.121 2.121M21 12h-3m-1.636 6.364-2.121-2.121M12 21v-3m-6.364-1.636 2.121-2.121M3 12h3m1.636-6.364 2.121 2.121" />
-                                                </svg>
-                                            </template>
-                                            <template x-if="exportingQueueId !== queue.id">
-                                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                                    stroke-width="1.5" stroke="currentColor" class="size-4">
-                                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                                        d="M19.5 13.5 12 21m0 0-7.5-7.5M12 21V3" />
-                                                </svg>
-                                            </template>
-                                        </button>
                                         <button type="button" :title="tt('queue.delete_queue')"
                                             class="inline-flex items-center justify-center rounded-full border border-slate-200 p-2 text-slate-500 transition"
                                             :class="processingDelete === queue.id ? 'cursor-not-allowed border-slate-100 text-slate-300' : 'hover:border-rose-300 hover:text-rose-600'"
                                             :disabled="processingDelete === queue.id" @click="confirmDelete(queue)">
                                             <span class="sr-only" x-text="tt('queue.delete_queue')"></span>
-                                            <svg class="h-4 w-4" viewBox="0 0 20 20" fill="none" stroke="currentColor"
+                                            <svg class="h-4 w-4" viewBox="0 0 24 24" fill="none" stroke="currentColor"
                                                 stroke-width="1.6">
                                                 <path stroke-linecap="round" stroke-linejoin="round"
-                                                    d="M6 7h8m-7 0v8m3-8v8m3-8v8M4 7h12M8 4h4a1 1 0 011 1v2H7V5a1 1 0 011-1z" />
+                                                    d="M3 6h18M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2M10 11v6M14 11v6" />
                                             </svg>
                                         </button>
                                     </div>
@@ -372,7 +352,6 @@ <h1 class="text-2xl font-semibold text-slate-900">{{ "queue.title" | t }}</h1>
             perPage: 20,
             processingDelete: null,
             exportingAll: false,
-            exportingQueueId: null,
             reloading: false,
             pendingReload: false,
             showingFrom: 0,
@@ -699,36 +678,6 @@ <h1 class="text-2xl font-semibold text-slate-900">{{ "queue.title" | t }}</h1>
                     this.exportingAll = false;
                 }
             },
-            exportEndpoint(queue) {
-                if (!queue) return null;
-                if (typeof queue.export_url === 'string' && queue.export_url.trim().length) return queue.export_url;
-                return `${this.apiBase}/queues/${queue.id}/export`;
-            },
-            async exportQueue(queue) {
-                if (!queue || !queue.id || this.exportingQueueId === queue.id) return;
-                const endpoint = this.exportEndpoint(queue);
-                if (!endpoint) return;
-                this.exportingQueueId = queue.id;
-                this.error = null;
-                try {
-                    const response = await fetch(endpoint, {
-                        method: 'POST',
-                        headers: { 'Accept': 'application/json' },
-                    });
-                    const data = await response.json().catch(() => ({}));
-                    if (!response.ok) throw new Error(data?.message || this.tt('queue.export_error'));
-                    const path = data?.path || data?.paths?.[0];
-                    this.flash = path
-                        ? this.tt('queue.queue_exported_to').replace('{path}', path)
-                        : this.tt('queue.queue_exported');
-                    await this.refresh();
-                } catch (err) {
-                    console.error(err);
-                    this.error = err?.message || this.tt('queue.export_error');
-                } finally {
-                    this.exportingQueueId = null;
-                }
-            },
         }));
     });
 </script>

src/addons/queue/console/handlers.rs

@@ -207,24 +207,6 @@ <h2 class="text-sm font-semibold text-slate-900" x-text="tt('queue.section_targe
                             <span class="text-xs font-normal text-slate-400"
                                 x-text="tt('queue.field_ring_timeout_hint')"></span>
                         </label>
-                        <label class="md:col-span-2 flex flex-col gap-2 text-sm font-medium text-slate-700">
-                            <span x-text="tt('queue.field_acd_policy')"></span>
-                            <template x-if="acdPolicies.length">
-                                <select x-model="form.spec.acd_policy"
-                                    class="rounded-lg border border-slate-200 bg-white px-3 py-2 text-sm text-slate-700 focus:border-sky-300 focus:outline-none focus:ring-2 focus:ring-sky-200">
-                                    <option value="" x-text="tt('queue.field_acd_policy_placeholder')"></option>
-                                    <template x-for="policy in acdPolicies" :key="policy.name">
-                                        <option :value="policy.name" x-text="policy.name"></option>
-                                    </template>
-                                </select>
-                            </template>
-                            <template x-if="!acdPolicies.length">
-                                <input type="text" x-model.trim="form.spec.acd_policy"
-                                    class="rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-700 focus:border-sky-300 focus:outline-none focus:ring-2 focus:ring-sky-200"
-                                    :placeholder="tt('queue.field_acd_policy_placeholder')">
-                            </template>
-                            <span class="text-xs font-normal text-slate-400" x-text="tt('queue.field_acd_policy_hint')"></span>
-                        </label>
                     </div>
                     <div class="space-y-3">
                         <div class="flex items-center justify-between">
@@ -329,12 +311,13 @@ <h2 class="text-sm font-semibold text-slate-900" x-text="tt('queue.section_fallb
                             <span x-text="tt('queue.fallback_failure_opt')"></span>
                         </label>
                     </div>
-                    <div class="grid gap-4 md:grid-cols-2" x-show="fallbackMode === 'redirect'" x-cloak>
+                    <div x-show="fallbackMode === 'redirect'" x-cloak
+                        @destination-change="form.spec.fallback.redirect = $event.detail.type === 'extension' ? 'sip:' + $event.detail.value : ($event.detail.type === 'uri' ? $event.detail.value : $event.detail.type + ':' + $event.detail.value)">
                         <label class="flex flex-col gap-2 text-sm font-medium text-slate-700">
                             <span x-text="tt('queue.fallback_redirect_label')"></span>
-                            <input type="text" x-model.trim="form.spec.fallback.redirect"
-                                class="rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-700 focus:border-sky-300 focus:outline-none focus:ring-2 focus:ring-sky-200"
-                                :placeholder="tt('queue.fallback_redirect_placeholder')">
+                            {% set queue_items = forwarding_catalog.queues | default([]) %}
+                            {% set ivr_items = forwarding_catalog.ivr_projects | default([]) %}
+                            {% include "console/_destination_selector.html" %}
                         </label>
                     </div>
                     <div class="grid gap-4 md:grid-cols-2" x-show="fallbackMode === 'failure'" x-cloak>
@@ -742,7 +725,6 @@ <h3 class="text-sm font-semibold text-slate-800" x-text="tt('queue.section_final
             pageTitle: options.mode === 'edit' ? (window._queueTranslations?.queue?.detail_subtitle_edit || 'Edit queue') : (window._queueTranslations?.queue?.new_queue || 'New queue'),
             activeTab: 'overview',
             skillGroups: [],
-            acdPolicies: [],
             pendingSkillGroup: '',
             form: {
                 name: '',
@@ -770,7 +752,6 @@ <h3 class="text-sm font-semibold text-slate-800" x-text="tt('queue.section_final
                         targets: [],
                         skill_groups: [],
                     },
-                    acd_policy: '',
                     voice_prompts: null,
                     // Callback
                     callback: {
@@ -831,7 +812,6 @@ <h3 class="text-sm font-semibold text-slate-800" x-text="tt('queue.section_final
                 this.apiPrefix = this.normalizeApiPrefix(this.apiPrefix || window.__consoleApiPrefix || '/api');
                 this.applyModel(this.model || {});
                 this.loadSkillGroups();
-                this.loadAcdPolicies();
             },
             extractSkillGroupId(value) {
                 const raw = String(value || '').trim();
@@ -904,27 +884,6 @@ <h3 class="text-sm font-semibold text-slate-800" x-text="tt('queue.section_final
                         });
                 }
             },
-            loadAcdPolicies() {
-                const loader = window.__ccAcdPoliciesLoader;
-                if (typeof loader === 'function') {
-                    loader()
-                        .then((policies) => {
-                            this.acdPolicies = Array.isArray(policies) ? policies : [];
-                        })
-                        .catch(() => {
-                            this.acdPolicies = [];
-                        });
-                    return;
-                }
-                fetch(this.apiPrefix + '/cc/acd/policies', { credentials: 'same-origin' })
-                    .then(res => res.ok ? res.json() : { data: [] })
-                    .then(payload => {
-                        this.acdPolicies = Array.isArray(payload?.data) ? payload.data : [];
-                    })
-                    .catch(() => {
-                        this.acdPolicies = [];
-                    });
-            },
 
             tt(key) {
                 const parts = key.split('.');
@@ -1171,7 +1130,6 @@ <h3 class="text-sm font-semibold text-slate-800" x-text="tt('queue.section_final
                             });
                         })(),
                     },
-                    acd_policy: raw?.acd_policy || '',
                     voice_prompts: raw?.voice_prompts || null,
                     // Callback
                     callback: {
@@ -1321,10 +1279,6 @@ <h3 class="text-sm font-semibold text-slate-800" x-text="tt('queue.section_final
                         targets,
                     };
                 }
-                const acdPolicy = (this.form.spec.acd_policy || '').trim();
-                if (acdPolicy) {
-                    spec.acd_policy = acdPolicy;
-                }
                 // Voice prompts
                 spec.voice_prompts = this.buildVoicePrompts();
                 // Callback