Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename org short code feature added #550

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions apps/platform/trpc/routers/orgRouter/setup/profileRouter.ts
Original file line number Diff line number Diff line change
@@ -48,7 +48,14 @@ export const orgProfileRouter = router({
setOrgProfile: orgProcedure
.input(
z.object({
orgName: z.string().min(3).max(32)
orgName: z.string().min(3).max(32),
orgShortCodeNew: z
.string()
.min(5)
.max(64)
.regex(/^[a-z0-9]*$/, {
message: 'Only lowercase letters and numbers'
})
})
)
.mutation(async ({ ctx, input }) => {
@@ -60,7 +67,7 @@ export const orgProfileRouter = router({
}
const { db, org } = ctx;
const orgId = org?.id;
const { orgName } = input;
const { orgName, orgShortCodeNew } = input;

const isAdmin = await isAccountAdminOfOrg(org);
if (!isAdmin) {
@@ -73,7 +80,8 @@ export const orgProfileRouter = router({
await db
.update(orgs)
.set({
name: orgName
name: orgName,
shortcode: orgShortCodeNew
})
.where(eq(orgs.id, orgId));

112 changes: 109 additions & 3 deletions apps/web/src/app/[orgShortCode]/settings/org/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client';

import { useRouter } from 'next/navigation';
import { useState, useMemo } from 'react';
import { useState, useMemo, useEffect } from 'react';
import { Button } from '@/src/components/shadcn-ui/button';
import { Camera, FloppyDisk } from '@phosphor-icons/react';
import { api } from '@/src/lib/trpc';
@@ -13,6 +13,9 @@ import { AvatarModal } from '@/src/components/shared/avatar-modal';
import { PageTitle } from '../_components/page-title';
import { Skeleton } from '@/src/components/shadcn-ui/skeleton';
import { Input } from '@/src/components/shadcn-ui/input';
import { useDebounce } from '@uidotdev/usehooks';
import { z } from 'zod';
import { Check, Plus } from '@phosphor-icons/react';

export default function ProfileComponent() {
const router = useRouter();
@@ -26,6 +29,45 @@ export default function ProfileComponent() {
});

const [orgNameValue, setOrgNameValue] = useState<string>(currentOrg.name);
const [orgShortCodeValue, setOrgShortCodeValue] = useState<string>(
currentOrg.shortCode
);

const debouncedOrgShortCode = useDebounce(orgShortCodeValue, 500);
const checkOrgShortCodeApi =
api.useUtils().org.crud.checkShortCodeAvailability;

const {
loading: orgShortCodeDataLoading,
data: orgShortCodeData,
error: orgShortCodeError,
run: checkOrgShortCode
} = useLoading(async (signal) => {
if (!debouncedOrgShortCode) return;
//set to initial state
if (debouncedOrgShortCode === orgShortCode) {
return null;
}
const parsed = z
.string()
.min(5)
.max(64)
.regex(/^[a-z0-9]*$/, {
message: 'Only lowercase letters and numbers'
})
.safeParse(debouncedOrgShortCode);

if (!parsed.success) {
return {
error: parsed.error.issues[0]?.message ?? null,
available: null
};
}
return await checkOrgShortCodeApi.fetch(
{ shortcode: debouncedOrgShortCode },
{ signal }
);
});

const avatarUrl = useMemo(() => {
return generateAvatarUrl({
@@ -56,15 +98,25 @@ export default function ProfileComponent() {
const { loading: saveLoading, run: saveOrgProfile } = useLoading(async () => {
await updateOrgProfileApi.mutateAsync({
orgName: orgNameValue,
orgShortCode
orgShortCode,
orgShortCodeNew: orgShortCodeValue
});
updateOrg(orgShortCode, {
name: orgNameValue,
shortCode: orgShortCodeValue
});
updateOrg(orgShortCode, { name: orgNameValue });
});

if (!adminLoading && !isAdmin) {
router.push(`/${orgShortCode}/settings`);
}

useEffect(() => {
if (!debouncedOrgShortCode) return;
checkOrgShortCode({ clearData: true, clearError: true });
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [debouncedOrgShortCode]);

return (
<div className="flex h-full w-full flex-col items-start gap-4 overflow-y-auto p-4">
<PageTitle title="Your Profile" />
@@ -107,8 +159,62 @@ export default function ProfileComponent() {
</label>
</div>

<div className="flex flex-row gap-2">
<label>
<span>Organization Short Code</span>
<Input
value={orgShortCodeValue}
onChange={(e) => setOrgShortCodeValue(e.target.value)}
/>
</label>
</div>

{!orgShortCodeData && orgShortCodeDataLoading && (
<div className="text-muted-foreground text-sm font-bold">
Checking...
</div>
)}

{orgShortCodeData && !orgShortCodeDataLoading && (
<div className="flex items-center gap-1">
{orgShortCodeData.available ? (
<Check
size={16}
className="text-green-10"
/>
) : (
<Plus
size={16}
className="text-red-10 rotate-45"
/>
)}

<div
className={cn(
'text-sm font-bold',
orgShortCodeData.available ? 'text-green-10' : 'text-red-10'
)}>
{orgShortCodeData.available
? 'Looks good!'
: orgShortCodeData.error}
</div>
</div>
)}

{orgShortCodeError && !orgShortCodeDataLoading && (
<div className="text-red-10 text-sm font-bold">
{orgShortCodeError.message}
</div>
)}

<Button
className="w-48"
loading={saveLoading}
disabled={
(!orgShortCodeData?.available &&
currentOrg.name === orgNameValue) ||
saveLoading
}
onClick={() => saveOrgProfile({ clearData: true, clearError: true })}>
<FloppyDisk size={20} />
Save

Unchanged files with check annotations Beta

const currentMembers = teamMembers.members.map(
(m) => m.orgMember.publicId
);
const newMembers = orgMemberPublicIds.filter(

Check warning on line 264 in apps/platform/trpc/routers/orgRouter/users/teamsRouter.ts

GitHub Actions / Check and Build

'newMembers' is assigned a value but never used
(m) => !currentMembers.includes(m)
);
const removedMembers = currentMembers.filter(

Check warning on line 267 in apps/platform/trpc/routers/orgRouter/users/teamsRouter.ts

GitHub Actions / Check and Build

'removedMembers' is assigned a value but never used
(m) => !orgMemberPublicIds.includes(m)
);
} from '@/src/components/shadcn-ui/card';
import { cn } from '@/src/lib/utils';
import {
Dialog,

Check warning on line 27 in apps/web/src/app/[orgShortCode]/settings/org/setup/billing/_components/plans-table.tsx

GitHub Actions / Check and Build

'Dialog' is defined but never used
DialogContent,

Check warning on line 28 in apps/web/src/app/[orgShortCode]/settings/org/setup/billing/_components/plans-table.tsx

GitHub Actions / Check and Build

'DialogContent' is defined but never used
DialogDescription,

Check warning on line 29 in apps/web/src/app/[orgShortCode]/settings/org/setup/billing/_components/plans-table.tsx

GitHub Actions / Check and Build

'DialogDescription' is defined but never used
DialogTitle

Check warning on line 30 in apps/web/src/app/[orgShortCode]/settings/org/setup/billing/_components/plans-table.tsx

GitHub Actions / Check and Build

'DialogTitle' is defined but never used
} from '@/src/components/shadcn-ui/dialog';
type PricingSwitchProps = {