diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue index 9e64fa5dd5..eaf2d19326 100644 --- a/packages/nc-gui/components/project/AccessSettings.vue +++ b/packages/nc-gui/components/project/AccessSettings.vue @@ -118,6 +118,7 @@ const updateCollaborator = async (collab: any, roles: ProjectRoles) => { } else { currentCollaborator.roles = ProjectRoles.NO_ACCESS } + currentCollaborator.base_roles = null } else if (currentCollaborator.base_roles) { currentCollaborator.roles = roles await updateProjectUser(currentBase.value.id!, currentCollaborator as unknown as User) diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue index 16c00d6191..ac60e4e635 100644 --- a/packages/nc-gui/components/smartsheet/Form.vue +++ b/packages/nc-gui/components/smartsheet/Form.vue @@ -361,7 +361,7 @@ async function handleAddOrRemoveAllColumns(value: T) { } async function checkSMTPStatus() { - if (emailMe.value) { + if (emailMe.value && !isEeUI) { const emailPluginActive = await $api.plugin.status('SMTP') if (!emailPluginActive) { emailMe.value = false diff --git a/packages/nocodb-sdk/src/lib/UITypes.ts b/packages/nocodb-sdk/src/lib/UITypes.ts index c7589f83d9..f5a3c6d42b 100644 --- a/packages/nocodb-sdk/src/lib/UITypes.ts +++ b/packages/nocodb-sdk/src/lib/UITypes.ts @@ -241,6 +241,7 @@ export const getEquivalentUIType = ({ case FormulaDataTypes.DATE: return UITypes.DateTime; case FormulaDataTypes.LOGICAL: + case FormulaDataTypes.COND_EXP: case FormulaDataTypes.BOOLEAN: return UITypes.Checkbox; }