Skip to content

fix: support recordId with '/' in it. #1466

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: support recordId with '/' in it. #1466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/backend/utils/view-helpers/view-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,10 @@ export class ViewHelpers {
*
* @return {string}
*/
recordActionUrl({ resourceId, recordId, actionName, search }: RecordActionParams): string {
return this.urlBuilder(['resources', resourceId, 'records', recordId, actionName], search)
recordActionUrl({ resourceId, recordId, actionName, search, noURIEncode }: RecordActionParams & {
noURIEncode?: boolean;
}): string {
return this.urlBuilder(['resources', resourceId, 'records', noURIEncode ? recordId : encodeURIComponent(recordId), actionName], search)
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/components/application.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const App: React.FC = () => {
const pageName = ':pageName'

const dashboardUrl = h.dashboardUrl()
const recordActionUrl = h.recordActionUrl({ resourceId, recordId, actionName })
const recordActionUrl = h.recordActionUrl({ resourceId, recordId, actionName, noURIEncode: true })
const resourceActionUrl = h.resourceActionUrl({ resourceId, actionName })
const bulkActionUrl = h.bulkActionUrl({ resourceId, actionName })
const resourceUrl = h.resourceUrl({ resourceId })
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/components/routes/resource.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const getAction = (resource: ResourceJSON): ActionJSON | undefined => {
const actionName = ':actionName'
const recordId = ':recordId'

const recordActionUrl = h.recordActionUrl({ resourceId, recordId, actionName })
const recordActionUrl = h.recordActionUrl({ resourceId, recordId, actionName, noURIEncode: true })
const resourceActionUrl = h.resourceActionUrl({ resourceId, actionName })
const bulkActionUrl = h.bulkActionUrl({ resourceId, actionName })

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/utils/api-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ class ApiClient {
async recordAction(options: RecordActionAPIParams): Promise<AxiosResponse<RecordActionResponse>> {
const { resourceId, recordId, actionName, data, ...axiosParams } = options
const response = await this.client.request({
url: `/api/resources/${resourceId}/records/${recordId}/${actionName}`,
url: `/api/resources/${resourceId}/records/${encodeURIComponent(recordId)}/${actionName}`,
method: data ? 'POST' : 'GET',
...axiosParams,
data,
Expand Down