Skip to content

Commit 683e6ee

Browse files
Merge pull request #4079 from aakashreddy-p/aakash/fix/added-validation-check-user-content
fix: added validation condition for not select workspaces [SPRW-1836]
2 parents b3b2161 + 87efe80 commit 683e6ee

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

packages/@sparrow-workspaces/src/features/invite-to-workspace/components/invite-user-pickers/InviteUserPicker.svelte

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
*/
3333
export let currentWorkspaceUsers: { email: string }[] = [];
3434
35+
export let inviteSelectContent: boolean = false;
36+
3537
// State variables
3638
let isOpen = false;
3739
let data = list;
@@ -218,6 +220,14 @@
218220
}
219221
}
220222
};
223+
224+
$: {
225+
if (currentEmailEntered) {
226+
inviteSelectContent = true;
227+
} else {
228+
inviteSelectContent = false;
229+
}
230+
}
221231
</script>
222232

223233
<div on:click={handleDropdownClick}>

packages/@sparrow-workspaces/src/features/invite-to-workspace/layout/InviteToWorkspace.svelte

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
roleInvalid: false,
6060
userConflict: "",
6161
};
62+
let inviteSelectContent: boolean = false;
63+
let isProceed: boolean = false;
6264
6365
const clearErrors = () => {
6466
errors = {
@@ -73,6 +75,7 @@
7375
*/
7476
const handleInvite = async () => {
7577
loader = true;
78+
isProceed = true;
7679
clearErrors();
7780
if (emailstoBeSentArr.length === 0) {
7881
errors.emailsEmpty = true;
@@ -138,6 +141,12 @@
138141
selectedRole = role as WorkspaceRole;
139142
if (role !== defaultRole) errors.roleInvalid = false;
140143
};
144+
145+
$: {
146+
if (!inviteSelectContent) {
147+
isProceed = false;
148+
}
149+
}
141150
</script>
142151

143152
<div class="d-flex flex-column pt-3">
@@ -168,8 +177,13 @@
168177
filterWorkspaceInviteEmails(emailstoBeSentArr);
169178
}}
170179
isError={errors.emailsEmpty || !!errors.userConflict}
180+
bind:inviteSelectContent
171181
/>
172-
{#if errors.emailsEmpty}
182+
{#if inviteSelectContent && isProceed}
183+
<p class="error-text mb-0 sparrow-fs-12">
184+
Please Select Item From Dropdown.
185+
</p>
186+
{:else if errors.emailsEmpty}
173187
<p class="error-text mb-0 sparrow-fs-12">Email ID cannot be empty.</p>
174188
{:else if errors.userConflict}
175189
<p class="error-text mb-0 sparrow-fs-12">{errors.userConflict}</p>

0 commit comments

Comments
 (0)