-
+
{{ email }}
(inviteData.roles = role
:placeholder="$t('activity.enterEmail')"
class="w-full min-w-36 outline-none px-2"
data-testid="email-input"
- @keyup.enter="handleEnter"
@blur="isDivFocused = false"
+ @keyup.enter="handleEnter"
@paste.prevent="onPaste"
/>
{{
emailValidation.message
}}
+
+
+
+
+ {{ workspace.title }}
+
+
+
+
+
+
+
+
+ {{ workspace.title }}
+
+
+
+
+
{{ $t('labels.cancel') }}
- {{ $t('activity.inviteToBase') }}
+ {{ type === 'base' ? $t('activity.inviteToBase') : $t('activity.inviteToWorkspace') }}
+
+
diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index d88ca36ebb..05d39a43b9 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -7,7 +7,7 @@ const props = withDefaults(
defineProps<{
type?: NcProjectType | string
modelValue?: string
- size?: 'small' | 'medium' | 'large' | 'xlarge'
+ size?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge'
readonly?: boolean
iconClass?: string
}>(),
@@ -62,6 +62,7 @@ watch(
:class="{
'hover:bg-gray-500 hover:bg-opacity-15 cursor-pointer': !readonly,
'bg-gray-500 bg-opacity-15': isOpen,
+ 'h-5 w-5 text-base': size === 'xsmall',
'h-6 w-6 text-lg': size === 'small',
'h-8 w-8 text-xl': size === 'medium',
'h-10 w-10 text-2xl': size === 'large',
diff --git a/packages/nc-gui/components/general/CopyButton.vue b/packages/nc-gui/components/general/CopyButton.vue
new file mode 100644
index 0000000000..cc2b1c6584
--- /dev/null
+++ b/packages/nc-gui/components/general/CopyButton.vue
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
diff --git a/packages/nc-gui/components/general/WorkspaceIcon.vue b/packages/nc-gui/components/general/WorkspaceIcon.vue
index e5d14087ce..963078eb3f 100644
--- a/packages/nc-gui/components/general/WorkspaceIcon.vue
+++ b/packages/nc-gui/components/general/WorkspaceIcon.vue
@@ -6,6 +6,7 @@ const props = defineProps<{
workspace: WorkspaceType | undefined
hideLabel?: boolean
size?: 'small' | 'medium' | 'large'
+ isRounded?: boolean
}>()
const workspaceColor = computed(() => {
@@ -24,6 +25,7 @@ const size = computed(() => props.size || 'medium')
'min-w-4 w-4 h-4 rounded': size === 'small',
'min-w-6 w-6 h-6 rounded-md': size === 'medium',
'min-w-10 w-10 h-10 rounded-lg !text-base': size === 'large',
+ '!rounded-[50%]': props.isRounded,
}"
:style="{ backgroundColor: workspaceColor }"
>
diff --git a/packages/nc-gui/components/nc/Badge.vue b/packages/nc-gui/components/nc/Badge.vue
index 4ba282e4a4..774b1eecbf 100644
--- a/packages/nc-gui/components/nc/Badge.vue
+++ b/packages/nc-gui/components/nc/Badge.vue
@@ -4,17 +4,18 @@ const props = withDefaults(
color?: string
border?: boolean
size?: 'sm' | 'md' | 'lg'
+ rounded?: 'sm' | 'md' | 'lg'
}>(),
{
border: true,
size: 'sm',
+ rounded: 'md',
},
)
diff --git a/packages/nc-gui/components/nc/ErrorBoundary.vue b/packages/nc-gui/components/nc/ErrorBoundary.vue
index cb3ce25abd..567a956f8a 100644
--- a/packages/nc-gui/components/nc/ErrorBoundary.vue
+++ b/packages/nc-gui/components/nc/ErrorBoundary.vue
@@ -20,7 +20,7 @@ export default {
onErrorCaptured((err) => {
if (import.meta.client && (!nuxtApp.isHydrating || !nuxtApp.payload.serverRendered)) {
- console.log('UI Error :', err)
+ console.error('UI Error :', err)
emit('error', err)
error.value = err
return false
diff --git a/packages/nc-gui/components/nc/Select.vue b/packages/nc-gui/components/nc/Select.vue
index bd109bdcf2..553501fee6 100644
--- a/packages/nc-gui/components/nc/Select.vue
+++ b/packages/nc-gui/components/nc/Select.vue
@@ -3,6 +3,7 @@ const props = defineProps<{
value?: string | string[]
placeholder?: string
mode?: 'multiple' | 'tags'
+ size?: 'small' | 'middle' | 'large'
dropdownClassName?: string
showSearch?: boolean
// filterOptions is a function
@@ -44,6 +45,7 @@ const onChange = (value: string) => {
-import {
- OrderedProjectRoles,
- OrgUserRoles,
- ProjectRoles,
- WorkspaceRolesToProjectRoles,
- extractRolesObj,
- parseStringDateTime,
- timeAgo,
-} from 'nocodb-sdk'
import type { Roles, WorkspaceUserRoles } from 'nocodb-sdk'
+import { OrderedProjectRoles, OrgUserRoles, ProjectRoles, WorkspaceRolesToProjectRoles } from 'nocodb-sdk'
import type { User } from '#imports'
import { isEeUI, storeToRefs, useUserSorts } from '#imports'
+const props = defineProps<{
+ baseId?: string
+}>()
+
const basesStore = useBases()
const { getBaseUsers, createProjectUser, updateProjectUser, removeProjectUser } = basesStore
-const { activeProjectId } = storeToRefs(basesStore)
+const { activeProjectId, bases } = storeToRefs(basesStore)
-const { orgRoles, baseRoles } = useRoles()
+const { orgRoles, baseRoles, loadRoles } = useRoles()
const { sorts, sortDirection, loadSorts, saveOrUpdate, handleGetSortedData } = useUserSorts('Project')
const isSuper = computed(() => orgRoles.value?.[OrgUserRoles.SUPER_ADMIN])
+const orgStore = useOrg()
+const { orgId } = storeToRefs(orgStore)
+
+const isAdminPanel = inject(IsAdminPanelInj, ref(false))
+
+const { $api } = useNuxtApp()
+
+const currentBase = computedAsync(async () => {
+ let base
+ if (props.baseId) {
+ await loadRoles(props.baseId)
+ base = bases.value.get(props.baseId)
+ if (!base) {
+ base = await $api.base.read(props.baseId!)
+ }
+ } else {
+ base = bases.value.get(activeProjectId.value)
+ }
+ return base
+})
+
const isInviteModalVisible = ref(false)
interface Collaborators {
@@ -56,8 +73,9 @@ const sortedCollaborators = computed(() => {
const loadCollaborators = async () => {
try {
+ if (!currentBase.value) return
const { users, totalRows } = await getBaseUsers({
- baseId: activeProjectId.value!,
+ baseId: currentBase.value.id!,
...(!userSearchText.value ? {} : ({ searchText: userSearchText.value } as any)),
force: true,
})
@@ -69,12 +87,11 @@ const loadCollaborators = async () => {
.map((user: any) => ({
...user,
base_roles: user.roles,
- roles: extractRolesObj(user.main_roles)?.[OrgUserRoles.SUPER_ADMIN]
- ? OrgUserRoles.SUPER_ADMIN
- : user.roles ??
- (user.workspace_roles
- ? WorkspaceRolesToProjectRoles[user.workspace_roles as WorkspaceUserRoles] ?? ProjectRoles.NO_ACCESS
- : ProjectRoles.NO_ACCESS),
+ roles:
+ user.roles ??
+ (user.workspace_roles
+ ? WorkspaceRolesToProjectRoles[user.workspace_roles as WorkspaceUserRoles] ?? ProjectRoles.NO_ACCESS
+ : ProjectRoles.NO_ACCESS),
})),
]
} catch (e: any) {
@@ -93,7 +110,7 @@ const updateCollaborator = async (collab: any, roles: ProjectRoles) => {
WorkspaceRolesToProjectRoles[currentCollaborator.workspace_roles as WorkspaceUserRoles] === roles &&
isEeUI)
) {
- await removeProjectUser(activeProjectId.value!, currentCollaborator as unknown as User)
+ await removeProjectUser(currentBase.value.id!, currentCollaborator as unknown as User)
if (
currentCollaborator.workspace_roles &&
WorkspaceRolesToProjectRoles[currentCollaborator.workspace_roles as WorkspaceUserRoles] === roles &&
@@ -105,11 +122,11 @@ const updateCollaborator = async (collab: any, roles: ProjectRoles) => {
}
} else if (currentCollaborator.base_roles) {
currentCollaborator.roles = roles
- await updateProjectUser(activeProjectId.value!, currentCollaborator as unknown as User)
+ await updateProjectUser(currentBase.value.id!, currentCollaborator as unknown as User)
} else {
currentCollaborator.roles = roles
currentCollaborator.base_roles = roles
- await createProjectUser(activeProjectId.value!, currentCollaborator as unknown as User)
+ await createProjectUser(currentBase.value.id!, currentCollaborator as unknown as User)
}
} catch (e: any) {
message.error(await extractSdkResponseErrorMsg(e))
@@ -142,24 +159,50 @@ watch(isInviteModalVisible, () => {
loadCollaborators()
}
})
+
+watch(currentBase, () => {
+ loadCollaborators()
+})
-
-
+
+
+
+
+
+ {{ $t('objects.projects') }}
+
+
+ /
+
+
+ {{ currentBase?.title }}
+
+
+
+
-
-
+
+
-
+
{{ $t('activity.addMembers') }}
@@ -188,7 +231,7 @@ watch(isInviteModalVisible, () => {
- {{ $t('general.access') }}
+ {{ $t('general.role') }}
@@ -203,17 +246,16 @@ watch(isInviteModalVisible, () => {
>
-
-
+
+
+
+ {{ collab.display_name || collab.email.slice(0, collab.email.indexOf('@')) }}
+
+
+
{{ collab.email }}
-
-
- {{ collab.display_name }}
-
-
- {{ collab.email }}
-
+
@@ -230,7 +272,7 @@ watch(isInviteModalVisible, () => {
/>
-
+
@@ -252,6 +294,18 @@ watch(isInviteModalVisible, () => {
diff --git a/packages/nc-gui/components/workspace/View.vue b/packages/nc-gui/components/workspace/View.vue
index 50750cf56a..d5f25a9254 100644
--- a/packages/nc-gui/components/workspace/View.vue
+++ b/packages/nc-gui/components/workspace/View.vue
@@ -1,5 +1,10 @@
-
-
-
-
- {{ activeWorkspace?.title }}
+
+
+
+
+ {{ currentWorkspace?.title }}
+
+
+
+
+ {{ $t('labels.workspaces') }}
+
+
+ /
+
+
+ {{ currentWorkspace?.title }}
+
+
+
+
-
+
@@ -90,7 +126,24 @@ onMounted(() => {
font-size: 0.7rem;
}
+.tab {
+ @apply flex flex-row items-center gap-x-2;
+}
+
+:deep(.ant-tabs-nav) {
+ @apply !pl-0;
+}
+
:deep(.ant-tabs-nav-list) {
- @apply !ml-3;
+ @apply !gap-5;
+}
+:deep(.ant-tabs-tab) {
+ @apply !pt-0 !pb-2.5 !ml-0;
+}
+.ant-tabs-content {
+ @apply !h-full;
+}
+.ant-tabs-content-top {
+ @apply !h-full;
}
diff --git a/packages/nc-gui/composables/useOrganization.ts b/packages/nc-gui/composables/useOrganization.ts
new file mode 100644
index 0000000000..3dea47c819
--- /dev/null
+++ b/packages/nc-gui/composables/useOrganization.ts
@@ -0,0 +1,23 @@
+export const useOrganization = () => {
+ const workspaces = ref([])
+ const members = ref([])
+ const bases = ref([])
+
+ const { orgId } = storeToRefs(useOrg())
+
+ const listWorkspaces = async (..._args: any) => {}
+
+ const fetchOrganizationMembers = async (..._args: any) => {}
+
+ const fetchOrganizationBases = async (..._args: any) => {}
+
+ return {
+ orgId,
+ workspaces,
+ listWorkspaces,
+ fetchOrganizationMembers,
+ fetchOrganizationBases,
+ bases,
+ members,
+ }
+}
diff --git a/packages/nc-gui/composables/useUserSorts.ts b/packages/nc-gui/composables/useUserSorts.ts
index 9182a701e5..1692d51952 100644
--- a/packages/nc-gui/composables/useUserSorts.ts
+++ b/packages/nc-gui/composables/useUserSorts.ts
@@ -9,7 +9,7 @@ import { useGlobal } from '#imports'
* @param {string} roleType - The type of role for which user sorts are managed ('Workspace', 'Org', or 'Project').
* @returns {object} An object containing reactive values and functions related to user sorts.
*/
-export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') {
+export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project' | 'Organization') {
const clone = rfdc()
const { user } = useGlobal()
@@ -110,6 +110,8 @@ export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') {
userRoleOrder = Object.values(OrderedOrgRoles)
} else if (roleType === 'Project') {
userRoleOrder = Object.values(OrderedProjectRoles)
+ } else if (roleType === 'Organization') {
+ userRoleOrder = Object.values(OrderedOrgRoles)
}
data = clone(data)
@@ -136,6 +138,13 @@ export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') {
return b[sortsConfig.field]?.localeCompare(a[sortsConfig.field])
}
}
+ case 'title': {
+ if (sortsConfig.direction === 'asc') {
+ return a[sortsConfig.field] - b[sortsConfig.field]
+ } else {
+ return b[sortsConfig.field] - a[sortsConfig.field]
+ }
+ }
}
return 0
diff --git a/packages/nc-gui/context/index.ts b/packages/nc-gui/context/index.ts
index dd5d02c427..cfc411a49e 100644
--- a/packages/nc-gui/context/index.ts
+++ b/packages/nc-gui/context/index.ts
@@ -57,3 +57,5 @@ export const TreeViewInj: InjectionKey<{
export const CalendarViewTypeInj: InjectionKey
> = Symbol('calendar-view-type-injection')
export const JsonExpandInj: InjectionKey> = Symbol('json-expand-injection')
export const AllFiltersInj: InjectionKey>> = Symbol('all-filters-injection')
+
+export const IsAdminPanelInj: InjectionKey> = Symbol('is-admin-panel-injection')
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index b0164345ec..f94af5d57a 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "Home",
"load": "Load",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Viewer",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organization Level Creator",
"orgLevelViewer": "Organization Level Viewer"
},
@@ -313,6 +319,10 @@
"isNotNull": "is not null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results"
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace":"-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "SAML",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Your search for {search} found no results",
diff --git a/packages/nc-gui/lib/acl.ts b/packages/nc-gui/lib/acl.ts
index c38247b0ce..837f14ddb4 100644
--- a/packages/nc-gui/lib/acl.ts
+++ b/packages/nc-gui/lib/acl.ts
@@ -36,6 +36,7 @@ const rolePermissions = {
newUser: true,
viewCreateOrEdit: true,
baseReorder: true,
+ orgAdminPanel: true,
},
},
[OrgUserRoles.VIEWER]: {
diff --git a/packages/nc-gui/lib/types.ts b/packages/nc-gui/lib/types.ts
index 0961e14ed5..2f8f1aa6e6 100644
--- a/packages/nc-gui/lib/types.ts
+++ b/packages/nc-gui/lib/types.ts
@@ -202,7 +202,7 @@ interface SidebarTableNode extends TableType {
}
interface UsersSortType {
- field?: 'email' | 'roles'
+ field?: 'email' | 'roles' | 'title' | 'id'
direction?: 'asc' | 'desc'
}
diff --git a/packages/nc-gui/middleware/02.auth.global.ts b/packages/nc-gui/middleware/02.auth.global.ts
index e4c8a4bf33..660ce7a2d3 100644
--- a/packages/nc-gui/middleware/02.auth.global.ts
+++ b/packages/nc-gui/middleware/02.auth.global.ts
@@ -37,6 +37,8 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
const { allRoles, loadRoles } = useRoles()
+ await checkForRedirect()
+
/** If baseHostname defined block home page access under subdomains, and redirect to workspace page */
if (
state.appInfo.value.baseHostName &&
@@ -196,3 +198,19 @@ async function tryShortTokenAuth(api: Api, signIn: Actions['signIn']) {
window.location.reload()
}
}
+
+/** Check if url contains redirect param and redirect to the url if found */
+async function checkForRedirect() {
+ if (window.location.search && /\bui-redirect=/.test(window.location.search)) {
+ let url
+ try {
+ url = decodeURIComponent(window.location.search.split('=')[1])
+ } catch (e: any) {
+ message.error(await extractSdkResponseErrorMsg(e))
+ }
+
+ const newURL = window.location.href.split('?')[0]
+ window.history.pushState('object', document.title, `${newURL}#${url}`)
+ window.location.reload()
+ }
+}
diff --git a/packages/nc-gui/store/workspace.ts b/packages/nc-gui/store/workspace.ts
index 8dc04f1efe..b989c9baa4 100644
--- a/packages/nc-gui/store/workspace.ts
+++ b/packages/nc-gui/store/workspace.ts
@@ -2,6 +2,7 @@ import type { BaseType } from 'nocodb-sdk'
import { acceptHMRUpdate, defineStore } from 'pinia'
import { message } from 'ant-design-vue'
import { isString } from '@vue/shared'
+import type { ThemeConfig } from '#imports'
import {
computed,
navigateTo,
@@ -13,7 +14,6 @@ import {
useRouter,
useTheme,
} from '#imports'
-import type { ThemeConfig } from '#imports'
export const useWorkspace = defineStore('workspaceStore', () => {
const basesStore = useBases()
@@ -92,6 +92,8 @@ export const useWorkspace = defineStore('workspaceStore', () => {
const loadWorkspace = async (..._args: any) => {}
+ const moveToOrg = async (..._args: any) => {}
+
async function populateWorkspace(..._args: any) {
isWorkspaceLoading.value = true
@@ -265,6 +267,7 @@ export const useWorkspace = defineStore('workspaceStore', () => {
workspaceUserCount,
getPlanLimit,
workspaceRole,
+ moveToOrg,
}
})
diff --git a/packages/nc-gui/utils/datetimeUtils.ts b/packages/nc-gui/utils/datetimeUtils.ts
new file mode 100644
index 0000000000..7b0979ac66
--- /dev/null
+++ b/packages/nc-gui/utils/datetimeUtils.ts
@@ -0,0 +1,28 @@
+import dayjs from 'dayjs'
+import { dateFormats, timeFormats } from 'nocodb-sdk'
+
+export function parseStringDateTime(
+ v: string,
+ dateTimeFormat: string = `${dateFormats[0]} ${timeFormats[0]}`,
+ toLocal: boolean = true,
+) {
+ const dayjsObj = toLocal ? dayjs(v).local() : dayjs(v)
+
+ if (dayjsObj.isValid()) {
+ v = dayjsObj.format(dateTimeFormat)
+ } else {
+ v = toLocal ? dayjs(v, dateTimeFormat).local().format(dateTimeFormat) : dayjs(v, dateTimeFormat).format(dateTimeFormat)
+ }
+
+ return v
+}
+
+export const timeAgo = (date: any) => {
+ if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(date)) {
+ // if there is no timezone info, consider as UTC
+ // e.g. 2023-01-01 08:00:00 (MySQL)
+ date += '+00:00'
+ }
+ // show in local time
+ return dayjs(date).fromNow()
+}
diff --git a/packages/nc-gui/utils/iconUtils.ts b/packages/nc-gui/utils/iconUtils.ts
index a286a5da2d..96ebd44266 100644
--- a/packages/nc-gui/utils/iconUtils.ts
+++ b/packages/nc-gui/utils/iconUtils.ts
@@ -125,6 +125,9 @@ import NcArrowLeft from '~icons/nc-icons/arrow-left'
import NcArrowRight from '~icons/nc-icons/arrow-right'
import NcUpload from '~icons/nc-icons/upload'
import NcDownload from '~icons/nc-icons/download'
+import NcOffice from '~icons/nc-icons/office'
+import NcArrowUpRight from '~icons/nc-icons/arrow-up-right'
+import NcSlash from '~icons/nc-icons/slash'
// import NcProjectGray from '~icons/nc-icons/project-gray'
import NcPhoneCall from '~icons/nc-icons/phone-call'
import NcItalic from '~icons/nc-icons/italic'
@@ -132,6 +135,9 @@ import NcBold from '~icons/nc-icons/bold'
import NcUnderline from '~icons/nc-icons/underline'
import NcCrop from '~icons/nc-icons/crop'
import NcLink from '~icons/nc-icons/link'
+import NcControlPanel from '~icons/nc-icons/control-panel'
+import NcHome from '~icons/nc-icons/home'
+import NcWorkspace from '~icons/nc-icons/workspace'
import NcCellBarcode from '~icons/nc-icons/cell-barcode'
import NcCellCheckbox from '~icons/nc-icons/cell-checkbox'
@@ -325,6 +331,11 @@ import NcHelp from '~icons/nc-icons/help'
} as const */
export const iconMap = {
+ slash: NcSlash,
+ arrowUpRight: NcArrowUpRight,
+ ncWorkspace: NcWorkspace,
+ controlPanel: NcControlPanel,
+ home: NcHome,
cellBarcode: NcCellBarcode,
cellCheckbox: NcCellCheckbox,
cellDate: NcCellDate,
@@ -358,6 +369,7 @@ export const iconMap = {
cellSystemText: NcCellSystemText,
cellAttachment: NcCellAttachment,
+ office: NcOffice,
sort: Sort,
group: Group,
filter: Filter,
diff --git a/packages/nc-gui/utils/index.ts b/packages/nc-gui/utils/index.ts
index afcd69c42a..0507da297b 100644
--- a/packages/nc-gui/utils/index.ts
+++ b/packages/nc-gui/utils/index.ts
@@ -24,5 +24,6 @@ export * from './parseUtils'
export * from './cell'
export * from './workerUtils'
export * from './parsersUtils'
+export * from './datetimeUtils'
export const isEeUI = false
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 189ffded61..1587e0bbd8 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -296,7 +296,8 @@ export interface SourceType {
| 'oracledb'
| 'pg'
| 'snowflake'
- | 'sqlite3';
+ | 'sqlite3'
+ | 'databricks';
}
/**
@@ -342,7 +343,8 @@ export interface BaseReqType {
| 'oracledb'
| 'pg'
| 'snowflake'
- | 'sqlite3';
+ | 'sqlite3'
+ | 'databricks';
}
/**
@@ -2914,6 +2916,87 @@ export type NestedListCopyPasteOrDeleteAllReqType = {
fk_related_model_id: string;
}[];
+/**
+ * Model for Kanban Column Request
+ */
+export interface KanbanColumnReqType {
+ /** Title */
+ title?: string;
+ /** Is this column shown? */
+ show?: BoolType;
+ /**
+ * Column Order
+ * @example 1
+ */
+ order?: number;
+}
+
+/**
+ * Model for Gallery Column Request
+ */
+export interface GalleryColumnReqType {
+ /** Show */
+ show?: BoolType;
+ /**
+ * Order
+ * @example 1
+ */
+ order?: number;
+}
+
+/**
+ * Model for Calendar Column Request
+ */
+export interface CalendarColumnReqType {
+ /** Is this column shown? */
+ show?: BoolType;
+ /** Is this column shown as bold? */
+ bold?: BoolType;
+ /** Is this column shown as italic? */
+ italic?: BoolType;
+ /** Is this column shown underlines? */
+ underline?: BoolType;
+ /**
+ * Column Order
+ * @example 1
+ */
+ order?: number;
+}
+
+export interface ExtensionType {
+ /** Unique ID */
+ id?: IdType;
+ /** Unique Base ID */
+ base_id?: IdType;
+ /** Unique User ID */
+ fk_user_id?: IdType;
+ /** Extension ID */
+ extension_id?: string;
+ /** Extension Title */
+ title?: string;
+ /** Key Value Store for the extension */
+ kv_store?: MetaType;
+ /** Meta data for the extension */
+ meta?: MetaType;
+ /** Order of the extension */
+ order?: number;
+}
+
+export interface ExtensionReqType {
+ /** Unique Base ID */
+ base_id?: IdType;
+ /** Extension Title */
+ title?: string;
+ /** Extension ID */
+ extension_id?: string;
+ /** Key Value Store for the extension */
+ kv_store?: MetaType;
+ /** Meta data for the extension */
+ meta?: MetaType;
+ /** Order of the extension */
+ order?: number;
+}
+
import type {
AxiosInstance,
AxiosRequestConfig,
@@ -9819,7 +9902,8 @@ export class Api<
| 'oracledb'
| 'pg'
| 'snowflake'
- | 'sqlite3';
+ | 'sqlite3'
+ | 'databricks';
connection?: {
host?: string;
port?: string;
@@ -9880,7 +9964,7 @@ export class Api<
* DB Type
* @example mysql2
*\
- client?: "mssql" | "mysql" | "mysql2" | "oracledb" | "pg" | "snowflake" | "sqlite3",
+ client?: "mssql" | "mysql" | "mysql2" | "oracledb" | "pg" | "snowflake" | "sqlite3" | "databricks",
\** Connection Config *\
connection?: {
\** DB User *\
@@ -9926,7 +10010,8 @@ export class Api<
| 'oracledb'
| 'pg'
| 'snowflake'
- | 'sqlite3';
+ | 'sqlite3'
+ | 'databricks';
/** Connection Config */
connection?: {
/** DB User */
@@ -11454,6 +11539,104 @@ export class Api<
...params,
}),
};
+ extensions = {
+ /**
+ * @description Get all extensions for a given base
+ *
+ * @tags Extensions
+ * @name List
+ * @summary Get Extensions
+ * @request GET:/api/v2/extensions/{baseId}
+ * @response `200` `{
+ list?: (object)[],
+
+}` OK
+ */
+ list: (baseId: IdType, params: RequestParams = {}) =>
+ this.request<
+ {
+ list?: object[];
+ },
+ any
+ >({
+ path: `/api/v2/extensions/${baseId}`,
+ method: 'GET',
+ format: 'json',
+ ...params,
+ }),
+
+ /**
+ * @description Create a new extension for a given base
+ *
+ * @tags Extensions
+ * @name Create
+ * @summary Create Extension
+ * @request POST:/api/v2/extensions/{baseId}
+ * @response `200` `any` OK
+ */
+ create: (baseId: IdType, data: object, params: RequestParams = {}) =>
+ this.request({
+ path: `/api/v2/extensions/${baseId}`,
+ method: 'POST',
+ body: data,
+ type: ContentType.Json,
+ format: 'json',
+ ...params,
+ }),
+
+ /**
+ * @description Get extension details
+ *
+ * @tags Extensions
+ * @name Read
+ * @summary Get Extension
+ * @request GET:/api/v2/extensions/{extensionId}
+ * @response `200` `object` OK
+ */
+ read: (extensionId: IdType, params: RequestParams = {}) =>
+ this.request({
+ path: `/api/v2/extensions/${extensionId}`,
+ method: 'GET',
+ format: 'json',
+ ...params,
+ }),
+
+ /**
+ * @description Update extension details
+ *
+ * @tags Extensions
+ * @name Update
+ * @summary Update Extension
+ * @request PATCH:/api/v2/extensions/{extensionId}
+ * @response `200` `any` OK
+ */
+ update: (extensionId: IdType, data: object, params: RequestParams = {}) =>
+ this.request({
+ path: `/api/v2/extensions/${extensionId}`,
+ method: 'PATCH',
+ body: data,
+ type: ContentType.Json,
+ format: 'json',
+ ...params,
+ }),
+
+ /**
+ * @description Delete extension
+ *
+ * @tags Extensions
+ * @name Delete
+ * @summary Delete Extension
+ * @request DELETE:/api/v2/extensions/{extensionId}
+ * @response `200` `any` OK
+ */
+ delete: (extensionId: IdType, params: RequestParams = {}) =>
+ this.request({
+ path: `/api/v2/extensions/${extensionId}`,
+ method: 'DELETE',
+ format: 'json',
+ ...params,
+ }),
+ };
jobs = {
/**
* @description Listen for job events
diff --git a/packages/nocodb-sdk/src/lib/enums.ts b/packages/nocodb-sdk/src/lib/enums.ts
index 71e545d354..1321b1b460 100644
--- a/packages/nocodb-sdk/src/lib/enums.ts
+++ b/packages/nocodb-sdk/src/lib/enums.ts
@@ -4,6 +4,12 @@ export enum OrgUserRoles {
VIEWER = 'org-level-viewer',
}
+export enum CloudOrgUserRoles {
+ CREATOR = 'cloud-org-level-creator',
+ VIEWER = 'cloud-org-level-viewer',
+ OWNER = 'cloud-org-level-owner',
+}
+
export enum ProjectRoles {
OWNER = 'owner',
CREATOR = 'creator',
@@ -182,6 +188,9 @@ export const RoleLabels = {
[OrgUserRoles.SUPER_ADMIN]: 'superAdmin',
[OrgUserRoles.CREATOR]: 'creator',
[OrgUserRoles.VIEWER]: 'viewer',
+ [CloudOrgUserRoles.OWNER]: 'owner',
+ [CloudOrgUserRoles.CREATOR]: 'creator',
+ [CloudOrgUserRoles.VIEWER]: 'viewer',
};
export const RoleColors = {
@@ -200,6 +209,9 @@ export const RoleColors = {
[ProjectRoles.NO_ACCESS]: 'red',
[OrgUserRoles.CREATOR]: 'blue',
[OrgUserRoles.VIEWER]: 'yellow',
+ [CloudOrgUserRoles.OWNER]: 'purple',
+ [CloudOrgUserRoles.CREATOR]: 'blue',
+ [CloudOrgUserRoles.VIEWER]: 'yellow',
};
export const RoleDescriptions = {
@@ -240,6 +252,10 @@ export const RoleIcons = {
[OrgUserRoles.SUPER_ADMIN]: 'role_super',
[OrgUserRoles.CREATOR]: 'role_creator',
[OrgUserRoles.VIEWER]: 'role_viewer',
+
+ [CloudOrgUserRoles.OWNER]: 'role_owner',
+ [CloudOrgUserRoles.CREATOR]: 'role_creator',
+ [CloudOrgUserRoles.VIEWER]: 'role_viewer',
};
export const WorkspaceRolesToProjectRoles = {
diff --git a/packages/nocodb/src/filters/global-exception/global-exception.filter.ts b/packages/nocodb/src/filters/global-exception/global-exception.filter.ts
index b58adc793d..9560a1db62 100644
--- a/packages/nocodb/src/filters/global-exception/global-exception.filter.ts
+++ b/packages/nocodb/src/filters/global-exception/global-exception.filter.ts
@@ -12,6 +12,7 @@ import {
Forbidden,
NcBaseErrorv2,
NotFound,
+ SsoError,
Unauthorized,
UnprocessableEntity,
} from '~/helpers/catchError';
@@ -48,6 +49,7 @@ export class GlobalExceptionFilter implements ExceptionFilter {
exception instanceof Forbidden ||
exception instanceof NotFound ||
exception instanceof UnprocessableEntity ||
+ exception instanceof SsoError ||
exception instanceof NotFoundException ||
exception instanceof ThrottlerException ||
exception instanceof ExternalError ||
@@ -69,6 +71,25 @@ export class GlobalExceptionFilter implements ExceptionFilter {
);
}
+ // if sso error then redirect to ui with error in query parameter
+ if (
+ exception instanceof SsoError ||
+ request.route?.path === '/sso/:clientId/redirect'
+ ) {
+ if (!(exception instanceof SsoError)) {
+ this.logger.warn(exception.message, exception.stack);
+ }
+
+ // encode the query parameter
+ const redirectUrl = `${
+ request.dashboardUrl
+ }?ui-redirect=${encodeURIComponent(
+ `/sso?error=${encodeURIComponent(exception.message)}`,
+ )}`;
+
+ return response.redirect(redirectUrl);
+ }
+
// API not found
if (exception instanceof NotFoundException) {
this.logger.debug(exception.message, exception.stack);
diff --git a/packages/nocodb/src/helpers/catchError.ts b/packages/nocodb/src/helpers/catchError.ts
index 5e413d9e4b..a5a65682dd 100644
--- a/packages/nocodb/src/helpers/catchError.ts
+++ b/packages/nocodb/src/helpers/catchError.ts
@@ -413,6 +413,8 @@ export class Forbidden extends NcBaseError {}
export class NotFound extends NcBaseError {}
+export class SsoError extends NcBaseError {}
+
export class ExternalError extends NcBaseError {
constructor(error: Error) {
super(error.message);
@@ -578,6 +580,7 @@ export class NcBaseErrorv2 extends NcBaseError {
error: NcErrorType;
code: number;
details?: any;
+
constructor(error: NcErrorType, args?: NcErrorArgs) {
const errorHelper = generateError(error, args);
super(errorHelper.message);
@@ -726,4 +729,10 @@ export class NcError {
static notAllowed(message = 'Not allowed') {
throw new NotAllowed(message);
}
+
+ static emailDomainNotAllowed(domain: string) {
+ throw new SsoError(
+ `Email domain ${domain} is not allowed for this organization`,
+ );
+ }
}
diff --git a/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts b/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
index 5207b12425..ff8c3bdc76 100644
--- a/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
+++ b/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
@@ -230,6 +230,7 @@ export class AclMiddleware implements NestInterceptor {
'blockApiTokenAccess',
context.getHandler(),
);
+
const scope = this.reflector.get('scope', context.getHandler());
const req = context.switchToHttp().getRequest();
@@ -237,7 +238,6 @@ export class AclMiddleware implements NestInterceptor {
if (!req.user?.isAuthorized) {
NcError.unauthorized('Invalid token');
}
-
const userScopeRole =
req.user.roles?.[OrgUserRoles.SUPER_ADMIN] === true
? OrgUserRoles.SUPER_ADMIN
diff --git a/packages/nocodb/src/models/UserRefreshToken.ts b/packages/nocodb/src/models/UserRefreshToken.ts
index ae4d805fd0..79c2602f78 100644
--- a/packages/nocodb/src/models/UserRefreshToken.ts
+++ b/packages/nocodb/src/models/UserRefreshToken.ts
@@ -1,4 +1,3 @@
-import process from 'process';
import dayjs from 'dayjs';
import Noco from '~/Noco';
import { extractProps } from '~/helpers/extractProps';
@@ -69,6 +68,7 @@ export default class UserRefreshToken {
return insertObj;
}
+ // todo: caching
static async updateOldToken(
oldToken: string,
newToken: string,
diff --git a/packages/nocodb/src/services/users/helpers.ts b/packages/nocodb/src/services/users/helpers.ts
index c7826207d5..2b2ba15c2a 100644
--- a/packages/nocodb/src/services/users/helpers.ts
+++ b/packages/nocodb/src/services/users/helpers.ts
@@ -4,9 +4,13 @@ import type User from '~/models/User';
import type { NcConfig } from '~/interface/config';
import type { Response } from 'express';
-export function genJwt(user: User, config: NcConfig) {
+export function genJwt(
+ user: User & { extra?: Record },
+ config: NcConfig,
+) {
return jwt.sign(
{
+ ...(user.extra || {}),
email: user.email,
id: user.id,
roles: user.roles,
diff --git a/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts b/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts
index f666ac1b10..f01b5c42b4 100644
--- a/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts
+++ b/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts
@@ -48,6 +48,9 @@ export class AuthTokenStrategy extends PassportStrategy(Strategy, 'authtoken') {
...(dbUser.workspace_roles
? { workspace_roles: extractRolesObj(dbUser.workspace_roles) }
: {}),
+ ...(dbUser.org_roles
+ ? { org_roles: extractRolesObj(dbUser.org_roles) }
+ : {}),
});
}
return callback(null, sanitiseUserObj(user));
diff --git a/packages/nocodb/tests/unit/rest/index.test.ts b/packages/nocodb/tests/unit/rest/index.test.ts
index 48a0444d02..b2eb831049 100644
--- a/packages/nocodb/tests/unit/rest/index.test.ts
+++ b/packages/nocodb/tests/unit/rest/index.test.ts
@@ -14,9 +14,11 @@ import formulaTests from './tests/formula.test';
let workspaceTest = () => {};
let ssoTest = () => {};
+let cloudOrgTest = () => {};
if (process.env.EE === 'true') {
workspaceTest = require('./tests/ee/workspace.test').default;
ssoTest = require('./tests/ee/sso.test').default;
+ cloudOrgTest = require('./tests/ee/cloud-org.test').default;
}
// import layoutTests from './tests/layout.test';
// import widgetTest from './tests/widget.test';
@@ -36,6 +38,7 @@ function restTests() {
workspaceTest();
formulaTests();
ssoTest();
+ cloudOrgTest();
// Enable for dashboard feature
// widgetTest();
diff --git a/tests/playwright/pages/Account/Authentication.ts b/tests/playwright/pages/Account/Authentication.ts
index 498ffa1775..45b634e5b8 100644
--- a/tests/playwright/pages/Account/Authentication.ts
+++ b/tests/playwright/pages/Account/Authentication.ts
@@ -15,7 +15,7 @@ export class AccountAuthenticationPage extends BasePage {
await this.waitForResponse({
uiAction: () => this.rootPage.goto('/#/account/authentication', { waitUntil: 'networkidle' }),
httpMethodsToMatch: ['GET'],
- requestUrlPathToMatch: '/api/v2/sso-client',
+ requestUrlPathToMatch: /\/sso-client/,
});
}
@@ -42,7 +42,7 @@ export class AccountAuthenticationPage extends BasePage {
await this.waitForResponse({
uiAction: () => this.rootPage.locator(`[data-test-id="nc-${provider}-delete"]`).click(),
httpMethodsToMatch: ['DELETE'],
- requestUrlPathToMatch: `/api/v2/sso-client/`,
+ requestUrlPathToMatch: /\/sso-client/,
});
}
@@ -50,7 +50,7 @@ export class AccountAuthenticationPage extends BasePage {
await this.waitForResponse({
uiAction: () => this.get().locator(`.nc-${provider}-${title}-enable .nc-switch`).click(),
httpMethodsToMatch: ['PATCH'],
- requestUrlPathToMatch: `/api/v2/sso-client/`,
+ requestUrlPathToMatch: /\/\w+\/sso-client/,
});
}
@@ -97,7 +97,7 @@ export class AccountAuthenticationPage extends BasePage {
await this.waitForResponse({
uiAction: () => samlModal.locator('[data-test-id="nc-saml-submit"]').click(),
httpMethodsToMatch: ['GET'],
- requestUrlPathToMatch: '/api/v2/sso-client',
+ requestUrlPathToMatch: /\/sso-client/,
});
}
@@ -158,7 +158,7 @@ export class AccountAuthenticationPage extends BasePage {
await this.waitForResponse({
uiAction: () => oidcModal.locator('[data-test-id="nc-oidc-save-btn"]').click(),
httpMethodsToMatch: ['GET'],
- requestUrlPathToMatch: '/api/v2/sso-client',
+ requestUrlPathToMatch: /\/sso-client/,
});
}
@@ -177,7 +177,7 @@ export class AccountAuthenticationPage extends BasePage {
await this.waitForResponse({
uiAction: () => googleModal.locator('[data-test-id="nc-google-save-btn"]').click(),
httpMethodsToMatch: ['GET'],
- requestUrlPathToMatch: '/api/v2/sso-client',
+ requestUrlPathToMatch: /\/sso-client/,
});
}
diff --git a/tests/playwright/pages/Base.ts b/tests/playwright/pages/Base.ts
index a93a00cfa8..7773015669 100644
--- a/tests/playwright/pages/Base.ts
+++ b/tests/playwright/pages/Base.ts
@@ -31,7 +31,7 @@ export default abstract class BasePage {
responseStatusCodeToMatch = 200,
}: {
uiAction: () => Promise;
- requestUrlPathToMatch: string;
+ requestUrlPathToMatch: string | RegExp;
httpMethodsToMatch?: string[];
responseJsonMatcher?: ResponseSelector;
timeout?: number;
@@ -40,7 +40,9 @@ export default abstract class BasePage {
const [res] = await Promise.all([
this.rootPage.waitForResponse(
res =>
- res.url().includes(requestUrlPathToMatch) &&
+ (requestUrlPathToMatch instanceof RegExp
+ ? requestUrlPathToMatch.test(res.url())
+ : res.url().includes(requestUrlPathToMatch)) &&
res.status() === responseStatusCodeToMatch &&
httpMethodsToMatch.includes(res.request().method()),
timeout ? { timeout } : undefined
diff --git a/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts b/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts
index 1e0ae1f59b..7a0b29a203 100644
--- a/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts
+++ b/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts
@@ -19,7 +19,7 @@ export class AccessSettingsPage extends BasePage {
for (let i = 0; i < userCount; i++) {
const user = this.get().locator('.user-row').nth(i);
- const userEmail = (await user.locator('.users-email-grid').innerText()).split('\n')[1];
+ const userEmail = (await user.locator('.users-email-grid').innerText()).split('\n').pop();
if (userEmail === email) {
const roleDropdown = user.locator('.nc-roles-selector');
diff --git a/tests/playwright/pages/Dashboard/TreeView.ts b/tests/playwright/pages/Dashboard/TreeView.ts
index 4f87867e5e..cc226a0537 100644
--- a/tests/playwright/pages/Dashboard/TreeView.ts
+++ b/tests/playwright/pages/Dashboard/TreeView.ts
@@ -111,26 +111,24 @@ export class TreeViewPage extends BasePage {
}
await this.get().getByTestId(`nc-tbl-title-${title}`).waitFor({ state: 'visible' });
-
if (networkResponse === true) {
await this.waitForResponse({
- uiAction: () =>
- this.get()
- .getByTestId(`nc-tbl-title-${title}`)
- .click({
- position: {
- x: 10,
- y: 10,
- },
- }),
+ uiAction: () => this.get().getByTestId(`nc-tbl-title-${title}`).closest('.nc-base-tree-tbl').click(),
httpMethodsToMatch: ['GET'],
requestUrlPathToMatch: `/api/v1/db/data/noco`,
responseJsonMatcher: json => json.pageInfo,
});
await this.dashboard.waitForTabRender({ title, mode });
} else {
- await this.get().getByTestId(`nc-tbl-title-${title}`).click();
+ await this.get().locator(`[data-testid="nc-tbl-title-${title}"]`).click({
+ // x:10, y:10
+ });
+
+ // todo: remove this after fixing the issue
await this.rootPage.waitForTimeout(1000);
+ await this.get().locator(`[data-testid="nc-tbl-title-${title}"]`).click({
+ // x:10, y:10
+ });
}
}
diff --git a/tests/playwright/pages/OrgAdmin/Bases.ts b/tests/playwright/pages/OrgAdmin/Bases.ts
new file mode 100644
index 0000000000..fbd4935629
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Bases.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Bases extends BasePage {
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ get() {
+ return this.rootPage.locator('[data-test-id="nc-admin-bases"]');
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Dashboard.ts b/tests/playwright/pages/OrgAdmin/Dashboard.ts
new file mode 100644
index 0000000000..aab3ba593b
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Dashboard.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Dashboard extends BasePage {
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ get() {
+ return this.rootPage.locator('[data-test-id="nc-admin-dashboard"]');
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Domain.ts b/tests/playwright/pages/OrgAdmin/Domain.ts
new file mode 100644
index 0000000000..eca01b0f51
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Domain.ts
@@ -0,0 +1,51 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Domain extends BasePage {
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ get() {
+ return this.rootPage.locator('[data-test-id="nc-org-domain"]');
+ }
+
+ async addDomain(domainName: string) {
+ await this.get().locator('[data-test-id="nc-org-domain-add"]').click();
+ await this.rootPage.locator('[data-test-id="nc-org-domain-name"]').fill(domainName);
+
+ await this.waitForResponse({
+ uiAction: () => this.rootPage.locator('[data-test-id="nc-org-domain-submit"]').click(),
+ httpMethodsToMatch: ['PATCH', 'POST'],
+ requestUrlPathToMatch: /api\/v2\/domains\/\w+/,
+ });
+ }
+
+ async openOptionMenu(domainName: string) {
+ await this.rootPage
+ .locator(`[data-test-id="nc-domain-${domainName}"]`)
+ .locator('[data-test-id="nc-domain-more-option"]')
+ .click();
+ }
+
+ async verifyDomain(domainName: string) {
+ await this.openOptionMenu(domainName);
+ await this.waitForResponse({
+ uiAction: () => this.rootPage.locator('[data-test-id="nc-domain-verify"]').click(),
+ httpMethodsToMatch: ['POST'],
+ requestUrlPathToMatch: `/api/v2/org-domain/${domainName}`,
+ });
+ }
+
+ async deleteDomain(domainName: string) {
+ await this.openOptionMenu(domainName);
+ await this.waitForResponse({
+ uiAction: () => this.rootPage.locator('[data-test-id="nc-domain-delete"]').click(),
+ httpMethodsToMatch: ['DELETE'],
+ requestUrlPathToMatch: `/api/v2/org-domain/${domainName}`,
+ });
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Members.ts b/tests/playwright/pages/OrgAdmin/Members.ts
new file mode 100644
index 0000000000..ff922d782f
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Members.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Members extends BasePage {
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ get() {
+ return this.rootPage.locator('[data-test-id="nc-admin-members"]');
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/OpenIDLoginPage.ts b/tests/playwright/pages/OrgAdmin/OpenIDLoginPage.ts
new file mode 100644
index 0000000000..59e19bff2d
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/OpenIDLoginPage.ts
@@ -0,0 +1,46 @@
+import { Page } from '@playwright/test';
+import BasePage from '../Base';
+import { ProjectsPage } from '../ProjectsPage';
+import { CloudSSOLoginPage } from './SSOLoginPage';
+
+export class CloudOpenIDLoginPage extends BasePage {
+ readonly projectsPage: ProjectsPage;
+ readonly ssoLoginPage: CloudSSOLoginPage;
+
+ constructor(rootPage: Page) {
+ super(rootPage);
+ this.projectsPage = new ProjectsPage(rootPage);
+ this.ssoLoginPage = new CloudSSOLoginPage(rootPage);
+ }
+
+ async goto(_title = 'test', email: string) {
+ await this.ssoLoginPage.goto(email);
+ await this.ssoLoginPage.signIn({ email });
+ // // reload page to get latest app info
+ // await this.rootPage.reload({ waitUntil: 'networkidle' });
+ // // click sign in with SAML
+ // await this.rootPage.locator(`button:has-text("Sign in with ${title}")`).click();
+ }
+
+ get() {
+ return this.rootPage.locator('html');
+ }
+
+ async signIn({ email }: { email: string }) {
+ const signIn = this.get();
+ await signIn.locator('[name="login"]').waitFor();
+
+ await signIn.locator(`[name="login"]`).fill(email);
+ await signIn.locator(`[name="password"]`).fill('dummy-password');
+
+ await signIn.locator(`[type="submit"]`).click();
+ const authorize = this.get();
+
+ await Promise.all([
+ this.rootPage.waitForNavigation({ url: /localhost:3000/ }),
+ authorize.locator(`[type="submit"]`).click(),
+ ]);
+
+ await this.rootPage.locator(`[data-testid="nc-sidebar-userinfo"]:has-text("${email.split('@')[0]}")`);
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/SAMLLoginPage.ts b/tests/playwright/pages/OrgAdmin/SAMLLoginPage.ts
new file mode 100644
index 0000000000..562bb2ab54
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/SAMLLoginPage.ts
@@ -0,0 +1,42 @@
+import { Page } from '@playwright/test';
+import BasePage from '../Base';
+import { ProjectsPage } from '../ProjectsPage';
+import { CloudSSOLoginPage } from './SSOLoginPage';
+
+export class CloudSAMLLoginPage extends BasePage {
+ readonly projectsPage: ProjectsPage;
+ readonly ssoLoginPage: CloudSSOLoginPage;
+
+ constructor(rootPage: Page) {
+ super(rootPage);
+ this.projectsPage = new ProjectsPage(rootPage);
+ this.ssoLoginPage = new CloudSSOLoginPage(rootPage);
+ }
+
+ async goto(_title = 'test', email: string) {
+ await this.ssoLoginPage.goto(email);
+ await this.ssoLoginPage.signIn({ email });
+ // // reload page to get latest app info
+ // await this.rootPage.reload({ waitUntil: 'networkidle' });
+ // // click sign in with SAML
+ // await this.rootPage.locator(`button:has-text("Sign in with ${title}")`).click();
+ }
+
+ get() {
+ return this.rootPage.locator('html');
+ }
+
+ async signIn({ email }: { email: string }) {
+ const signIn = this.get();
+ await signIn.locator('#userName').waitFor();
+
+ await signIn.locator(`#userName`).fill(email);
+ await signIn.locator(`#email`).fill(email);
+ await Promise.all([
+ this.rootPage.waitForNavigation({ url: /localhost:3000/ }),
+ signIn.locator(`#btn-sign-in`).click(),
+ ]);
+
+ await this.rootPage.locator(`[data-testid="nc-sidebar-userinfo"]:has-text("${email.split('@')[0]}")`);
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/SSO.ts b/tests/playwright/pages/OrgAdmin/SSO.ts
new file mode 100644
index 0000000000..be2756b3dd
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/SSO.ts
@@ -0,0 +1,200 @@
+import BasePage from '../Base';
+import { ProjectsPage } from '../ProjectsPage';
+import { expect } from '@playwright/test';
+import { Domain } from './Domain';
+import { OrgAdminPage } from './index';
+
+export class CloudSSO extends BasePage {
+ readonly projectsPage: ProjectsPage;
+ readonly domain: Domain;
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.domain = new Domain(orgAdminPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ async goto() {
+ // wait for 2 seconds to make sure the page is loaded
+ // await this.rootPage.waitForTimeout(2000);
+ // console.log(await this.rootPage.locator('[data-test-id="nc-org-sso-settings"]').count());
+ await this.waitForResponse({
+ uiAction: () => this.rootPage.locator('[data-test-id="nc-org-sso-settings"]').click(),
+ httpMethodsToMatch: ['GET'],
+ requestUrlPathToMatch: '/api/v2/orgs/',
+ });
+ }
+
+ get() {
+ return this.rootPage.locator('html');
+ }
+
+ async verifySAMLProviderCount({ count }: { count: number }) {
+ await expect.poll(async () => await this.get().locator('.nc-saml-provider').count()).toBe(count);
+ }
+
+ async verifyOIDCProviderCount({ count }: { count: number }) {
+ await expect.poll(async () => await this.get().locator('.nc-oidc-provider').count()).toBe(count);
+ }
+ async deleteExistingClientIfAny(provider: 'saml' | 'oidc' | 'google', title: string) {
+ if (
+ !(await this.rootPage
+ .locator(provider === 'google' ? '.nc-google-more-option' : `.nc-${provider}-${title}-more-option`)
+ .count())
+ )
+ return;
+
+ await this.deleteProvider(provider, title);
+ }
+
+ async getProvider(provider: 'saml' | 'oidc', title: string) {
+ return this.rootPage.locator(`[data-test-id="nc-${provider}-provider-${title}"]`);
+ }
+
+ async deleteProvider(provider: 'saml' | 'oidc' | 'google', title: string) {
+ await this.rootPage
+ .locator(provider === 'google' ? '.nc-google-more-option' : `.nc-${provider}-${title}-more-option`)
+ .click();
+ await this.waitForResponse({
+ uiAction: () => this.rootPage.locator(`[data-test-id="nc-${provider}-delete"]`).click(),
+ httpMethodsToMatch: ['DELETE'],
+ requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-client/,
+ });
+ }
+
+ async toggleProvider(provider: 'saml' | 'oidc' | 'google', title: string) {
+ await this.waitForResponse({
+ uiAction: () => this.get().locator(`.nc-${provider}-${title}-enable .nc-switch`).click(),
+ httpMethodsToMatch: ['PATCH'],
+ requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-client/,
+ });
+ }
+
+ async selectScope({ type }: { type: string[] }) {
+ await this.rootPage.locator('.ant-select-selector').click();
+
+ await this.rootPage.locator('.ant-select-selection-search-input[aria-expanded="true"]').waitFor();
+ for (const t of type) {
+ await this.rootPage.locator('.rc-virtual-list-holder-inner > div').locator(`text="${t}"`).click();
+ }
+ }
+
+ async createSAMLProvider(
+ p: { title: string; url?: string; xml?: string },
+ setupRedirectUrlCbk?: (params: { redirectUrl: string; audience: string }) => Promise
+ ) {
+ const newSamlBtn = this.get().locator('[data-test-id="nc-new-saml-provider"]');
+
+ await newSamlBtn.click();
+
+ const samlModal = this.rootPage.locator('.nc-saml-modal');
+
+ // wait until redirect url is generated
+ await samlModal.locator('[data-test-id="nc-saml-redirect-url"]:has-text("http://")').waitFor();
+
+ if (setupRedirectUrlCbk) {
+ const redirectUrl = (
+ await samlModal.locator('[data-test-id="nc-saml-redirect-url"]:has-text("http://")').textContent()
+ ).trim();
+ const audience = (
+ await samlModal.locator('[data-test-id="nc-saml-issuer-url"]:has-text("http://")').textContent()
+ ).trim();
+ await setupRedirectUrlCbk({ redirectUrl, audience });
+ }
+
+ await samlModal.locator('[data-test-id="nc-saml-title"]').fill(p.title);
+ if (p.url) {
+ await samlModal.locator('[data-test-id="nc-saml-metadata-url"]').fill(p.url);
+ }
+ if (p.xml) {
+ await samlModal.locator('[data-test-id="nc-saml-xml"]').fill(p.xml);
+ }
+
+ await this.waitForResponse({
+ uiAction: () => samlModal.locator('[data-test-id="nc-saml-submit"]').click(),
+ httpMethodsToMatch: ['GET'],
+ requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-clients/,
+ });
+ }
+
+ async createOIDCProvider(
+ p: {
+ issuer: string;
+ title: string;
+ clientId: string;
+ clientSecret: string;
+ authUrl: string;
+ userInfoUrl: string;
+ tokenUrl: string;
+ jwkUrl: string;
+ scopes: Array;
+ userAttributes: string;
+ },
+ setupRedirectUrlCbk?: (params: { redirectUrl: string }) => Promise
+ ) {
+ const newOIDCBtn = this.get().locator('[data-test-id="nc-new-oidc-provider"]');
+
+ await newOIDCBtn.click();
+
+ const oidcModal = this.rootPage.locator('.nc-oidc-modal');
+
+ // wait until redirect url is generated
+ await oidcModal.locator('[data-test-id="nc-openid-redirect-url"]:has-text("http://")').waitFor();
+
+ if (setupRedirectUrlCbk) {
+ const redirectUrl = (
+ await oidcModal.locator('[data-test-id="nc-openid-redirect-url"]:has-text("http://")').textContent()
+ ).trim();
+ await setupRedirectUrlCbk({ redirectUrl });
+ }
+
+ await oidcModal.locator('[data-test-id="nc-oidc-title"]').fill(p.title);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-issuer"]').fill(p.issuer);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-client-id"]').fill(p.clientId);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-client-secret"]').fill(p.clientSecret);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-auth-url"]').fill(p.authUrl);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-token-url"]').fill(p.tokenUrl);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-user-info-url"]').fill(p.userInfoUrl);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-jwk-url"]').fill(p.jwkUrl);
+
+ await this.selectScope({
+ type: p.scopes,
+ locator: oidcModal.locator('[data-test-id="nc-oidc-scope"]'),
+ } as any);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-user-attribute"]').fill(p.userAttributes);
+
+ await this.waitForResponse({
+ uiAction: () => oidcModal.locator('[data-test-id="nc-oidc-save-btn"]').click(),
+ httpMethodsToMatch: ['GET'],
+ requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-clients/,
+ });
+ }
+
+ async createGoogleProvider(p: { clientId: string; clientSecret: string }) {
+ await this.rootPage.locator(`.nc-google-more-option`).click();
+ await this.rootPage.locator(`[data-test-id="nc-google-edit"]`).click();
+
+ const googleModal = this.rootPage.locator('.nc-google-modal');
+ // wait until redirect url is generated
+ await googleModal.locator('[data-test-id="nc-google-redirect-url"]:has-text("http://")').waitFor();
+
+ await googleModal.locator('[data-test-id="nc-google-client-id"]').fill(p.clientId);
+
+ await googleModal.locator('[data-test-id="nc-google-client-secret"]').fill(p.clientSecret);
+
+ await this.waitForResponse({
+ uiAction: () => googleModal.locator('[data-test-id="nc-google-save-btn"]').click(),
+ httpMethodsToMatch: ['GET'],
+ requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-clients/,
+ });
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/SSOLoginPage.ts b/tests/playwright/pages/OrgAdmin/SSOLoginPage.ts
new file mode 100644
index 0000000000..299600be10
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/SSOLoginPage.ts
@@ -0,0 +1,37 @@
+import { Page } from '@playwright/test';
+import BasePage from '../Base';
+import { ProjectsPage } from '../ProjectsPage';
+
+export class CloudSSOLoginPage extends BasePage {
+ readonly projectsPage: ProjectsPage;
+
+ constructor(rootPage: Page) {
+ super(rootPage);
+ this.projectsPage = new ProjectsPage(rootPage);
+ }
+
+ async goto(_email: string) {
+ // reload page to get latest app info
+ await this.rootPage.goto('/#/sso');
+ // click sign in with SAML
+ // await this.rootPage.locator(`button:has-text("Sign in with ${title}")`).click();
+ }
+
+ get() {
+ return this.rootPage.locator('html');
+ }
+
+ async signIn({ email }: { email: string }) {
+ const signIn = this.get();
+ await signIn.locator('[data-testid="nc-form-org-sso-signin__email"]').waitFor();
+
+ await signIn.locator('[data-testid="nc-form-org-sso-signin__email"]').fill(email);
+
+ await Promise.all([
+ this.rootPage.waitForNavigation({ url: /localhost:3000/ }),
+ signIn.getByTestId('nc-form-signin__submit').click(),
+ ]);
+
+ await this.rootPage.locator(`[data-testid="nc-sidebar-userinfo"]:has-text("${email.split('@')[0]}")`);
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Settings.ts b/tests/playwright/pages/OrgAdmin/Settings.ts
new file mode 100644
index 0000000000..ef91daba92
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Settings.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Settings extends BasePage {
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ get() {
+ return this.rootPage.locator('[data-test-id="nc-admin-settings"]');
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Workspaces.ts b/tests/playwright/pages/OrgAdmin/Workspaces.ts
new file mode 100644
index 0000000000..eebf8f6500
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Workspaces.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Workspaces extends BasePage {
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ get() {
+ return this.rootPage.locator('[data-test-id="nc-admin-workspaces"]');
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/index.ts b/tests/playwright/pages/OrgAdmin/index.ts
new file mode 100644
index 0000000000..1a48398bd1
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/index.ts
@@ -0,0 +1,29 @@
+import { Page } from '@playwright/test';
+import BasePage from '../Base';
+import { CloudSSO } from './SSO';
+
+export class OrgAdminPage extends BasePage {
+ readonly ssoPage: CloudSSO;
+
+ constructor(page: Page) {
+ super(page);
+ this.ssoPage = new CloudSSO(this);
+ }
+
+ get() {
+ return this.rootPage.locator('body');
+ }
+ async goto() {
+ await this.rootPage.goto('/');
+ await this.rootPage.getByTestId('nc-sidebar-userinfo').click();
+
+ await this.rootPage.waitForTimeout(1000);
+
+ if ((await this.rootPage.getByTestId('nc-sidebar-upgrade-workspace-to-org').count()) > 0) {
+ await this.rootPage.getByTestId('nc-sidebar-upgrade-workspace-to-org').first().click();
+ } else {
+ await this.rootPage.getByTestId('nc-sidebar-org-admin-panel').click();
+ }
+ await this.rootPage.waitForNavigation({ url: /\/#\/admin\/\w+/ });
+ }
+}
diff --git a/tests/playwright/pages/WorkspacePage/CollaborationPage.ts b/tests/playwright/pages/WorkspacePage/CollaborationPage.ts
index 49b90c03de..e6e32f94af 100644
--- a/tests/playwright/pages/WorkspacePage/CollaborationPage.ts
+++ b/tests/playwright/pages/WorkspacePage/CollaborationPage.ts
@@ -9,17 +9,11 @@ import { Locator } from '@playwright/test';
export class CollaborationPage extends BasePage {
readonly workspace: WorkspacePage;
- readonly button_addUser: Locator;
- readonly input_email: Locator;
- readonly selector_role: Locator;
readonly list_collaborators: Locator;
constructor(workspace: WorkspacePage) {
super(workspace.rootPage);
this.workspace = workspace;
- this.button_addUser = this.get().locator('button.ant-btn.ant-btn-primary');
- this.input_email = this.get().locator('input[id="email"]');
- this.selector_role = this.get().locator('.ant-select-selector');
this.list_collaborators = this.get().locator('.nc-collaborators-list-table');
}
@@ -34,13 +28,24 @@ export class CollaborationPage extends BasePage {
async addUsers(email: string, role: string) {
await this.waitFor({ state: 'visible' });
+ // click add user button to open modal
+ await this.get().getByTestId('nc-add-member-btn').click();
+
+ const inviteModal = this.rootPage.locator('.nc-invite-dlg');
+
+ await inviteModal.waitFor({ state: 'visible' });
+
+ const input_email = inviteModal.locator('input[id="email"]');
+ const selector_role = inviteModal.locator('.ant-select-selector');
+ const button_addUser = inviteModal.locator('.nc-invite-btn');
+
// email
- await this.input_email.fill(email);
+ await input_email.fill(email);
await this.rootPage.keyboard.press('Enter');
// role
- await this.selector_role.first().click();
- const menu = this.rootPage.locator('.nc-role-select-dropdown:visible');
+ await selector_role.first().click();
+ const menu = this.rootPage.locator('.nc-role-selector-dropdown:visible');
await menu.locator(`.nc-role-select-workspace-level-${role.toLowerCase()}:visible`).first().click();
// submit
@@ -48,7 +53,7 @@ export class CollaborationPage extends BasePage {
// allow button to be enabled
await this.rootPage.waitForTimeout(500);
await this.rootPage.keyboard.press('Enter');
- await this.button_addUser.click();
+ await button_addUser.click();
await this.verifyToast({ message: 'Invitation sent successfully' });
await this.rootPage.waitForTimeout(500);
}
diff --git a/tests/playwright/setup/index.ts b/tests/playwright/setup/index.ts
index f1dc5e7270..0b96820a16 100644
--- a/tests/playwright/setup/index.ts
+++ b/tests/playwright/setup/index.ts
@@ -169,12 +169,14 @@ async function localInit({
baseType = ProjectTypes.DATABASE,
isSuperUser = false,
dbType,
+ resetSsoClients = false,
}: {
workerId: string;
isEmptyProject?: boolean;
baseType?: ProjectTypes;
isSuperUser?: boolean;
dbType?: string;
+ resetSsoClients?: boolean;
}) {
const parallelId = process.env.TEST_PARALLEL_INDEX;
@@ -210,7 +212,7 @@ async function localInit({
// console.log(process.env.TEST_WORKER_INDEX, process.env.TEST_PARALLEL_INDEX);
// delete sso-clients
- if (isEE() && api['ssoClient'] && isSuperUser) {
+ if (resetSsoClients && isEE() && api['ssoClient'] && isSuperUser) {
const clients = await api.ssoClient.list();
for (const client of clients.list) {
try {
@@ -355,12 +357,14 @@ const setup = async ({
isEmptyProject = false,
isSuperUser = false,
url,
+ resetSsoClients = false,
}: {
baseType?: ProjectTypes;
page: Page;
isEmptyProject?: boolean;
isSuperUser?: boolean;
url?: string;
+ resetSsoClients?: boolean;
}): Promise => {
console.time('Setup');
@@ -384,6 +388,7 @@ const setup = async ({
baseType,
isSuperUser,
dbType,
+ resetSsoClients,
});
} catch (e) {
console.error(`Error resetting base: ${process.env.TEST_PARALLEL_INDEX}`, e);