Skip to content

Commit 70d3d2c

Browse files
authored
Merge branch 'main' into mg/add-http-headers
2 parents 524f60a + bed797c commit 70d3d2c

11 files changed

Lines changed: 442 additions & 509 deletions

THIRD_PARTY_LICENSES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42368,7 +42368,7 @@ For more information, please refer to <http://unlicense.org>
4236842368

4236942369
The following npm package may be included in this product:
4237042370

42371-
- protobufjs@7.5.4
42371+
- protobufjs@7.5.5
4237242372

4237342373
This package contains the following license:
4237442374

package-lock.json

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

packages/server/api/src/app/app-connection/app-connection-service/app-connection-service.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ export const appConnectionService = {
256256
customPaginationColumn: {
257257
columnPath: sortingConfig.columnPath,
258258
columnName: sortingConfig.columnName,
259+
columnType: sortingConfig.columnType,
259260
},
260261
});
261262

@@ -579,6 +580,7 @@ function resolveAppConnectionSorting({
579580
}): {
580581
columnPath: string;
581582
columnName: string;
583+
columnType?: string;
582584
order: 'ASC' | 'DESC';
583585
} {
584586
const resolvedSortBy = sortBy ?? DEFAULT_APP_CONNECTION_SORT_BY;
@@ -587,11 +589,12 @@ function resolveAppConnectionSorting({
587589

588590
const sortByToColumnMap: Record<
589591
AppConnectionSortBy,
590-
{ columnPath: string; columnName: string }
592+
{ columnPath: string; columnName: string; columnType?: string }
591593
> = {
592594
[AppConnectionSortBy.NAME]: {
593595
columnPath: 'name',
594596
columnName: 'app_connection.name',
597+
columnType: 'string',
595598
},
596599
[AppConnectionSortBy.CREATED]: {
597600
columnPath: 'created',

0 commit comments

Comments
 (0)