rodrigo/iachat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

feat: Gray out Microsoft email option when Azure App ID is not configured (#9087)

Browse Source 
Fixes #9083 

Co-authored-by: Pranav <pranavrajs@gmail.com>
This commit is contained in:
MJRT 2024-05-03 06:05:08 +08:00 committed by GitHub
parent 2769b03cc8
commit 5693a91fd3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/dashboard/components/ChannelSelector.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<button <button
class="sm:w-[50%] md:w-1/3 lg:w-1/4 bg-white dark:bg-slate-900 cursor-pointer flex flex-col transition-all duration-200 ease-in -m-px py-4 px-0 items-center border border-solid border-slate-25 dark:border-slate-800 hover:border-woot-500 dark:hover:border-woot-500 hover:shadow-md hover:z-50 disabled:opacity-60" class="bg-white dark:bg-slate-900 cursor-pointer flex flex-col transition-all duration-200 ease-in -m-px py-4 px-0 items-center border border-solid border-slate-25 dark:border-slate-800 hover:border-woot-500 dark:hover:border-woot-500 hover:shadow-md hover:z-50 disabled:opacity-60"
@click="$emit('click')" @click="$emit('click')"
> >
<img :src="src" :alt="title" class="w-[50%] my-4 mx-auto" /> <img :src="src" :alt="title" class="w-1/2 my-4 mx-auto" />
<h3 <h3
class="text-slate-800 dark:text-slate-100 text-base text-center capitalize" class="text-slate-800 dark:text-slate-100 text-base text-center capitalize"
> >

5
app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
View File

@ -3,6 +3,7 @@
class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0" class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
> >
<page-header <page-header
class="max-w-4xl"
:header-title="$t('INBOX_MGMT.ADD.AUTH.TITLE')" :header-title="$t('INBOX_MGMT.ADD.AUTH.TITLE')"
:header-content=" :header-content="
useInstallationName( useInstallationName(
@ -11,7 +12,9 @@
) )
" "
/> />
<div class="mt-6 mx-0 flex flex-wrap"> <div
class="mt-6 grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 mx-0 max-w-3xl"
>
<channel-item <channel-item
v-for="channel in channelList" v-for="channel in channelList"
:key="channel.key" :key="channel.key"

24
app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Email.vue
View File

@ -4,16 +4,18 @@
class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full md:w-full max-w-full md:max-w-[75%] flex-shrink-0 flex-grow-0" class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full md:w-full max-w-full md:max-w-[75%] flex-shrink-0 flex-grow-0"
> >
<page-header <page-header
class="max-w-4xl"
:header-title="$t('INBOX_MGMT.ADD.EMAIL_PROVIDER.TITLE')" :header-title="$t('INBOX_MGMT.ADD.EMAIL_PROVIDER.TITLE')"
:header-content="$t('INBOX_MGMT.ADD.EMAIL_PROVIDER.DESCRIPTION')" :header-content="$t('INBOX_MGMT.ADD.EMAIL_PROVIDER.DESCRIPTION')"
/> />
<div class="flex flex-row flex-wrap mx-0 mt-6"> <div class="grid grid-cols-4 max-w-3xl mx-0 mt-6">
<channel-selector <channel-selector
v-for="emailProvider in emailProviderList" v-for="emailProvider in emailProviderList"
:key="emailProvider.key" :key="emailProvider.key"
:class="{ inactive: !emailProvider.isEnabled }"
:title="emailProvider.title" :title="emailProvider.title"
:src="emailProvider.src" :src="emailProvider.src"
@click="() => onClick(emailProvider.key)" @click="() => onClick(emailProvider)"
/> />
</div> </div>
</div> </div>
@ -38,7 +40,10 @@ export default {
return { provider: '' }; return { provider: '' };
}, },
computed: { computed: {
...mapGetters({ globalConfig: 'globalConfig/get' }), ...mapGetters({
globalConfig: 'globalConfig/get',
isAChatwootInstance: 'globalConfig/isAChatwootInstance',
}),
emailProviderList() { emailProviderList() {
return [ return [
{ {
@ -53,12 +58,19 @@ export default {
key: 'other_provider', key: 'other_provider',
src: '/assets/images/dashboard/channels/email.png', src: '/assets/images/dashboard/channels/email.png',
}, },
].filter(provider => provider.isEnabled); ].filter(provider => {
if (this.isAChatwootInstance) {
return true;
}
return provider.isEnabled;
});
}, },
}, },
methods: { methods: {
onClick(provider) { onClick(emailProvider) {
this.provider = provider; if (emailProvider.isEnabled) {
this.provider = emailProvider.key;
}
}, },
}, },
}; };