fix(workspace-invite): inconsistence in roles names
This commit is contained in:
@@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
public static class KnownRoles
|
public static class KnownRoles
|
||||||
{
|
{
|
||||||
public const string Administrator = nameof(Administrator);
|
public const string Administrator = "administrator";
|
||||||
public const string Manager = nameof(Manager);
|
public const string Manager = "manager";
|
||||||
public const string Client = nameof(Client);
|
public const string Client = "client";
|
||||||
public const string Provider = nameof(Provider);
|
public const string Provider = "provider";
|
||||||
public const string WorkspaceMember = nameof(WorkspaceMember);
|
public const string WorkspaceMember = "workspace-member";
|
||||||
public const string Developer = nameof(Developer);
|
public const string Developer = "developer";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace Socialize.Api.Modules.Workspaces.Data;
|
||||||
|
|
||||||
|
public static class WorkspaceInviteStatuses
|
||||||
|
{
|
||||||
|
public const string Pending = "Pending";
|
||||||
|
}
|
||||||
@@ -24,7 +24,7 @@ public class CreateWorkspaceInviteRequestValidator
|
|||||||
public CreateWorkspaceInviteRequestValidator()
|
public CreateWorkspaceInviteRequestValidator()
|
||||||
{
|
{
|
||||||
RuleFor(x => x.Email).NotEmpty().MaximumLength(256).EmailAddress();
|
RuleFor(x => x.Email).NotEmpty().MaximumLength(256).EmailAddress();
|
||||||
RuleFor(x => x.Role).NotEmpty().Must(role => AllowedRoles.Contains(role));
|
RuleFor(x => x.Role).NotEmpty().Must(role => AllowedRoles.Contains(role)).WithMessage("A valid role should be specified");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,7 +65,7 @@ public class CreateWorkspaceInviteHandler(
|
|||||||
bool duplicateInvite = await dbContext.WorkspaceInvites.AnyAsync(
|
bool duplicateInvite = await dbContext.WorkspaceInvites.AnyAsync(
|
||||||
invite => invite.WorkspaceId == workspaceId &&
|
invite => invite.WorkspaceId == workspaceId &&
|
||||||
invite.Email == normalizedEmail &&
|
invite.Email == normalizedEmail &&
|
||||||
invite.Status == "Pending",
|
invite.Status == WorkspaceInviteStatuses.Pending,
|
||||||
ct);
|
ct);
|
||||||
|
|
||||||
if (duplicateInvite)
|
if (duplicateInvite)
|
||||||
@@ -81,7 +81,7 @@ public class CreateWorkspaceInviteHandler(
|
|||||||
WorkspaceId = workspaceId,
|
WorkspaceId = workspaceId,
|
||||||
Email = normalizedEmail,
|
Email = normalizedEmail,
|
||||||
Role = normalizedRole,
|
Role = normalizedRole,
|
||||||
Status = "Pending",
|
Status = WorkspaceInviteStatuses.Pending,
|
||||||
InvitedByUserId = User.GetUserId(),
|
InvitedByUserId = User.GetUserId(),
|
||||||
CreatedAt = DateTimeOffset.UtcNow,
|
CreatedAt = DateTimeOffset.UtcNow,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
const inviteForm = reactive({
|
const inviteForm = reactive({
|
||||||
email: '',
|
email: '',
|
||||||
role: 'workspaceMember',
|
role: 'workspace-member',
|
||||||
});
|
});
|
||||||
|
|
||||||
const pendingInvites = computed(() =>
|
const pendingInvites = computed(() =>
|
||||||
@@ -161,7 +161,7 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
inviteForm.email = '';
|
inviteForm.email = '';
|
||||||
inviteForm.role = 'workspaceMember';
|
inviteForm.role = 'workspace-member';
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to invite workspace member:', error);
|
console.error('Failed to invite workspace member:', error);
|
||||||
}
|
}
|
||||||
@@ -330,7 +330,7 @@
|
|||||||
<label class="field">
|
<label class="field">
|
||||||
<span>{{ t('workspaceSettings.fields.memberRole') }}</span>
|
<span>{{ t('workspaceSettings.fields.memberRole') }}</span>
|
||||||
<select v-model="inviteForm.role">
|
<select v-model="inviteForm.role">
|
||||||
<option value="workspaceMember">{{ t('workspaceSettings.roles.workspaceMember') }}</option>
|
<option value="workspace-member">{{ t('workspaceSettings.roles.workspace-member') }}</option>
|
||||||
<option value="client">{{ t('workspaceSettings.roles.client') }}</option>
|
<option value="client">{{ t('workspaceSettings.roles.client') }}</option>
|
||||||
<option value="provider">{{ t('workspaceSettings.roles.provider') }}</option>
|
<option value="provider">{{ t('workspaceSettings.roles.provider') }}</option>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -512,7 +512,7 @@
|
|||||||
"manager": "Manager",
|
"manager": "Manager",
|
||||||
"client": "Client reviewer",
|
"client": "Client reviewer",
|
||||||
"provider": "Subcontractor",
|
"provider": "Subcontractor",
|
||||||
"workspaceMember": "Workspace member"
|
"workspace-member": "Workspace member"
|
||||||
},
|
},
|
||||||
"summary": {
|
"summary": {
|
||||||
"name": "Name",
|
"name": "Name",
|
||||||
|
|||||||
@@ -512,7 +512,7 @@
|
|||||||
"manager": "Gestionnaire",
|
"manager": "Gestionnaire",
|
||||||
"client": "Réviseur client",
|
"client": "Réviseur client",
|
||||||
"provider": "Sous-traitant",
|
"provider": "Sous-traitant",
|
||||||
"workspaceMember": "Membre de l'espace"
|
"workspace-member": "Membre de l'espace"
|
||||||
},
|
},
|
||||||
"summary": {
|
"summary": {
|
||||||
"name": "Nom",
|
"name": "Nom",
|
||||||
|
|||||||
@@ -94,25 +94,25 @@ const routes = [
|
|||||||
path: '/app/feedback',
|
path: '/app/feedback',
|
||||||
name: 'developer-feedback',
|
name: 'developer-feedback',
|
||||||
component: DeveloperFeedbackListView,
|
component: DeveloperFeedbackListView,
|
||||||
meta: { requiresAuth: true, roles: ['Developer'] },
|
meta: { requiresAuth: true, roles: ['developer'] },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/app/feedback/:id',
|
path: '/app/feedback/:id',
|
||||||
name: 'developer-feedback-detail',
|
name: 'developer-feedback-detail',
|
||||||
component: DeveloperFeedbackDetailView,
|
component: DeveloperFeedbackDetailView,
|
||||||
meta: { requiresAuth: true, roles: ['Developer'] },
|
meta: { requiresAuth: true, roles: ['developer'] },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/app/workspace-settings',
|
path: '/app/workspace-settings',
|
||||||
name: 'workspace-settings',
|
name: 'workspace-settings',
|
||||||
component: WorkspaceSettingsView,
|
component: WorkspaceSettingsView,
|
||||||
meta: { requiresAuth: true, roles: ['Administrator', 'Manager'] },
|
meta: { requiresAuth: true, roles: ['administrator', 'manager'] },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/app/workspaces/new',
|
path: '/app/workspaces/new',
|
||||||
name: 'workspace-create',
|
name: 'workspace-create',
|
||||||
component: WorkspaceCreateView,
|
component: WorkspaceCreateView,
|
||||||
meta: { requiresAuth: true, roles: ['Administrator', 'Manager'] },
|
meta: { requiresAuth: true, roles: ['administrator', 'manager'] },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/app/settings',
|
path: '/app/settings',
|
||||||
@@ -132,13 +132,13 @@ const routes = [
|
|||||||
path: 'workspaces',
|
path: 'workspaces',
|
||||||
name: 'settings-workspaces',
|
name: 'settings-workspaces',
|
||||||
component: WorkspaceSettingsView,
|
component: WorkspaceSettingsView,
|
||||||
meta: { requiresAuth: true, roles: ['Administrator', 'Manager'] },
|
meta: { requiresAuth: true, roles: ['administrator', 'manager'] },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'integrations',
|
path: 'integrations',
|
||||||
name: 'settings-integrations',
|
name: 'settings-integrations',
|
||||||
component: IntegrationsSettingsView,
|
component: IntegrationsSettingsView,
|
||||||
meta: { requiresAuth: true, roles: ['Administrator', 'Manager'] },
|
meta: { requiresAuth: true, roles: ['administrator', 'manager'] },
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user