By creating this pull request, I grant the project maintainers an unlimited,
perpetual license to use, modify, and redistribute these contributions under any terms they
choose, including both the AGPLv3 and the Fossorial Commercial license terms. I
represent that I have the right to grant this license for all contributed content.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
## 📋 Pull Request Information
**Original PR:** https://github.com/fosrl/pangolin/pull/1967
**Author:** [@Fredkiss3](https://github.com/Fredkiss3)
**Created:** 12/3/2025
**Status:** ✅ Merged
**Merged:** 12/4/2025
**Merged by:** [@miloschwartz](https://github.com/miloschwartz)
**Base:** `clients-user` ← **Head:** `refactor/separate-tables-2`
---
### 📝 Commits (5)
- [`6734003`](https://github.com/fosrl/pangolin/commit/6734003d85765fcee43f954abe98380351bf21d7) ⬆️ upgrade react & next to fix **CVE-2025-55182**
- [`1b09e5b`](https://github.com/fosrl/pangolin/commit/1b09e5b9f93020129bced3916d48f859a3f91810) 🚚 move subpages to correct paths
- [`c695f50`](https://github.com/fosrl/pangolin/commit/c695f501221d8b08b8e34646bb0377547c2cb2c2) ♻️ use Queries
- [`d70da2a`](https://github.com/fosrl/pangolin/commit/d70da2aa703a52ae047e71cd7ca2c60837bfe933) 🐛 fix paths
- [`79ccbc8`](https://github.com/fosrl/pangolin/commit/79ccbc8e9217304d8f4f6b16d0da1de715770ff7) ♻️ compute everything in `useQueries`
### 📊 Changes
**12 files changed** (+225 additions, -257 deletions)
<details>
<summary>View changed files</summary>
📝 `package-lock.json` (+44 -44)
📝 `package.json` (+4 -4)
📝 `src/app/[orgId]/settings/clients/machine/[clientId]/credentials/page.tsx` (+27 -19)
📝 `src/app/[orgId]/settings/clients/machine/[clientId]/general/page.tsx` (+13 -16)
📝 `src/app/[orgId]/settings/clients/machine/[clientId]/layout.tsx` (+19 -20)
📝 `src/app/[orgId]/settings/clients/machine/[clientId]/page.tsx` (+3 -1)
📝 `src/app/[orgId]/settings/clients/machine/create/page.tsx` (+0 -0)
📝 `src/app/[orgId]/settings/resources/proxy/create/page.tsx` (+0 -0)
📝 `src/components/EditInternalResourceDialog.tsx` (+99 -149)
📝 `src/components/MachineClientsTable.tsx` (+3 -3)
📝 `src/components/ProxyResourcesTable.tsx` (+1 -1)
📝 `src/lib/queries.ts` (+12 -0)
</details>
### 📄 Description
## Community Contribution License Agreement
By creating this pull request, I grant the project maintainers an unlimited,
perpetual license to use, modify, and redistribute these contributions under any terms they
choose, including both the AGPLv3 and the Fossorial Commercial license terms. I
represent that I have the right to grant this license for all contributed content.
## Description
Continuing #1960
**Main changes:**
- Moved the pages that were supposed to be under the new subpaths for clients/machines to their corresponding paths
**Other changes:**
- refactor create & edit internal resources to use useQuery... probably too much work since this form is going to be changed later 😑
- upgrade react & next to fix [CVE-2025-55182](https://vercel.com/changelog/cve-2025-55182)
---
<sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
📋 Pull Request Information
Original PR: https://github.com/fosrl/pangolin/pull/1967
Author: @Fredkiss3
Created: 12/3/2025
Status: ✅ Merged
Merged: 12/4/2025
Merged by: @miloschwartz
Base:
clients-user← Head:refactor/separate-tables-2📝 Commits (5)
6734003⬆️ upgrade react & next to fix CVE-2025-551821b09e5b🚚 move subpages to correct pathsc695f50♻️ use Queriesd70da2a🐛 fix paths79ccbc8♻️ compute everything inuseQueries📊 Changes
12 files changed (+225 additions, -257 deletions)
View changed files
📝
package-lock.json(+44 -44)📝
package.json(+4 -4)📝
src/app/[orgId]/settings/clients/machine/[clientId]/credentials/page.tsx(+27 -19)📝
src/app/[orgId]/settings/clients/machine/[clientId]/general/page.tsx(+13 -16)📝
src/app/[orgId]/settings/clients/machine/[clientId]/layout.tsx(+19 -20)📝
src/app/[orgId]/settings/clients/machine/[clientId]/page.tsx(+3 -1)📝
src/app/[orgId]/settings/clients/machine/create/page.tsx(+0 -0)📝
src/app/[orgId]/settings/resources/proxy/create/page.tsx(+0 -0)📝
src/components/EditInternalResourceDialog.tsx(+99 -149)📝
src/components/MachineClientsTable.tsx(+3 -3)📝
src/components/ProxyResourcesTable.tsx(+1 -1)📝
src/lib/queries.ts(+12 -0)📄 Description
Community Contribution License Agreement
By creating this pull request, I grant the project maintainers an unlimited,
perpetual license to use, modify, and redistribute these contributions under any terms they
choose, including both the AGPLv3 and the Fossorial Commercial license terms. I
represent that I have the right to grant this license for all contributed content.
Description
Continuing #1960
Main changes:
Other changes:
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.