Skip to content

Commit 4df3dbe

Browse files
authored
Merge pull request #857 from polkadot-fellows/nik-fix-people-issue
fix people identity issue
2 parents 2409690 + 9ee526c commit 4df3dbe

File tree

10 files changed

+573
-1195
lines changed

10 files changed

+573
-1195
lines changed

.papi/descriptors/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.1.0-autogenerated.2462731509654553141",
2+
"version": "0.1.0-autogenerated.2706864156021772921",
33
"name": "@polkadot-api/descriptors",
44
"files": [
55
"dist"

.papi/metadata/collectives.scale

31.9 KB
Binary file not shown.

.papi/metadata/dot.scale

35.7 KB
Binary file not shown.

.papi/metadata/people.scale

24.9 KB
Binary file not shown.

.papi/polkadot-api.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,20 @@
55
"dot": {
66
"chain": "polkadot",
77
"metadata": ".papi/metadata/dot.scale",
8-
"genesis": "0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3"
8+
"genesis": "0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3",
9+
"codeHash": "0xa4d527cb0db4146686eeffb216b562fe68440185d5067e6177d1681ff7bb3043"
910
},
1011
"collectives": {
1112
"wsUrl": "wss://polkadot-collectives-rpc.polkadot.io",
1213
"metadata": ".papi/metadata/collectives.scale",
13-
"genesis": "0x46ee89aa2eedd13e988962630ec9fb7565964cf5023bb351f2b6b25c1b68b0b2"
14+
"genesis": "0x46ee89aa2eedd13e988962630ec9fb7565964cf5023bb351f2b6b25c1b68b0b2",
15+
"codeHash": "0xd19a8751b1bb4eb453d2c84a146fe34e149f3ff8cd0d961728c89115862ceec1"
1416
},
1517
"people": {
1618
"wsUrl": "wss://polkadot-people-rpc.polkadot.io",
1719
"metadata": ".papi/metadata/people.scale",
18-
"genesis": "0x67fa177a097bfa18f77ea95ab56e9bcdfeb0e5b8a40e46298bb93e16b6fc5008"
20+
"genesis": "0x67fa177a097bfa18f77ea95ab56e9bcdfeb0e5b8a40e46298bb93e16b6fc5008",
21+
"codeHash": "0x1477b7eaf80f56a1bfe4b6d6dae7cdc68a4353854b58a14700f3646c06783594"
1922
}
2023
}
21-
}
24+
}

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "fellowship-dashboard",
33
"private": true,
44
"version": "0.0.2",
5-
"packageManager": "pnpm@9.9.0",
5+
"packageManager": "pnpm@10.18.2+sha512.9fb969fa749b3ade6035e0f109f0b8a60b5d08a1a87fdf72e337da90dcc93336e2280ca4e44f2358a649b83c17959e9993e777c2080879f3801e6f0d999ad3dd",
66
"type": "module",
77
"scripts": {
88
"preinstall": "npx only-allow pnpm",
@@ -40,8 +40,8 @@
4040
"lucide-react": "^0.545.0",
4141
"next-themes": "^0.4.6",
4242
"polkadot-api": "^1.20.0",
43-
"react": "^18.3.1",
44-
"react-dom": "^18.3.1",
43+
"react": "^19.2.0",
44+
"react-dom": "^19.2.0",
4545
"react-icons": "^5.5.0",
4646
"react-router-dom": "^7.9.4",
4747
"sonner": "^2.0.7",
@@ -51,13 +51,13 @@
5151
"vaul": "^1.1.2"
5252
},
5353
"devDependencies": {
54-
"@types/node": "^22.15.12",
55-
"@types/react": "^18.3.18",
56-
"@types/react-dom": "^18.3.5",
54+
"@types/node": "^24.7.2",
55+
"@types/react": "^19.2.2",
56+
"@types/react-dom": "^19.2.1",
5757
"@types/react-router-dom": "^5.3.3",
5858
"@typescript-eslint/eslint-plugin": "^7.18.0",
5959
"@typescript-eslint/parser": "^7.18.0",
60-
"@vitejs/plugin-react": "^4.4.1",
60+
"@vitejs/plugin-react": "^5.0.4",
6161
"autoprefixer": "^10.4.21",
6262
"eslint": "^8.57.1",
6363
"eslint-config-prettier": "^10.1.8",
@@ -70,7 +70,7 @@
7070
"prettier-plugin-tailwindcss": "^0.6.14",
7171
"tailwindcss": "^3.4.18",
7272
"typescript": "^5.9.3",
73-
"vite": "^6.3.6",
73+
"vite": "^7.1.9",
7474
"vite-plugin-svgr": "^4.5.0"
7575
}
7676
}

pnpm-lock.yaml

Lines changed: 514 additions & 1158 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ export const Header = ({ lightClientLoaded, setLightClientLoaded }: Props) => {
220220
</nav>
221221

222222
<div className="fixed bottom-2 flex flex-col text-center align-middle text-sm font-bold text-primary">
223-
<span>©2024</span>
223+
<span>© {new Date().getFullYear()}</span>
224224
<span>Polkadot Technical Fellowship</span>
225225
</div>
226226
</SheetContent>

src/navigation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export const Navigation = ({
195195
</nav>
196196
<div className="flex flex-col items-center px-2 pb-5 text-sm font-bold text-primary">
197197
<span>Polkadot Technical Fellowship</span>
198-
<span>©2024</span>
198+
<span>©{new Date().getFullYear()}</span>
199199
</div>
200200
</aside>
201201
)

src/pages/About/RequestsGrid.tsx

Lines changed: 41 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,23 @@ const mapRawIdentity = (
6363
rawIdentity?: PeopleQueries['Identity']['IdentityOf']['Value'],
6464
) => {
6565
if (!rawIdentity) return rawIdentity
66-
const {
67-
info: { display, email, legal, matrix, twitter, web },
68-
} = rawIdentity[0]
66+
if (rawIdentity?.info) {
67+
const {
68+
info: { display, email, legal, matrix, twitter, web },
69+
} = rawIdentity
6970

70-
const display_id = dataToString(display.value)
71+
const display_id = dataToString(display.value)
7172

72-
return {
73-
display: display_id,
74-
web: dataToString(web.value),
75-
email: dataToString(email.value),
76-
legal: dataToString(legal.value),
77-
matrix: dataToString(matrix.value),
78-
twitter: dataToString(twitter.value),
73+
return {
74+
display: display_id,
75+
web: dataToString(web.value),
76+
email: dataToString(email.value),
77+
legal: dataToString(legal.value),
78+
matrix: dataToString(matrix.value),
79+
twitter: dataToString(twitter.value),
80+
}
81+
} else {
82+
return
7983
}
8084
}
8185

@@ -174,6 +178,15 @@ const columns = (
174178
},
175179
]
176180

181+
const renderSafe = (out: unknown): React.ReactNode => {
182+
if (out == null) return null
183+
if (typeof out === 'bigint') return out.toString()
184+
if (typeof out === 'object' && (out as any).nodeType === 1) {
185+
return (out as Element).textContent ?? ''
186+
}
187+
return out as React.ReactNode
188+
}
189+
177190
export const RequestsGrid = ({ lcStatus }: LcStatusType) => {
178191
const [sorting, setSorting] = useState<SortingState>([])
179192
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([])
@@ -275,9 +288,11 @@ export const RequestsGrid = ({ lcStatus }: LcStatusType) => {
275288
<TableHead key={header.id}>
276289
{header.isPlaceholder
277290
? null
278-
: flexRender(
279-
header.column.columnDef.header,
280-
header.getContext(),
291+
: renderSafe(
292+
flexRender(
293+
header.column.columnDef.header,
294+
header.getContext(),
295+
),
281296
)}
282297
</TableHead>
283298
)
@@ -292,14 +307,18 @@ export const RequestsGrid = ({ lcStatus }: LcStatusType) => {
292307
key={row.id}
293308
data-state={row.getIsSelected() && 'selected'}
294309
>
295-
{row.getVisibleCells().map((cell) => (
296-
<TableCell key={cell.id}>
297-
{flexRender(
298-
cell.column.columnDef.cell,
299-
cell.getContext(),
300-
)}
301-
</TableCell>
302-
))}
310+
{row.getVisibleCells().map((cell) => {
311+
return (
312+
<TableCell key={cell.id}>
313+
{renderSafe(
314+
flexRender(
315+
cell.column.columnDef.cell,
316+
cell.getContext(),
317+
),
318+
)}
319+
</TableCell>
320+
)
321+
})}
303322
</TableRow>
304323
))
305324
) : (

0 commit comments

Comments
 (0)