format and lint clean up

streammasterwebui/.prettierignore

@@ -4,4 +4,5 @@
 _next/
 __tmp__/
 build/
-node_modules/
+node_modules/
+dist/

streammasterwebui/components/buttons/AddButton.tsx

@@ -1,4 +1,4 @@
-import BaseButton, { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const AddButton: React.FC<ChildButtonProperties> = ({ disabled = false, iconFilled, label, onClick, tooltip = 'Add' }) => (
   <BaseButton

streammasterwebui/components/buttons/AutoSetButton.tsx

@@ -1,5 +1,4 @@
-import { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
-import BaseButton from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const AutoSetButton: React.FC<ChildButtonProperties> = ({ disabled = true, onClick, tooltip = 'Auto Set' }) => (
   <BaseButton disabled={disabled} icon="pi-sort-numeric-up-alt" onClick={onClick} tooltip={tooltip} />

streammasterwebui/components/buttons/BanButton.tsx

@@ -1,4 +1,4 @@
-import BaseButton, { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const BanButton: React.FC<ChildButtonProperties> = ({ className, disabled = false, onClick, tooltip = '' }) => (
   <BaseButton className={className} disabled={disabled} icon="pi-ban" iconFilled={false} onClick={onClick} tooltip={tooltip} />

streammasterwebui/components/buttons/BookButton.tsx

@@ -1,4 +1,4 @@
-import BaseButton, { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const BookButton: React.FC<ChildButtonProperties> = ({ disabled = false, iconFilled = true, label, onClick, tooltip = '' }) => (
   <BaseButton disabled={disabled} icon="pi-book" iconFilled={iconFilled} label={label} onClick={onClick} tooltip={tooltip} />

streammasterwebui/components/buttons/ClearButton.tsx

@@ -1,4 +1,4 @@
-import BaseButton, { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const ClearButton: React.FC<ChildButtonProperties> = ({ disabled = true, onClick, tooltip = '' }) => (
   <BaseButton disabled={disabled} icon="pi-book" onClick={onClick} tooltip={tooltip} />

streammasterwebui/components/buttons/ClockButton.tsx

@@ -1,4 +1,4 @@
-import BaseButton, { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const ClockButton: React.FC<ChildButtonProperties> = ({ disabled = false, label, onClick, tooltip = 'Time Shift', iconFilled }) => (
   <BaseButton disabled={disabled} icon="pi-stopwatch" iconFilled={iconFilled} label={label} onClick={onClick} tooltip={tooltip} />

streammasterwebui/components/buttons/DeleteButton.tsx

@@ -1,4 +1,4 @@
-import BaseButton, { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const DeleteButton: React.FC<ChildButtonProperties> = ({ disabled = false, iconFilled, label, onClick, tooltip = 'Delete Stream' }) => (
   <BaseButton

streammasterwebui/components/buttons/DownArrowButton.tsx

@@ -1,4 +1,4 @@
-import BaseButton, { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const DownArrowButton: React.FC<ChildButtonProperties> = ({ className, disabled = false, onClick, tooltip = 'Add Additional Channels' }) => (
   <BaseButton className={className} disabled={disabled} icon="pi-chevron-down" iconFilled={false} onClick={onClick} severity="success" tooltip={tooltip} />

streammasterwebui/components/buttons/EditButton.tsx

@@ -1,5 +1,4 @@
-import { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
-import BaseButton from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const EditButton: React.FC<ChildButtonProperties> = ({ disabled = false, iconFilled, label, onClick, tooltip = 'Edit' }) => (
   <BaseButton

streammasterwebui/components/buttons/ImageButton.tsx

@@ -1,4 +1,4 @@
-import BaseButton, { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const ImageButton: React.FC<ChildButtonProperties> = ({ disabled = true, iconFilled = true, onClick, tooltip = '' }) => (
   <BaseButton disabled={disabled} icon="pi-image" iconFilled={iconFilled} onClick={onClick} tooltip={tooltip} />

streammasterwebui/components/buttons/OKButton.tsx

@@ -1,5 +1,4 @@
-import { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
-import BaseButton from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const OKButton: React.FC<ChildButtonProperties> = ({ iconFilled = true, label, onClick, tooltip = '' }) => (
   <BaseButton

streammasterwebui/components/buttons/RefreshButton.tsx

@@ -1,5 +1,4 @@
-import { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
-import BaseButton from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const RefreshButton: React.FC<ChildButtonProperties> = ({ disabled = false, onClick, tooltip = '' }) => (
   <BaseButton disabled={disabled} icon="pi-sync" iconFilled={false} onClick={onClick} tooltip={tooltip} />

streammasterwebui/components/buttons/ResetButton.tsx

@@ -1,5 +1,4 @@
-import { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
-import BaseButton from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const ResetButton: React.FC<ChildButtonProperties> = ({ disabled = false, onClick, tooltip = '' }) => (
   <BaseButton disabled={disabled} icon="pi-history" iconFilled={false} onClick={onClick} tooltip={tooltip} />

streammasterwebui/components/buttons/RightArrowButton.tsx

@@ -1,5 +1,4 @@
-import { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
-import BaseButton from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const RightArrowButton: React.FC<ChildButtonProperties> = ({ disabled = false, onClick, tooltip = 'Add' }) => (
   <BaseButton disabled={disabled} icon="pi-chevron-right" iconFilled={false} onClick={onClick} severity="success" tooltip={tooltip} />

streammasterwebui/components/buttons/VisibleButton.tsx

@@ -1,4 +1,4 @@
-import BaseButton, { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const VisibleButton: React.FC<ChildButtonProperties> = ({ disabled = false, iconFilled = true, label, onClick, tooltip = 'Toggle Visibility' }) => (
   <BaseButton

streammasterwebui/components/buttons/XButton.tsx

@@ -1,4 +1,4 @@
-import BaseButton, { type ChildButtonProps as ChildButtonProperties } from './BaseButton';
+import BaseButton, { type ChildButtonProperties } from './BaseButton';
 
 const XButton: React.FC<ChildButtonProperties> = ({ disabled = false, onClick, tooltip = 'Remove', iconFilled, label }) => (
   <BaseButton disabled={disabled} icon="pi-times" iconFilled={iconFilled} label={label} onClick={onClick} severity="danger" tooltip={tooltip} />

streammasterwebui/components/dataSelector/useDataSelectorState.tsx

@@ -2,7 +2,7 @@ import { type DataTableExpandedRows, type DataTableFilterMeta, type DataTableVal
 import { useLocalStorage } from 'primereact/hooks';
 import { useState } from 'react';
 
-import { AdditionalFilterProps } from '@lib/common/common';
+import { AdditionalFilterProperties } from '@lib/common/common';
 import { VideoStreamIsReadOnly } from '@lib/iptvApi';
 import { useSelectAll } from '@lib/redux/slices/useSelectAll';
 import { useSelectedItems } from '@lib/redux/slices/useSelectedItemsSlice';
@@ -25,7 +25,7 @@ const useDataSelectorState = <T extends DataTableValue>(id: string, selectedItem
   const [dataSource, setDataSource] = useState<T[]>();
   const [first, setFirst] = useState<number>(0);
   const [page, setPage] = useState<number>(1);
-  const [additionalFilterProperties, setAdditionalFilterProperties] = useState<AdditionalFilterProps | undefined>();
+  const [additionalFilterProperties, setAdditionalFilterProperties] = useState<AdditionalFilterProperties | undefined>();
 
   const [rows, setRows] = useState<number>(25);
   const [filters, setFilters] = useState<DataTableFilterMeta>({});

streammasterwebui/components/epg/EPGFileDialog.tsx

@@ -1,6 +1,6 @@
 import { CreateEpgFileRequest, useEpgFilesCreateEpgFileMutation } from '@lib/iptvApi';
 import React, { useState } from 'react';
-import FileDialog, { type FileDialogProps as FileDialogProperties } from '../sharedEPGM3U/FileDialog';
+import FileDialog, { type FileDialogProperties } from '../sharedEPGM3U/FileDialog';
 
 const EPGFileDialog: React.FC<Partial<FileDialogProperties>> = () => {
   const [infoMessage, setInfoMessage] = useState('');

streammasterwebui/components/m3u/M3UFileDialog.tsx

@@ -1,6 +1,6 @@
 import { useM3UFilesCreateM3UFileMutation, type CreateM3UFileRequest } from '@lib/iptvApi';
 import React, { useState } from 'react';
-import FileDialog, { type FileDialogProps as FileDialogProperties } from '../sharedEPGM3U/FileDialog';
+import FileDialog, { type FileDialogProperties } from '../sharedEPGM3U/FileDialog';
 
 const M3UFileDialog: React.FC<Partial<FileDialogProperties>> = () => {
   const [infoMessage, setInfoMessage] = useState('');

streammasterwebui/components/selectors/BaseSelector.tsx

@@ -1,10 +1,10 @@
 import {
   addOrUpdateValueForField,
   doSetsContainSameIds,
-  type GetApiArg,
+  type GetApiArgument,
   type HasId,
   type SMDataTableFilterMetaData,
-  type SimpleQueryApiArg
+  type SimpleQueryApiArgument
 } from '@lib/common/common';
 import { skipToken } from '@reduxjs/toolkit/dist/query/react';
 import { Dropdown, type DropdownChangeEvent, type DropdownFilterEvent } from 'primereact/dropdown';
@@ -42,8 +42,8 @@ export interface BaseSelectorProperties<T extends HasId> {
   readonly onChange: (value: string) => void;
   readonly optionLabel: string;
   readonly optionValue: string;
-  readonly queryFilter: (option: GetApiArg | typeof skipToken) => PagedResponseDtoData<T>;
-  readonly queryHook: (option: SimpleQueryApiArg) => SimpleQueryResponse<T>;
+  readonly queryFilter: (option: GetApiArgument | typeof skipToken) => PagedResponseDtoData<T>;
+  readonly queryHook: (option: SimpleQueryApiArgument) => SimpleQueryResponse<T>;
   readonly querySelectedItem: (argument: StringArgument) => Promise<T | null>;
   readonly selectName: string;
   readonly selectedTemplate: (option: T) => JSX.Element;
@@ -58,13 +58,13 @@ const BaseSelector = <T extends HasId>(props: BaseSelectorProperties<T>) => {
   const [dataSource, setDataSource] = useState<T[]>([]);
   const [filteredDataSource, setFilteredDataSource] = useState<T[]>([]);
 
-  const [simpleQuery, setSimpleQuery] = useState<SimpleQueryApiArg>({
+  const [simpleQuery, setSimpleQuery] = useState<SimpleQueryApiArgument>({
     first: 0,
     last: 200
   });
   const query = props.queryHook(simpleQuery);
 
-  const [queryFilter, setQueryFilter] = useState<GetApiArg | undefined>();
+  const [queryFilter, setQueryFilter] = useState<GetApiArgument | undefined>();
 
   const filterQuery = props.queryFilter(queryFilter ?? skipToken);
 
@@ -218,7 +218,7 @@ const BaseSelector = <T extends HasId>(props: BaseSelectorProperties<T>) => {
     setQueryFilter({
       jsonFiltersString: JSON.stringify(toSend),
       pageSize: 40
-    } as GetApiArg);
+    } as GetApiArgument);
   };
 
   return (
@@ -256,7 +256,7 @@ const BaseSelector = <T extends HasId>(props: BaseSelectorProperties<T>) => {
               setSimpleQuery({
                 first: firstRecord,
                 last: (e.last as number) + 100
-              } as SimpleQueryApiArg);
+              } as SimpleQueryApiArgument);
             }
           },
           showLoader: true,

streammasterwebui/components/selectors/EPGSelector.tsx

@@ -1,7 +1,7 @@
 import { ProgrammeNameDto, useProgrammesGetPagedProgrammeNameSelectionsQuery, useProgrammesGetProgrammsSimpleQueryQuery } from '@lib/iptvApi';
 import { GetProgrammeFromDisplayName } from '@lib/smAPI/Programmes/ProgrammesGetAPI';
 import React, { useCallback } from 'react';
-import BaseSelector, { type BaseSelectorProps as BaseSelectorProperties } from './BaseSelector';
+import BaseSelector, { type BaseSelectorProperties } from './BaseSelector';
 
 type EPGSelectorProperties = BaseSelectorProperties<ProgrammeNameDto> & {
   enableEditMode?: boolean;

streammasterwebui/components/selectors/IconSelector.tsx

@@ -3,7 +3,7 @@ import { IconFileDto, useIconsGetIconsSimpleQueryQuery, useIconsGetPagedIconsQue
 import { GetIconFromSource } from '@lib/smAPI/Icons/IconsGetAPI';
 import useSettings from '@lib/useSettings';
 import React, { useCallback } from 'react';
-import BaseSelector, { BaseSelectorProps as BaseSelectorProperties } from './BaseSelector';
+import BaseSelector, { BaseSelectorProperties } from './BaseSelector';
 
 type IconSelectorProperties = BaseSelectorProperties<IconFileDto> & {
   enableEditMode?: boolean;

streammasterwebui/components/sharedEPGM3U/FileDialog.tsx

@@ -62,7 +62,7 @@ const FileDialog: React.FC<FileDialogProperties> = ({ fileType, infoMessage: inp
 
   const onTemplateClear = () => {
     setProgress(0);
-    setActiveFile();
+    setActiveFile(undefined);
     setNameFromFileName(false);
   };
 
@@ -143,7 +143,7 @@ const FileDialog: React.FC<FileDialogProperties> = ({ fileType, infoMessage: inp
     }
     setShowOverlay(false);
     setBlock(false);
-    setInfoMessage();
+    setInfoMessage(undefined);
     setStreamURLPrefix(0);
     setProgress(0);
     setUploadedBytes(0);
@@ -310,7 +310,7 @@ const FileDialog: React.FC<FileDialogProperties> = ({ fileType, infoMessage: inp
                     maxFileSize={300_000_000}
                     onClear={onTemplateClear}
                     onError={onTemplateClear}
-                    onRemove={() => setActiveFile()}
+                    onRemove={() => setActiveFile(undefined)}
                     onSelect={onTemplateSelect}
                     ref={fileUploadReference}
                     style={{ width: '100vw' }}

streammasterwebui/components/streamGroup/StreamGroupDeleteDialog.tsx

@@ -39,11 +39,11 @@ const StreamGroupDeleteDialog = ({ id, onHide }: StreamGroupDeleteDialogProperti
 
     await streamGroupsDeleteStreamGroupMutations(data)
       .then(() => {
-        setSelectedStreamGroup();
+        setSelectedStreamGroup(undefined);
         setInfoMessage('Stream Group Deleted Successfully');
       })
       .catch((error) => {
-        setSelectedStreamGroup();
+        setSelectedStreamGroup(undefined);
         setInfoMessage(`Stream Group Delete Error: ${error.message}`);
       });
   }, [ReturnToParent, selectedStreamGroup, setSelectedStreamGroup, streamGroupsDeleteStreamGroupMutations]);

streammasterwebui/components/videoStreamPanel/VideoStreamPanel.tsx

@@ -220,7 +220,7 @@ const VideoStreamPanel = ({ group, onEdit, onSave, videoStream }: VideoStreamPan
                           url
                         } as CreateVideoStreamRequest);
 
-                    setDataSource();
+                    setDataSource(undefined);
                   }}
                 />
               </div>

streammasterwebui/features/playListEditor/ChannelGroupVideoStreamDataSelector.tsx

@@ -64,7 +64,7 @@ const ChannelGroupVideoStreamDataSelector = ({ enableEdit: propsEnableEdit, id,
   }, [channelGroupNames, dataKey, queryAdditionalFilter, setQueryAdditionalFilter]);
 
   useEffect(() => {
-    if (propsEnableEdit! == enableEdit) {
+    if (propsEnableEdit !== enableEdit) {
       setEnableEdit(propsEnableEdit ?? true);
     }
 

streammasterwebui/lib/redux/slices/queryAdditionalFiltersSlice.ts

@@ -1,6 +1,6 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
+import { type AdditionalFilterProperties } from '../../common/common';
 import { type RootState } from '../store';
-import { type AdditionalFilterProps as AdditionalFilterProperties } from '../../common/common';
 
 interface SetQueryAdditionalFilterPayload {
   filter: AdditionalFilterProperties | null | undefined;

streammasterwebui/lib/redux/slices/queryFilterSlice.ts

@@ -1,6 +1,6 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
+import { type GetApiArgument } from '../../common/common';
 import { type RootState } from '../store';
-import { type GetApiArg as GetApiArgument } from '../../common/common';
 
 interface SetQueryFilterPayload {
   filter: GetApiArgument | undefined;

streammasterwebui/lib/redux/slices/useQueryAdditionalFilters.ts

@@ -1,6 +1,6 @@
 import { useDispatch, useSelector } from 'react-redux';
+import { type AdditionalFilterProperties } from '../../common/common';
 import { type AppDispatch, type RootState } from '../store';
-import { type AdditionalFilterProps as AdditionalFilterProperties } from '../../common/common';
 import { setQueryAdditionalFilter as setQueryAdditionalFilterInternal } from './queryAdditionalFiltersSlice';
 
 export const useQueryAdditionalFilters = (typename: string) => {

streammasterwebui/lib/redux/slices/useQueryFilter.ts

@@ -1,6 +1,6 @@
 import { useDispatch, useSelector } from 'react-redux';
+import { type GetApiArgument } from '../../common/common';
 import { type AppDispatch, type RootState } from '../store';
-import { type GetApiArg as GetApiArgument } from '../../common/common';
 import { setQueryFilterInternal } from './queryFilterSlice';
 
 export const useQueryFilter = (typename: string) => {

streammasterwebui/lib/smAPI/Icons/IconsGetAPI.tsx

@@ -1,11 +1,11 @@
 /* eslint unused-imports/no-unused-imports-ts: off */
 /* eslint @typescript-eslint/no-unused-vars: off */
-import { type StringArg } from '@components/selectors/BaseSelector';
+import { type StringArgument } from '@components/selectors/BaseSelector';
 import type * as iptv from '@lib/iptvApi';
 import { invokeHubConnection } from '@lib/signalr/signalr';
 
 export const GetIcon = async (argument: iptv.IconFileDto): Promise<iptv.IconFileDto | null> => invokeHubConnection<iptv.IconFileDto>('GetIcon', argument);
-export const GetIconFromSource = async (argument: StringArg): Promise<iptv.IconFileDto | null> =>
+export const GetIconFromSource = async (argument: StringArgument): Promise<iptv.IconFileDto | null> =>
   invokeHubConnection<iptv.IconFileDto>('GetIconFromSource', argument);
 export const GetPagedIcons = async (argument: iptv.PagedResponseOfIconFileDto): Promise<iptv.IconFileDto[] | null> =>
   invokeHubConnection<iptv.IconFileDto[]>('GetPagedIcons', argument);

streammasterwebui/lib/smAPI/SchedulesDirect/SchedulesDirectGetAPI.tsx

@@ -12,7 +12,6 @@ export const GetLineupPreviews = async (argument: iptv.LineUpPreview[]): Promise
   invokeHubConnection<iptv.LineUpPreview[]>('GetLineupPreviews', argument);
 export const GetLineups = async (argument: iptv.LineUpsResult): Promise<iptv.LineUpsResult | null> =>
   invokeHubConnection<iptv.LineUpsResult>('GetLineups', argument);
-export const GetSDPrograms = async (argument: SdProgram): Promise<iptv.SDProgram[] | null> => invokeHubConnection<iptv.SDProgram[]>('GetSDPrograms', argument);
 export const GetSchedules = async (argument: iptv.Schedule[]): Promise<iptv.Schedule[] | null> =>
   invokeHubConnection<iptv.Schedule[]>('GetSchedules', argument);
 export const GetSelectedStationIds = async (argument: iptv.StationIdLineUp[]): Promise<iptv.StationIdLineUp[] | null> =>

streammasterwebui/package.json

@@ -62,15 +62,14 @@
     "build": "vite build",
     "preview": "vite preview",
     "builddev": "npm run build && cp -r dist/* ..StreamMasterAPI\\bin\\Debug\\net7.0\\wwwroot -force",
-    "build:check": "npm run foramt && npm run format:check && npm run type:check && npm run security:check",
-    "security:check": "npm audit --production --audit-level high",
-    "format": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
-    "format:check": "prettier --check \"{components,pages,service,api-generator}/**/*.{js,ts,tsx,d.ts}\"",
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+    "build:check": "npm run prettier:check && npm run lint && npm run type:check && npm run security:check",
+    "security:check": "npm audit --omit=dev --audit-level high",
+    "lint": "eslint --ignore-path .estlintignore . --ext .js,.jsx,.ts,.tsx",
     "type:check": "tsc",
-    "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
+    "lint:fix": "eslint --ignore-path .estlintignore . --ext .js,.jsx,.ts,.tsx --fix",
     "buildapi": "npx @rtk-query/codegen-openapi openapi-config.ts",
     "prettier": "npx prettier --write .",
+    "prettier:check": "prettier --check \"{components,pages,service,api-generator}/**/*.{js,ts,tsx,d.ts}\"",
     "test": "vitest run",
     "watch": "vitest watch",
     "coverage": "vitest run --coverage",