Skip to content

Commit

Permalink
linter changes
Browse files Browse the repository at this point in the history
Signed-off-by: sumukhswamy <[email protected]>
  • Loading branch information
sumukhswamy committed Feb 5, 2025
1 parent e777586 commit 4a2ed80
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 47 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,35 +23,35 @@ import {
} from '../../utils/utils';
import { definitionInputValidation } from '../utils/utils';

interface reportParamsType {
interface ReportParamsType {
report_name: string;
report_source: string;
description: string;
core_params: visualReportParams | dataReportParams;
core_params: VisualReportParams | DataReportParams;
}
interface visualReportParams {
interface VisualReportParams {
base_url: string;
report_format: string;
header: string;
footer: string;
time_duration: string;
timeRangeParams: timeRangeParams;
timeRangeParams: TimeRangeParams;
}

interface dataReportParams {
interface DataReportParams {
saved_search_id: number;
base_url: string;
report_format: string;
time_duration: string;
timeRangeParams: timeRangeParams;
timeRangeParams: TimeRangeParams;
}
interface triggerType {
interface TriggerType {
trigger_type: string;
trigger_params?: any;

Check warning on line 50 in public/components/report_definitions/create/create_report_definition.tsx

View workflow job for this annotation

GitHub Actions / Lint

Unexpected any. Specify a different type
}

interface deliveryType {
configIds: Array<string>;
interface DeliveryType {
configIds: string[];
title: string;
textDescription: string;
htmlDescription: string;
Expand Down Expand Up @@ -79,13 +79,13 @@ interface Cron {
};
}

export interface reportDefinitionParams {
report_params: reportParamsType;
delivery: deliveryType;
trigger: triggerType;
export interface ReportDefinitionParams {
report_params: ReportParamsType;
delivery: DeliveryType;
trigger: TriggerType;
}

export interface timeRangeParams {
export interface TimeRangeParams {
timeFrom: Date;
timeTo: Date;
}
Expand All @@ -98,7 +98,7 @@ export function CreateReport(props: {
}) {
const { chrome } = props;

let createReportDefinitionRequest: reportDefinitionParams = {
let createReportDefinitionRequest: ReportDefinitionParams = {
report_params: {
report_name: '',
report_source: '',
Expand Down Expand Up @@ -199,36 +199,18 @@ export function CreateReport(props: {
addErrorOnCreateToastHandler(errorType);
};

const addInvalidTimeRangeToastHandler = () => {
const errorToast = {
title: i18n.translate(
'opensearch.reports.createReportDefinition.error.invalidTimeRange',
{ defaultMessage: 'Invalid time range selected.' }
),
color: 'danger',
iconType: 'alert',
id: 'timeRangeErrorToast',
};
// @ts-ignore
setToasts(toasts.concat(errorToast));
};

const handleInvalidTimeRangeToast = () => {
addInvalidTimeRangeToastHandler();
};

const removeToast = (removedToast: { id: string }) => {
setToasts(toasts.filter((toast: any) => toast.id !== removedToast.id));

Check warning on line 203 in public/components/report_definitions/create/create_report_definition.tsx

View workflow job for this annotation

GitHub Actions / Lint

Unexpected any. Specify a different type
};

let timeRange = {
const NewTimeRange = {
timeFrom: new Date(),
timeTo: new Date(),
};

const createNewReportDefinition = async (
metadata: reportDefinitionParams,
timeRange: timeRangeParams
metadata: ReportDefinitionParams,
timeRange: TimeRangeParams
) => {
const { httpClient } = props;
//TODO: need better handle

Check failure on line 216 in public/components/report_definitions/create/create_report_definition.tsx

View workflow job for this annotation

GitHub Actions / Lint

Expected exception block, space or tab after '//' in comment
Expand Down Expand Up @@ -329,8 +311,8 @@ export function CreateReport(props: {
edit={false}
editDefinitionId={''} // empty string since we are coming from create
reportDefinitionRequest={createReportDefinitionRequest}
httpClientProps={props['httpClient']}
timeRange={timeRange}
httpClientProps={props.httpClient}
timeRange={NewTimeRange}
showSettingsReportNameError={showSettingsReportNameError}
settingsReportNameErrorMessage={settingsReportNameErrorMessage}
showSettingsReportSourceError={showSettingsReportSourceError}
Expand Down Expand Up @@ -359,7 +341,7 @@ export function CreateReport(props: {
onClick={() =>
createNewReportDefinition(
createReportDefinitionRequest,
timeRange
NewTimeRange
)
}
id={'createNewReportDefinition'}
Expand Down
4 changes: 2 additions & 2 deletions public/components/report_definitions/delivery/delivery.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
testMessageFailureMessage,
} from './delivery_constants';
import 'react-mde/lib/styles/css/react-mde-all.css';
import { reportDefinitionParams } from '../create/create_report_definition';
import { ReportDefinitionParams } from '../create/create_report_definition';
import ReactMDE from 'react-mde';
import { converter } from '../utils';
import { getAvailableNotificationsChannels } from '../../main/main_utils';
Expand All @@ -41,7 +41,7 @@ export let includeDelivery = false;
export type ReportDeliveryProps = {
edit: boolean;
editDefinitionId: string;
reportDefinitionRequest: reportDefinitionParams;
reportDefinitionRequest: ReportDefinitionParams;
httpClientProps: any;
showDeliveryChannelError: boolean;
deliveryChannelError: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import {
import ReactMde from 'react-mde';
import 'react-mde/lib/styles/css/react-mde-all.css';
import {
reportDefinitionParams,
timeRangeParams,
ReportDefinitionParams,
TimeRangeParams,
} from '../create/create_report_definition';
import {
parseInContextUrl,
Expand All @@ -59,9 +59,9 @@ import { ReportTrigger } from '../report_trigger';
type ReportSettingProps = {
edit: boolean;
editDefinitionId: string;
reportDefinitionRequest: reportDefinitionParams;
reportDefinitionRequest: ReportDefinitionParams;
httpClientProps: any;
timeRange: timeRangeParams;
timeRange: TimeRangeParams;
showSettingsReportNameError: boolean;
settingsReportNameErrorMessage: string;
showSettingsReportSourceError: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
EuiCompressedFieldNumber,
} from '@elastic/eui';
import moment, { Moment } from 'moment';
import { reportDefinitionParams } from '../create/create_report_definition';
import { ReportDefinitionParams } from '../create/create_report_definition';
import {
SCHEDULE_RECURRING_OPTIONS,
INTERVAL_TIME_PERIODS,
Expand All @@ -36,7 +36,7 @@ import { TimezoneSelect } from './timezone';
type ReportTriggerProps = {
edit: boolean;
editDefinitionId: string;
reportDefinitionRequest: reportDefinitionParams;
reportDefinitionRequest: ReportDefinitionParams;
httpClientProps: any;
showTriggerIntervalNaNError: boolean;
showCronError: boolean;
Expand Down

0 comments on commit 4a2ed80

Please sign in to comment.