08e941f8af
* Implemented workspace general page * Added notifications to user input * Allowed non-admins to view but not edit * Added redirect to homeroute * Fixed validation * Squashed commit of the following: commit 7bf14ab8af0f76b4c9d0aa87fc08085af7c34959 Author: Chuck Driesler <chuck@speckle.systems> Date: Tue Aug 6 19:40:50 2024 +0200 mob next [ci-skip] [ci skip] [skip ci] lastFile:packages/server/modules/workspacesCore/migrations/20240806160740_workspace_domains.ts commit 8aa3fb0cb052c10eeeb83bf9874ae0d1c065e480 Author: Alessandro Magionami <alessandro.magionami@gmail.com> Date: Tue Aug 6 18:54:15 2024 +0200 mob next [ci-skip] [ci skip] [skip ci] lastFile:packages/server/modules/core/domain/userEmails/operations.ts commit 66dfd0cf6c15a789c8f96a65a3168323e83a7b9e Author: Chuck Driesler <chuck@speckle.systems> Date: Tue Aug 6 18:30:22 2024 +0200 mob next [ci-skip] [ci skip] [skip ci] lastFile:packages/server/modules/workspacesCore/domain/types.ts Co-authored-by: Alessandro Magionami <alessandro.magionami@gmail.com> * Move General to workspaces folder * feat(workspaces): inputs on security section * feat(workspaces): add domain to workspace mutation * chore(workspaces): add blocked domains list * fix(workspaces): modals with buttons * feat(workspaceDomains): delete domain * fix(workspaces): use mutation * fix(workspaces): present user verified domains as options * Moved sidebar menu to a composable * Added coming soon tag back * feat(workspaces): create domains resolver for workspace * chore(workspaces): fix tests * chore(workspaces): fix types * chore(workspaces): fix linter * fix(workspaces): do some delete I think * chore(workspaces): add domainBasedMembershipProtectionEnabled field to workspace * chore(workspaces): improve validation for email domain * fix(workspace): query and do the thing * chore(workspaces): add graphql schema for domainBasedMembershipProtection * chore(workspaces): lint and test failures * fix(workspaces): test issues w new field * feat(workspaces): add discoverability flag * chore(workspaces): they made me do it * feat(workspaces): enable toggling domain protection * feat(workspaces): add discoverability toggle to workspace settings * feat(workspace): auto enable discoverability on first domain registration * feat(workspace): discoverability toggle fixes * fix(eventBus): fix tests * feat(workspaces): user discoverable workspaces (#2620) * feat(workspaces): it works just trust me * fix(workspaces): don't worry about it * fix(workspaces); happy path success * fix(workspaces): almost there * fix(workspaces): successful tests! * fix(workspaces): we have DISCOVERED (#2621) * Fixed linting issue * Updated query * Updated validation rules * Updated validation rules * Fix unsaved file with type export * Addressed PR comments * Updated cache * Updated item classes, add fragment back * Gergo/web 1574 join workspaces via discovery (#2623) * chore(useremails): add find verified emails by user function * chore(workspace): table helper for workspace domains * chore(workspace): get workspace with domains function * chore(workspace): test get workspace with domains function * feat(workspace): restrict workspace membership when updating workspace role * chore(workspaces): fix types * feat(workspaces): WIP join * feat(workspaces): join button makes u join * chore(useremails): fix type for find verified emails function * feat(workspaces): join * feat(workspace): prevent inviting user without email matching domain * chore(workspaces): fix linter * fix(workspaces): invoke join (gergo wrote this) * fuck * fix(workspaces): properly get discoverable workspaces * fix(workspaces): test --------- Co-authored-by: Gergő Jedlicska <gergo@jedlicska.com> Co-authored-by: Chuck Driesler <chuck@speckle.systems> * fix(workspaces): some query stuff * fix(workspaces): mutate cache instead of refetch * fix(workspaces): more adjustments to gql query and fragment structure * fix(workspaces): queries, style, structure * fix(workspaces): match discoverability with current styles * chore(workspaces): lint lint lint * fix(workspaces): got it twisted * chore(workspaces): fix test * fix(workspaces): route to joined workspace on join --------- Co-authored-by: Mike Tasset <mike.tasset@gmail.com> Co-authored-by: Chuck Driesler <chuck@speckle.systems> Co-authored-by: Alessandro Magionami <alessandro.magionami@gmail.com>
162 lines
4.1 KiB
Vue
162 lines
4.1 KiB
Vue
<template>
|
|
<LayoutDialog
|
|
v-model:open="isOpen"
|
|
title="Add domain"
|
|
max-width="sm"
|
|
:buttons="dialogButtons"
|
|
>
|
|
<div class="h-24">
|
|
<FormSelectWorkspaceDomains
|
|
:domains="verifiedUserDomains"
|
|
:model-value="selectedDomain"
|
|
@update:model-value="onSelectedDomainUpdate"
|
|
/>
|
|
</div>
|
|
</LayoutDialog>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { useApolloClient } from '@vue/apollo-composable'
|
|
import type { LayoutDialogButton } from '@speckle/ui-components'
|
|
import { settingsAddWorkspaceDomainMutation } from '~/lib/settings/graphql/mutations'
|
|
import { getCacheId, getFirstErrorMessage } from '~/lib/common/helpers/graphql'
|
|
import type {
|
|
SettingsWorkspacesSecurityDomainAddDialog_UserFragment,
|
|
SettingsWorkspacesSecurityDomainAddDialog_WorkspaceFragment,
|
|
Workspace
|
|
} from '~/lib/common/generated/gql/graphql'
|
|
import { graphql } from '~/lib/common/generated/gql'
|
|
import { isString } from 'lodash-es'
|
|
|
|
graphql(`
|
|
fragment SettingsWorkspacesSecurityDomainAddDialog_Workspace on Workspace {
|
|
id
|
|
domains {
|
|
id
|
|
domain
|
|
}
|
|
discoverabilityEnabled
|
|
}
|
|
fragment SettingsWorkspacesSecurityDomainAddDialog_User on User {
|
|
id
|
|
emails {
|
|
id
|
|
email
|
|
verified
|
|
}
|
|
}
|
|
`)
|
|
|
|
const props = defineProps<{
|
|
workspace: SettingsWorkspacesSecurityDomainAddDialog_WorkspaceFragment
|
|
verifiedUser: SettingsWorkspacesSecurityDomainAddDialog_UserFragment
|
|
}>()
|
|
|
|
const { workspace } = toRefs(props)
|
|
|
|
const isOpen = defineModel<boolean>('open', { required: true })
|
|
|
|
const { triggerNotification } = useGlobalToast()
|
|
|
|
const apollo = useApolloClient().client
|
|
|
|
const selectedDomain = ref<string>('')
|
|
const onSelectedDomainUpdate = (e?: string | string[]) => {
|
|
if (!isString(e)) {
|
|
return
|
|
}
|
|
selectedDomain.value = e
|
|
}
|
|
|
|
const verifiedUserDomains = computed(() => [
|
|
...new Set(
|
|
(props.verifiedUser.emails ?? [])
|
|
.filter((email) => email.verified)
|
|
.map((email) => email.email.split('@')[1])
|
|
)
|
|
])
|
|
|
|
const onAdd = async () => {
|
|
const result = await apollo
|
|
.mutate({
|
|
mutation: settingsAddWorkspaceDomainMutation,
|
|
variables: {
|
|
input: {
|
|
domain: selectedDomain.value,
|
|
workspaceId: workspace.value.id
|
|
}
|
|
},
|
|
optimisticResponse: {
|
|
workspaceMutations: {
|
|
addDomain: {
|
|
__typename: 'Workspace',
|
|
id: workspace.value.id,
|
|
domains: [
|
|
...workspace.value.domains,
|
|
{
|
|
__typename: 'WorkspaceDomain',
|
|
id: '',
|
|
domain: selectedDomain.value
|
|
}
|
|
],
|
|
discoverabilityEnabled:
|
|
workspace.value.domains.length === 0
|
|
? true
|
|
: workspace.value.discoverabilityEnabled
|
|
}
|
|
}
|
|
},
|
|
update: (cache, res) => {
|
|
const { data } = res
|
|
if (!data?.workspaceMutations) return
|
|
|
|
cache.modify<Workspace>({
|
|
id: getCacheId('Workspace', props.workspace.id),
|
|
fields: {
|
|
discoverabilityEnabled() {
|
|
return data?.workspaceMutations.addDomain.discoverabilityEnabled || false
|
|
},
|
|
domains() {
|
|
return [...(data?.workspaceMutations.addDomain.domains || [])]
|
|
}
|
|
}
|
|
})
|
|
}
|
|
})
|
|
.catch(convertThrowIntoFetchResult)
|
|
|
|
if (result?.data) {
|
|
isOpen.value = false
|
|
triggerNotification({
|
|
type: ToastNotificationType.Success,
|
|
title: 'Domain added',
|
|
description: `The verified domain ${selectedDomain.value} has been added to your workspace`
|
|
})
|
|
} else {
|
|
triggerNotification({
|
|
type: ToastNotificationType.Danger,
|
|
title: 'Failed to add verified domain',
|
|
description: getFirstErrorMessage(result?.errors)
|
|
})
|
|
}
|
|
}
|
|
|
|
const dialogButtons = computed((): LayoutDialogButton[] => [
|
|
{
|
|
text: 'Cancel',
|
|
props: { color: 'outline', fullWidth: true },
|
|
onClick: () => {
|
|
isOpen.value = false
|
|
}
|
|
},
|
|
{
|
|
text: 'Add',
|
|
props: {
|
|
fullWidth: true,
|
|
color: 'primary'
|
|
},
|
|
onClick: onAdd
|
|
}
|
|
])
|
|
</script>
|