Skip to content
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.

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

Add missing logDisplays filter #179

Merged
merged 1 commit into from
Feb 5, 2025
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
10 changes: 6 additions & 4 deletions src/piWebserviceProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import type {
filterActionsFilter,
WorkflowsFilter,
ModuleRuntimesFilter,
LogDisplaysFilter,
LogDisplayLogsFilter
} from "./requestParameters";
import type {TopologyNodeResponse} from "./response/topology";
Expand Down Expand Up @@ -95,8 +96,8 @@ export class PiWebserviceProvider {
* @returns Locations PI API response
* @throws 'Fetch Error' if fetch result is not ok
*/
async getLogDisplays(): Promise<LogsDisplaysResponse> {
const url = this.logDisplaysUrl();
async getLogDisplays(filter: LogDisplaysFilter): Promise<LogsDisplaysResponse> {
const url = this.logDisplaysUrl(filter);
const res = await this.webservice.getData<LogsDisplaysResponse>(url.toString());
return res.data;
}
Expand Down Expand Up @@ -537,9 +538,10 @@ export class PiWebserviceProvider {
*
* @returns complete url for making a request
*/
logDisplaysUrl(): URL {
logDisplaysUrl(filter: LogDisplaysFilter): URL {
const queryParameters = filterToParams(filter)
return new URL(
`${this._baseUrl.pathname}${this.API_ENDPOINT}/logdisplays`,
`${this._baseUrl.pathname}${this.API_ENDPOINT}/logdisplays${queryParameters}`,
this._baseUrl
)
}
Expand Down
1 change: 1 addition & 0 deletions src/requestParameters/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ export * from './timeSeriesTopologyActionsFilter.js'
export * from './runTaskFilter.js'
export * from './workflowsFilter.js'
export * from './dashboardsFilter.js'
export * from './logDisplaysFilter.js'
export * from './logDisplayLogsFilter.js'
8 changes: 8 additions & 0 deletions src/requestParameters/logDisplaysFilter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import type { BaseFilter } from "./baseFilter";

export interface LogDisplaysFilter extends BaseFilter {
/**
* the id of the log display
*/
logDisplayId: string;
}
8 changes: 6 additions & 2 deletions test/unit/fews/logDisplays.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,25 @@ import {PiWebserviceProvider} from '../../../src/piWebserviceProvider'
import 'cross-fetch/polyfill';
import fetchMock from "fetch-mock";
import expectedResponse from '../mock/logDisplays.json'
import { LogDisplaysFilter } from '../../../src';

describe("logDisplays", function () {
afterAll(function () {
fetchMock.restore();
});

it("logdisplays json response", async function () {
fetchMock.get("https://mock.dev/fewswebservices/rest/fewspiservice/v1/logdisplays", {
fetchMock.get("https://mock.dev/fewswebservices/rest/fewspiservice/v1/logdisplays?logDisplayId=admin.log", {
status: 200,
body: JSON.stringify(expectedResponse)
});

const provider = new PiWebserviceProvider("https://mock.dev/fewswebservices")

const results = await provider.getLogDisplays();
const filter: LogDisplaysFilter = {
logDisplayId: "admin.log"
}
const results = await provider.getLogDisplays(filter);
expect(results).toStrictEqual(expectedResponse);
expect("logDisplays" in results).toBe(true);
expect(results?.logDisplays?.length).toBe(2);
Expand Down