diff --git a/client/src/app/api/models.ts b/client/src/app/api/models.ts index ee723beb5a..2f2c071027 100644 --- a/client/src/app/api/models.ts +++ b/client/src/app/api/models.ts @@ -503,13 +503,10 @@ export interface TrackerProjectIssuetype { } export interface AnalysisDependency { - createTime: string; - name: string; provider: string; - version: string; - sha: string; - applications: number; + name: string; labels: string[]; + applications: number; } export interface AnalysisAppDependency { @@ -519,12 +516,12 @@ export interface AnalysisAppDependency { businessService: string; dependency: { id: number; + provider: string; name: string; version: string; - provider: string; + sha: string; indirect: boolean; - //TODO: Glean from labels somehow - // management?: string; + labels: string[]; }; } diff --git a/client/src/app/pages/dependencies/dependencies.tsx b/client/src/app/pages/dependencies/dependencies.tsx index 648397c7a5..c61e145fd0 100644 --- a/client/src/app/pages/dependencies/dependencies.tsx +++ b/client/src/app/pages/dependencies/dependencies.tsx @@ -79,31 +79,10 @@ export const Dependencies: React.FC = () => { }) + "...", getServerFilterValue: (value) => (value ? [`*${value[0]}*`] : []), }, - { - key: "version", - title: t("terms.version"), - type: FilterType.search, - filterGroup: "Dependency", - placeholderText: - t("actions.filterBy", { - what: t("terms.label").toLowerCase(), - }) + "...", - getServerFilterValue: (value) => (value ? [`*${value[0]}*`] : []), - }, - { - key: "sha", - title: "SHA", - type: FilterType.search, - filterGroup: "Dependency", - placeholderText: - t("actions.filterBy", { - what: t("terms.name").toLowerCase(), - }) + "...", - getServerFilterValue: (value) => (value ? [`*${value[0]}*`] : []), - }, ], initialItemsPerPage: 10, }); + const { result: { data: currentPageItems, total: totalItemCount }, isFetching, @@ -179,8 +158,6 @@ export const Dependencies: React.FC = () => {