refactor(striker-ui): rename PeriodicFetch to camel case

main
Tsu-ba-me 3 years ago
parent 8468344d3f
commit b9b1fb3ecc
  1. 4
      striker-ui/components/Anvils/index.tsx
  2. 4
      striker-ui/components/CPU.tsx
  3. 4
      striker-ui/components/FileSystem/FileSystems.tsx
  4. 4
      striker-ui/components/Hosts/index.tsx
  5. 4
      striker-ui/components/Memory.tsx
  6. 4
      striker-ui/components/Network/Network.tsx
  7. 4
      striker-ui/components/Servers.tsx
  8. 4
      striker-ui/components/SharedStorage/SharedStorage.tsx
  9. 4
      striker-ui/components/Storage.tsx
  10. 10
      striker-ui/lib/fetchers/periodicFetch.ts
  11. 4
      striker-ui/pages/index.tsx

@ -1,5 +1,5 @@
import { Panel } from '../Panels'; import { Panel } from '../Panels';
import PeriodicFetch from '../../lib/fetchers/periodicFetch'; import periodicFetch from '../../lib/fetchers/periodicFetch';
import SelectedAnvil from './SelectedAnvil'; import SelectedAnvil from './SelectedAnvil';
import AnvilList from './AnvilList'; import AnvilList from './AnvilList';
@ -9,7 +9,7 @@ const Anvils = ({ list }: { list: AnvilList | undefined }): JSX.Element => {
const anvils: AnvilListItem[] = []; const anvils: AnvilListItem[] = [];
list?.anvils.forEach((anvil: AnvilListItem) => { list?.anvils.forEach((anvil: AnvilListItem) => {
const { data } = PeriodicFetch<AnvilStatus>( const { data } = periodicFetch<AnvilStatus>(
`${process.env.NEXT_PUBLIC_API_URL}/get_status?anvil_uuid=${anvil.anvil_uuid}`, `${process.env.NEXT_PUBLIC_API_URL}/get_status?anvil_uuid=${anvil.anvil_uuid}`,
); );
anvils.push({ anvils.push({

@ -2,14 +2,14 @@ import { useContext } from 'react';
import { Box } from '@mui/material'; import { Box } from '@mui/material';
import { Panel } from './Panels'; import { Panel } from './Panels';
import { HeaderText, BodyText } from './Text'; import { HeaderText, BodyText } from './Text';
import PeriodicFetch from '../lib/fetchers/periodicFetch'; import periodicFetch from '../lib/fetchers/periodicFetch';
import { AnvilContext } from './AnvilContext'; import { AnvilContext } from './AnvilContext';
import Spinner from './Spinner'; import Spinner from './Spinner';
const CPU = (): JSX.Element => { const CPU = (): JSX.Element => {
const { uuid } = useContext(AnvilContext); const { uuid } = useContext(AnvilContext);
const { data, isLoading } = PeriodicFetch<AnvilCPU>( const { data, isLoading } = periodicFetch<AnvilCPU>(
`${process.env.NEXT_PUBLIC_API_URL}/get_cpu?anvil_uuid=${uuid}`, `${process.env.NEXT_PUBLIC_API_URL}/get_cpu?anvil_uuid=${uuid}`,
); );

@ -5,7 +5,7 @@ import { styled } from '@mui/material/styles';
import { BodyText, HeaderText } from '../Text'; import { BodyText, HeaderText } from '../Text';
import { Panel, InnerPanel, InnerPanelHeader } from '../Panels'; import { Panel, InnerPanel, InnerPanelHeader } from '../Panels';
import SharedStorageHost from './FileSystemsHost'; import SharedStorageHost from './FileSystemsHost';
import PeriodicFetch from '../../lib/fetchers/periodicFetch'; import periodicFetch from '../../lib/fetchers/periodicFetch';
import { AnvilContext } from '../AnvilContext'; import { AnvilContext } from '../AnvilContext';
import Spinner from '../Spinner'; import Spinner from '../Spinner';
import { LARGE_MOBILE_BREAKPOINT } from '../../lib/consts/DEFAULT_THEME'; import { LARGE_MOBILE_BREAKPOINT } from '../../lib/consts/DEFAULT_THEME';
@ -35,7 +35,7 @@ const StyledDiv = styled('div')(({ theme }) => ({
const SharedStorage = ({ anvil }: { anvil: AnvilListItem[] }): JSX.Element => { const SharedStorage = ({ anvil }: { anvil: AnvilListItem[] }): JSX.Element => {
const { uuid } = useContext(AnvilContext); const { uuid } = useContext(AnvilContext);
const { data, isLoading } = PeriodicFetch<AnvilSharedStorage>( const { data, isLoading } = periodicFetch<AnvilSharedStorage>(
`${process.env.NEXT_PUBLIC_API_URL}/get_shared_storage?anvil_uuid=${uuid}`, `${process.env.NEXT_PUBLIC_API_URL}/get_shared_storage?anvil_uuid=${uuid}`,
); );
return ( return (

@ -2,7 +2,7 @@ import { useContext } from 'react';
import { Panel } from '../Panels'; import { Panel } from '../Panels';
import { HeaderText } from '../Text'; import { HeaderText } from '../Text';
import AnvilHost from './AnvilHost'; import AnvilHost from './AnvilHost';
import PeriodicFetch from '../../lib/fetchers/periodicFetch'; import periodicFetch from '../../lib/fetchers/periodicFetch';
import { AnvilContext } from '../AnvilContext'; import { AnvilContext } from '../AnvilContext';
import Spinner from '../Spinner'; import Spinner from '../Spinner';
import hostsSanitizer from '../../lib/sanitizers/hostsSanitizer'; import hostsSanitizer from '../../lib/sanitizers/hostsSanitizer';
@ -10,7 +10,7 @@ import hostsSanitizer from '../../lib/sanitizers/hostsSanitizer';
const Hosts = ({ anvil }: { anvil: AnvilListItem[] }): JSX.Element => { const Hosts = ({ anvil }: { anvil: AnvilListItem[] }): JSX.Element => {
const { uuid } = useContext(AnvilContext); const { uuid } = useContext(AnvilContext);
const { data, isLoading } = PeriodicFetch<AnvilStatus>( const { data, isLoading } = periodicFetch<AnvilStatus>(
`${process.env.NEXT_PUBLIC_API_URL}/get_status?anvil_uuid=${uuid}`, `${process.env.NEXT_PUBLIC_API_URL}/get_status?anvil_uuid=${uuid}`,
); );

@ -4,13 +4,13 @@ import * as prettyBytes from 'pretty-bytes';
import { Panel } from './Panels'; import { Panel } from './Panels';
import { AllocationBar } from './Bars'; import { AllocationBar } from './Bars';
import { HeaderText, BodyText } from './Text'; import { HeaderText, BodyText } from './Text';
import PeriodicFetch from '../lib/fetchers/periodicFetch'; import periodicFetch from '../lib/fetchers/periodicFetch';
import { AnvilContext } from './AnvilContext'; import { AnvilContext } from './AnvilContext';
import Spinner from './Spinner'; import Spinner from './Spinner';
const Memory = (): JSX.Element => { const Memory = (): JSX.Element => {
const { uuid } = useContext(AnvilContext); const { uuid } = useContext(AnvilContext);
const { data, isLoading } = PeriodicFetch<AnvilMemory>( const { data, isLoading } = periodicFetch<AnvilMemory>(
`${process.env.NEXT_PUBLIC_API_URL}/get_memory?anvil_uuid=${uuid}`, `${process.env.NEXT_PUBLIC_API_URL}/get_memory?anvil_uuid=${uuid}`,
); );

@ -3,7 +3,7 @@ import { Box, Divider } from '@mui/material';
import { styled } from '@mui/material/styles'; import { styled } from '@mui/material/styles';
import { Panel } from '../Panels'; import { Panel } from '../Panels';
import { HeaderText, BodyText } from '../Text'; import { HeaderText, BodyText } from '../Text';
import PeriodicFetch from '../../lib/fetchers/periodicFetch'; import periodicFetch from '../../lib/fetchers/periodicFetch';
import { import {
DIVIDER, DIVIDER,
LARGE_MOBILE_BREAKPOINT, LARGE_MOBILE_BREAKPOINT,
@ -69,7 +69,7 @@ const selectDecorator = (state: string): Colours => {
const Network = (): JSX.Element => { const Network = (): JSX.Element => {
const { uuid } = useContext(AnvilContext); const { uuid } = useContext(AnvilContext);
const { data, isLoading } = PeriodicFetch<AnvilNetwork>( const { data, isLoading } = periodicFetch<AnvilNetwork>(
`${process.env.NEXT_PUBLIC_API_URL}/get_networks?anvil_uuid=${uuid}`, `${process.env.NEXT_PUBLIC_API_URL}/get_networks?anvil_uuid=${uuid}`,
); );

@ -38,7 +38,7 @@ import Spinner from './Spinner';
import { BodyText, HeaderText } from './Text'; import { BodyText, HeaderText } from './Text';
import hostsSanitizer from '../lib/sanitizers/hostsSanitizer'; import hostsSanitizer from '../lib/sanitizers/hostsSanitizer';
import PeriodicFetch from '../lib/fetchers/periodicFetch'; import periodicFetch from '../lib/fetchers/periodicFetch';
import putFetch from '../lib/fetchers/putFetch'; import putFetch from '../lib/fetchers/putFetch';
const PREFIX = 'Servers'; const PREFIX = 'Servers';
@ -177,7 +177,7 @@ const Servers = ({ anvil }: { anvil: AnvilListItem[] }): JSX.Element => {
const buttonLabels = useRef<ButtonLabels[]>([]); const buttonLabels = useRef<ButtonLabels[]>([]);
const { data, isLoading } = PeriodicFetch<AnvilServers>( const { data, isLoading } = periodicFetch<AnvilServers>(
`${process.env.NEXT_PUBLIC_API_URL}/get_servers?anvil_uuid=${uuid}`, `${process.env.NEXT_PUBLIC_API_URL}/get_servers?anvil_uuid=${uuid}`,
); );

@ -5,7 +5,7 @@ import { styled } from '@mui/material/styles';
import { BodyText, HeaderText } from '../Text'; import { BodyText, HeaderText } from '../Text';
import { Panel, InnerPanel, InnerPanelHeader } from '../Panels'; import { Panel, InnerPanel, InnerPanelHeader } from '../Panels';
import SharedStorageHost from './SharedStorageHost'; import SharedStorageHost from './SharedStorageHost';
import PeriodicFetch from '../../lib/fetchers/periodicFetch'; import periodicFetch from '../../lib/fetchers/periodicFetch';
import { AnvilContext } from '../AnvilContext'; import { AnvilContext } from '../AnvilContext';
import Spinner from '../Spinner'; import Spinner from '../Spinner';
import { LARGE_MOBILE_BREAKPOINT } from '../../lib/consts/DEFAULT_THEME'; import { LARGE_MOBILE_BREAKPOINT } from '../../lib/consts/DEFAULT_THEME';
@ -36,7 +36,7 @@ const StyledDiv = styled('div')(({ theme }) => ({
const SharedStorage = (): JSX.Element => { const SharedStorage = (): JSX.Element => {
const { uuid } = useContext(AnvilContext); const { uuid } = useContext(AnvilContext);
const { data, isLoading } = PeriodicFetch<AnvilSharedStorage>( const { data, isLoading } = periodicFetch<AnvilSharedStorage>(
`${process.env.NEXT_PUBLIC_API_URL}/get_shared_storage?anvil_uuid=${uuid}`, `${process.env.NEXT_PUBLIC_API_URL}/get_shared_storage?anvil_uuid=${uuid}`,
); );
return ( return (

@ -3,10 +3,10 @@ import * as prettyBytes from 'pretty-bytes';
import { Panel } from './Panels'; import { Panel } from './Panels';
import { AllocationBar } from './Bars'; import { AllocationBar } from './Bars';
import { HeaderText, BodyText } from './Text'; import { HeaderText, BodyText } from './Text';
import PeriodicFetch from '../lib/fetchers/periodicFetch'; import periodicFetch from '../lib/fetchers/periodicFetch';
const Storage = ({ uuid }: { uuid: string }): JSX.Element => { const Storage = ({ uuid }: { uuid: string }): JSX.Element => {
const { data, isLoading } = PeriodicFetch<AnvilMemory>( const { data, isLoading } = periodicFetch<AnvilMemory>(
`${process.env.NEXT_PUBLIC_API_URL}/get_memory?anvil_uuid=${uuid}`, `${process.env.NEXT_PUBLIC_API_URL}/get_memory?anvil_uuid=${uuid}`,
); );

@ -1,13 +1,19 @@
import useSWR from 'swr'; import useSWR from 'swr';
import fetcher from './fetchJSON'; import fetcher from './fetchJSON';
const PeriodicFetch = <T>( const periodicFetch = <T>(
url: string, url: string,
refreshInterval = 5000, refreshInterval = 5000,
): GetResponses => { ): GetResponses => {
// The purpose of react-hooks/rules-of-hooks is to ensure that react hooks
// are called in order (i.e., not potentially skipped due to conditionals).
// We can safely disable this rule as this function is simply a wrapper.
// eslint-disable-next-line react-hooks/rules-of-hooks
const { data, error } = useSWR<T>(url, fetcher, { const { data, error } = useSWR<T>(url, fetcher, {
refreshInterval, refreshInterval,
}); });
return { return {
data, data,
isLoading: !error && !data, isLoading: !error && !data,
@ -15,4 +21,4 @@ const PeriodicFetch = <T>(
}; };
}; };
export default PeriodicFetch; export default periodicFetch;

@ -8,7 +8,7 @@ import CPU from '../components/CPU';
import SharedStorage from '../components/SharedStorage'; import SharedStorage from '../components/SharedStorage';
import Memory from '../components/Memory'; import Memory from '../components/Memory';
import Network from '../components/Network'; import Network from '../components/Network';
import PeriodicFetch from '../lib/fetchers/periodicFetch'; import periodicFetch from '../lib/fetchers/periodicFetch';
import Servers from '../components/Servers'; import Servers from '../components/Servers';
import Header from '../components/Header'; import Header from '../components/Header';
import AnvilProvider from '../components/AnvilContext'; import AnvilProvider from '../components/AnvilContext';
@ -57,7 +57,7 @@ const StyledDiv = styled('div')(({ theme }) => ({
const Dashboard = (): JSX.Element => { const Dashboard = (): JSX.Element => {
const width = useWindowDimensions(); const width = useWindowDimensions();
const { data } = PeriodicFetch<AnvilList>( const { data } = periodicFetch<AnvilList>(
`${process.env.NEXT_PUBLIC_API_URL}/get_anvils`, `${process.env.NEXT_PUBLIC_API_URL}/get_anvils`,
); );

Loading…
Cancel
Save