Skip to content

Commit 372e898

Browse files
committed
fix UI papercuts
1 parent fb21561 commit 372e898

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

src/api/functions/linkry.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export async function fetchLinkEntry(
3434
access: unmarshalled
3535
.filter((x) => (x["access"] as string).startsWith("GROUP#"))
3636
.map((x) => (x["access"] as string).replace("GROUP#", "")),
37+
owner: ownerRecord["access"].replace("OWNER#", ""),
3738
} as LinkRecord;
3839
}
3940

src/api/routes/linkry.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,7 @@ const linkryRoutes: FastifyPluginAsync = async (fastify, _options) => {
575575
},
576576
},
577577
];
578+
console.log(JSON.stringify(TransactItems));
578579
try {
579580
await fastify.dynamoClient.send(
580581
new TransactWriteItemsCommand({ TransactItems }),

src/common/types/linkry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const linkRecord = z.object({
2525
createdAt: z.string().datetime(),
2626
updatedAt: z.string().datetime(),
2727
redirect: z.string().url(),
28-
owner: z.string().optional()
28+
owner: z.string()
2929
})
3030

3131
export const delegatedLinkRecord = linkRecord.extend({

src/ui/pages/linkry/LinkShortener.page.tsx

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,16 @@ export const LinkShortener: React.FC = () => {
199199
useEffect(() => {
200200
const getEvents = async () => {
201201
setIsLoading(true);
202-
const response = await api.get('/api/v1/linkry/redir');
202+
let response;
203+
try {
204+
response = await api.get('/api/v1/linkry/redir');
205+
} catch (e) {
206+
throw e;
207+
} finally {
208+
setIsLoading(false);
209+
}
203210
const ownedLinks = response.data.ownedLinks;
204211
const delegatedLinks = response.data.delegatedLinks;
205-
setIsLoading(false);
206212
setOwnedLinks(ownedLinks);
207213
setDelegatedLinks(delegatedLinks);
208214
};
@@ -213,8 +219,15 @@ export const LinkShortener: React.FC = () => {
213219
try {
214220
const encodedSlug = encodeURIComponent(slug);
215221
setIsLoading(true);
216-
await api.delete(`/api/v1/linkry/redir/${encodedSlug}`);
217-
setOwnedLinks((prevEvents) => prevEvents.filter((link) => link.slug !== slug));
222+
try {
223+
await api.delete(`/api/v1/linkry/redir/${encodedSlug}`);
224+
} catch (e) {
225+
throw e;
226+
} finally {
227+
setIsLoading(false);
228+
}
229+
setOwnedLinks((prevLinks) => prevLinks.filter((link) => link.slug !== slug));
230+
setDelegatedLinks((prevLinks) => prevLinks.filter((link) => link.slug !== slug));
218231
setIsLoading(false);
219232
notifications.show({
220233
title: 'Link deleted',

0 commit comments

Comments
 (0)