Merge pull request #8826 from nocodb/nc-fix/misc-bugs

Nc fix/misc bugs

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)

packages/nc-gui/components/smartsheet/Form.vue

@@ -361,7 +361,7 @@ async function handleAddOrRemoveAllColumns<T>(value: T) {
 }
 
 async function checkSMTPStatus() {
-  if (emailMe.value) {
+  if (emailMe.value && !isEeUI) {
     const emailPluginActive = await $api.plugin.status('SMTP')
     if (!emailPluginActive) {
       emailMe.value = false

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;
   }