Skip to content

Commit

Permalink
Remove remaining context usage
Browse files Browse the repository at this point in the history
  • Loading branch information
Drulikar committed May 17, 2024
1 parent 45b9453 commit 30ed9a6
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 62 deletions.
20 changes: 9 additions & 11 deletions tgui/docs/tutorial-and-examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,7 @@ recommend getting yourself introduced to

A React component is not a regular HTML template. A component is a
javascript function, which accepts a `props` object (that contains
properties passed to a component) and a `context` object (which is
necessary to access UI data) as arguments, and outputs an HTML-like
structure.
properties passed to a component), and outputs an HTML-like structure.

So let's create our first React Component. Create a file with a name
`SampleInterface.js` (or any other name you want), and copy this code
Expand All @@ -127,8 +125,8 @@ import { useBackend } from '../backend';
import { Button, LabeledList, Section } from '../components';
import { Window } from '../layouts';

export const SampleInterface = (props, context) => {
const { act, data } = useBackend(context);
export const SampleInterface = (props) => {
const { act, data } = useBackend();
// Extract `health` and `color` variables from the `data` object.
const {
health,
Expand Down Expand Up @@ -158,7 +156,7 @@ export const SampleInterface = (props, context) => {
};
```

Here are the key variables you get from a `useBackend(context)` function:
Here are the key variables you get from a `useBackend()` function:

- `config` is part of core tgui. It contains meta-information about the
interface and who uses it, BYOND refs to various objects, and so forth.
Expand Down Expand Up @@ -259,7 +257,7 @@ import { useBackend } from '../backend';
import { Button, LabeledList, Section } from '../components';
import { Window } from '../layouts';

export const SampleInterface = (props, context) => {
export const SampleInterface = (props) => {
return (
<Window resizable>
<Window.Content scrollable>
Expand All @@ -269,8 +267,8 @@ export const SampleInterface = (props, context) => {
);
};

const HealthStatus = (props, context) => {
const { act, data } = useBackend(context);
const HealthStatus = (props) => {
const { act, data } = useBackend();
const {
user,
} = props;
Expand Down Expand Up @@ -330,8 +328,8 @@ import { useBackend } from '../backend';
import { Button, LabeledList, Section } from '../components';
import { Window } from '../layouts';

export const SampleInterface = (props, context) => {
const { act, data } = useBackend(context);
export const SampleInterface = (props) => {
const { act, data } = useBackend();
// Extract `health` and `color` variables from the `data` object.
const {
health,
Expand Down
80 changes: 40 additions & 40 deletions tgui/packages/tgui/interfaces/AresAdmin.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ const PAGES = {
maintenance_management: () => MaintManagement,
};

export const AresAdmin = (props, context) => {
const { data } = useBackend(context);
export const AresAdmin = (props) => {
const { data } = useBackend();
const { current_menu, sudo } = data;
const PageComponent = PAGES[current_menu]();

Expand All @@ -48,8 +48,8 @@ export const AresAdmin = (props, context) => {
);
};

const Login = (props, context) => {
const { act } = useBackend(context);
const Login = (props) => {
const { act } = useBackend();

return (
<Flex
Expand Down Expand Up @@ -84,8 +84,8 @@ const Login = (props, context) => {
);
};

const MainMenu = (props, context) => {
const { data, act } = useBackend(context);
const MainMenu = (props) => {
const { data, act } = useBackend();
const { logged_in, access_text, last_page, current_menu, sudo, admin_login } =
data;

Expand Down Expand Up @@ -448,8 +448,8 @@ const MainMenu = (props, context) => {
);
};

const AnnouncementLogs = (props, context) => {
const { data, act } = useBackend(context);
const AnnouncementLogs = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -547,8 +547,8 @@ const AnnouncementLogs = (props, context) => {
);
};

const BioscanLogs = (props, context) => {
const { data, act } = useBackend(context);
const BioscanLogs = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -646,8 +646,8 @@ const BioscanLogs = (props, context) => {
);
};

const BombardmentLogs = (props, context) => {
const { data, act } = useBackend(context);
const BombardmentLogs = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -749,8 +749,8 @@ const BombardmentLogs = (props, context) => {
);
};

const ApolloLog = (props, context) => {
const { data, act } = useBackend(context);
const ApolloLog = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -815,8 +815,8 @@ const ApolloLog = (props, context) => {
);
};

const AccessLogs = (props, context) => {
const { data, act } = useBackend(context);
const AccessLogs = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -881,8 +881,8 @@ const AccessLogs = (props, context) => {
);
};

const DeletionLogs = (props, context) => {
const { data, act } = useBackend(context);
const DeletionLogs = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -977,8 +977,8 @@ const DeletionLogs = (props, context) => {
);
};

const ARESTalk = (props, context) => {
const { data, act } = useBackend(context);
const ARESTalk = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -1102,8 +1102,8 @@ const ARESTalk = (props, context) => {
);
};

const DeletedTalks = (props, context) => {
const { data, act } = useBackend(context);
const DeletedTalks = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -1197,8 +1197,8 @@ const DeletedTalks = (props, context) => {
);
};

const ReadingTalks = (props, context) => {
const { data, act } = useBackend(context);
const ReadingTalks = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -1262,8 +1262,8 @@ const ReadingTalks = (props, context) => {
);
};

const Requisitions = (props, context) => {
const { data, act } = useBackend(context);
const Requisitions = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -1359,8 +1359,8 @@ const Requisitions = (props, context) => {
);
};

const FlightLogs = (props, context) => {
const { data, act } = useBackend(context);
const FlightLogs = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -1458,8 +1458,8 @@ const FlightLogs = (props, context) => {
);
};

const Security = (props, context) => {
const { data, act } = useBackend(context);
const Security = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -1556,8 +1556,8 @@ const Security = (props, context) => {
);
};

const Emergency = (props, context) => {
const { data, act } = useBackend(context);
const Emergency = (props) => {
const { data, act } = useBackend();
const { logged_in, access_text, last_page, current_menu, admin_login } = data;

return (
Expand Down Expand Up @@ -1663,8 +1663,8 @@ const Emergency = (props, context) => {
);
};

const TechLogs = (props, context) => {
const { data, act } = useBackend(context);
const TechLogs = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -1861,8 +1861,8 @@ const CoreSec = (props) => {
// Anything below this line is exclusive to the Admin Remote Interface.
// -------------------------------------------------------------------- //

const AdminAccessLogs = (props, context) => {
const { data, act } = useBackend(context);
const AdminAccessLogs = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down Expand Up @@ -1923,8 +1923,8 @@ const AdminAccessLogs = (props, context) => {
);
};

const AccessManagement = (props, context) => {
const { data, act } = useBackend(context);
const AccessManagement = (props) => {
const { data, act } = useBackend();
const { last_page, current_menu, access_tickets, admin_login } = data;

return (
Expand Down Expand Up @@ -2070,8 +2070,8 @@ const AccessManagement = (props, context) => {
);
};

const MaintManagement = (props, context) => {
const { data, act } = useBackend(context);
const MaintManagement = (props) => {
const { data, act } = useBackend();
const { last_page, current_menu, maintenance_tickets, admin_login } = data;

return (
Expand Down
4 changes: 2 additions & 2 deletions tgui/packages/tgui/interfaces/AresInterface.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -1645,8 +1645,8 @@ const Emergency = (props) => {
);
};

const TechLogs = (props, context) => {
const { data, act } = useBackend(context);
const TechLogs = (props) => {
const { data, act } = useBackend();
const {
logged_in,
access_text,
Expand Down
4 changes: 2 additions & 2 deletions tgui/packages/tgui/interfaces/PartFabricator.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export const PartFabricator = (props) => {
);
};

const GeneralPanel = (props, context) => {
const { act, data } = useBackend(context);
const GeneralPanel = (props) => {
const { act, data } = useBackend();
const { points, omnisentrygun_price, Equipment, Ammo } = data;
return (
<div>
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/StripMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ const StripContent = (props: { readonly item: StripMenuItem }) => {
return <> </>;
};

export const StripMenu = (props, context) => {
export const StripMenu = (props) => {
const { act, data } = useBackend<StripMenuData>();

const gridSpots = new Map<GridSpotKey, string>();
Expand Down
12 changes: 6 additions & 6 deletions tgui/packages/tgui/interfaces/WhitelistPanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const PAGES = {
Update: () => StatusUpdate,
};

export const WhitelistPanel = (props, context) => {
const { data } = useBackend(context);
export const WhitelistPanel = (props) => {
const { data } = useBackend();
const { current_menu } = data;
const PageComponent = PAGES[current_menu]();

Expand All @@ -21,8 +21,8 @@ export const WhitelistPanel = (props, context) => {
);
};

const PlayerList = (props, context) => {
const { data, act } = useBackend(context);
const PlayerList = (props) => {
const { data, act } = useBackend();
const { whitelisted_players } = data;

return (
Expand Down Expand Up @@ -87,8 +87,8 @@ const PlayerList = (props, context) => {
);
};

const StatusUpdate = (props, context) => {
const { act, data } = useBackend(context);
const StatusUpdate = (props) => {
const { act, data } = useBackend();
const {
co_flags,
syn_flags,
Expand Down

0 comments on commit 30ed9a6

Please sign in to comment.