Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/components/analysis/AnalysesTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ const onCloseNavToast = () => {
</div>
<DataTable
v-model:filters="filters"
:globalFilterFields="['analysis_name', 'project_name', 'node.name']"
:globalFilterFields="['analysis_name', 'project_name']"
:loading="tableLoading"
:rows="10"
:rowsPerPageOptions="[10, 20, 50]"
Expand Down
2 changes: 1 addition & 1 deletion app/components/projects/ProjectsTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const updateFilters = (filterText: string) => {
</Message>
<DataTable
v-model:filters="filters"
:globalFilterFields="['id', 'project_name', 'node.name']"
:globalFilterFields="['id', 'project_name']"
:rows="10"
:rowsPerPageOptions="[10, 20, 50]"
:sortOrder="1"
Expand Down
4 changes: 2 additions & 2 deletions app/composables/useAPIFetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function getProjectNodes(opts?) {
...opts,
method: "GET",
query: {
include: "project,node",
include: "project",
sort: "-updatedAt",
},
});
Expand All @@ -64,7 +64,7 @@ export function getProjects(opts?) {

export function getAnalysisNodes(opts?) {
return useAPIFetch<AnalysisNode[] | undefined>(
"/analysis-nodes?include=analysis,node",
"/analysis-nodes?include=analysis",
{
...opts,
method: "GET",
Expand Down
2 changes: 1 addition & 1 deletion app/composables/useAnalyses.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ export async function useAnalyses() {
offset: currentOffset,
limit: QUERY_LIMIT,
},
include: "analysis,node",
include: "analysis",
sort: "-updatedAt",
},
})
Expand Down
25 changes: 20 additions & 5 deletions app/services/Api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -476,11 +476,6 @@ export interface BodyPodorcPodsCreatePoPost {
* Analysis keyauth kong token
*/
kong_token?: string;
/**
* Node Id
* Node UUID
*/
node_id: string;
}

/**
Expand Down Expand Up @@ -2468,6 +2463,11 @@ export class Api<
* Comma-separated list of fields to return
*/
fields?: string | null;
/**
* Include
* Comma-separated list of nested fields to include
*/
include?: string | null;
},
params: RequestParams = {},
) =>
Expand Down Expand Up @@ -2512,6 +2512,11 @@ export class Api<
* Comma-separated list of fields to return
*/
fields?: string | null;
/**
* Include
* Comma-separated list of nested fields to include
*/
include?: string | null;
},
params: RequestParams = {},
) =>
Expand Down Expand Up @@ -2556,6 +2561,11 @@ export class Api<
* Comma-separated list of fields to return
*/
fields?: string | null;
/**
* Include
* Comma-separated list of nested fields to include
*/
include?: string | null;
},
params: RequestParams = {},
) =>
Expand Down Expand Up @@ -2595,6 +2605,11 @@ export class Api<
* Comma-separated list of fields to return
*/
fields?: string | null;
/**
* Include
* Comma-separated list of nested fields to include
*/
include?: string | null;
},
params: RequestParams = {},
) =>
Expand Down
87 changes: 73 additions & 14 deletions app/services/hub_adapter_swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,24 @@
"title": "Fields"
},
"description": "Comma-separated list of fields to return"
},
{
"name": "include",
"in": "query",
"required": false,
"schema": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
],
"description": "Comma-separated list of nested fields to include",
"title": "Include"
},
"description": "Comma-separated list of nested fields to include"
}
],
"responses": {
Expand Down Expand Up @@ -823,6 +841,24 @@
"title": "Fields"
},
"description": "Comma-separated list of fields to return"
},
{
"name": "include",
"in": "query",
"required": false,
"schema": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
],
"description": "Comma-separated list of nested fields to include",
"title": "Include"
},
"description": "Comma-separated list of nested fields to include"
}
],
"responses": {
Expand Down Expand Up @@ -931,6 +967,24 @@
"title": "Fields"
},
"description": "Comma-separated list of fields to return"
},
{
"name": "include",
"in": "query",
"required": false,
"schema": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
],
"description": "Comma-separated list of nested fields to include",
"title": "Include"
},
"description": "Comma-separated list of nested fields to include"
}
],
"responses": {
Expand Down Expand Up @@ -1048,6 +1102,24 @@
"title": "Fields"
},
"description": "Comma-separated list of fields to return"
},
{
"name": "include",
"in": "query",
"required": false,
"schema": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
],
"description": "Comma-separated list of nested fields to include",
"title": "Include"
},
"description": "Comma-separated list of nested fields to include"
}
],
"responses": {
Expand Down Expand Up @@ -3305,23 +3377,10 @@
"type": "string",
"title": "Kong Token",
"description": "Analysis keyauth kong token"
},
"node_id": {
"anyOf": [
{
"type": "string",
"format": "uuid"
},
{
"type": "string"
}
],
"title": "Node Id",
"description": "Node UUID"
}
},
"type": "object",
"required": ["analysis_id", "project_id", "node_id"],
"required": ["analysis_id", "project_id"],
"title": "Body_podorc_pods_create_po_post"
},
"CleanUpType": {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"echarts": "^6.1.0",
"next-auth": "~4.21.1",
"node-fetch-native": "^1.6.7",
"nuxt": "^4.5.2",
"nuxt": "^4.6.3",
"nuxt-echarts": "^1.0.1",
"pinia": "^3.0.4",
"primeicons": "^7.0.0",
Expand All @@ -47,7 +47,7 @@
"@tailwindcss/vite": "^4.3.3",
"@vitest/coverage-v8": "^4.1.11",
"@vue/test-utils": "^2.5.0",
"eslint": "~9.39.5",
"eslint": "~10.13.0",
"eslint-config-prettier": "^9.1.2",
"happy-dom": "^21.0.4",
"msw": "^2.15.0",
Expand Down
Loading
Loading