Skip to content

Rename every API method! #1037

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.

Sign up for GitHub

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

Merged
david-crespo merged 1 commit into from
Jul 7, 2022
Merged

Rename every API method! #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion OMICRON_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e5704d7f343fa0633751527dedf276409647ad4e
adf3786058ac774261b16b87363b82d662ded0bb
2 changes: 1 addition & 1 deletion app/components/ProjectSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const BrandIcon = () => (
export const ProjectSelector = () => {
const { orgName, projectName } = useParams('orgName')

const { data } = useApiQuery('organizationProjectsGet', { orgName, limit: 20 })
const { data } = useApiQuery('projectList', { orgName, limit: 20 })

// filter out current project if there is one. if there isn't one, it'll be
// undefined and it won't match any
Expand Down
2 changes: 1 addition & 1 deletion app/components/form/fields/SubnetListbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function SubnetListbox({ vpcNameField, vpcs, ...fieldProps }: SubnetListb
// TODO: error handling other than fallback to empty list?
const subnets =
useApiQuery(
'vpcSubnetsGet',
'vpcSubnetList',
{ ...pathParams, vpcName, limit: 50 },
{
enabled: vpcExists,
Expand Down
6 changes: 3 additions & 3 deletions app/forms/disk-attach.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ export function AttachDiskSideModalForm({
const queryClient = useApiQueryClient()
const pathParams = useParams('orgName', 'projectName')

const attachDisk = useApiMutation('instanceDisksAttach', {
const attachDisk = useApiMutation('instanceDiskAttach', {
onSuccess(data) {
const { instanceName, ...others } = pathParams
invariant(instanceName, 'instanceName is required')
queryClient.invalidateQueries('instanceDisksGet', {
queryClient.invalidateQueries('instanceDiskList', {
instanceName,
...others,
})
Expand All @@ -41,7 +41,7 @@ export function AttachDiskSideModalForm({
// click in
// TODO: error handling
const detachedDisks =
useApiQuery('projectDisksGet', { ...pathParams, limit: 50 }).data?.items.filter(
useApiQuery('diskList', { ...pathParams, limit: 50 }).data?.items.filter(
(d) => d.state.state === 'detached'
) || []

Expand Down
4 changes: 2 additions & 2 deletions app/forms/disk-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ export function CreateDiskSideModalForm({
const pathParams = useParams('orgName', 'projectName')
const addToast = useToast()

const createDisk = useApiMutation('projectDisksPost', {
const createDisk = useApiMutation('diskCreate', {
onSuccess(data) {
queryClient.invalidateQueries('projectDisksGet', pathParams)
queryClient.invalidateQueries('diskList', pathParams)
addToast({
icon: <Success16Icon />,
title: 'Success!',
Expand Down
4 changes: 2 additions & 2 deletions app/forms/firewall-rules-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,9 +419,9 @@ export function CreateFirewallRuleSideModalForm({
const parentNames = useParams('orgName', 'projectName', 'vpcName')
const queryClient = useApiQueryClient()

const updateRules = useApiMutation('vpcFirewallRulesPut', {
const updateRules = useApiMutation('vpcFirewallRulesUpdate', {
onSuccess(data) {
queryClient.invalidateQueries('vpcFirewallRulesGet', parentNames)
queryClient.invalidateQueries('vpcFirewallRulesView', parentNames)
onSuccess?.(data)
onDismiss()
},
Expand Down
4 changes: 2 additions & 2 deletions app/forms/firewall-rules-edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ export function EditFirewallRuleForm({
const parentNames = useParams('orgName', 'projectName', 'vpcName')
const queryClient = useApiQueryClient()

const updateRules = useApiMutation('vpcFirewallRulesPut', {
const updateRules = useApiMutation('vpcFirewallRulesUpdate', {
onSuccess(data) {
queryClient.invalidateQueries('vpcFirewallRulesGet', parentNames)
queryClient.invalidateQueries('vpcFirewallRulesView', parentNames)
onSuccess?.(data)
onDismiss()
},
Expand Down
10 changes: 5 additions & 5 deletions app/forms/instance-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ export default function CreateInstanceForm({
const addToast = useToast()
const pageParams = useParams('orgName', 'projectName')

const createDisk = useApiMutation('projectDisksPost')
const createDisk = useApiMutation('diskCreate')

const createInstance = useApiMutation('projectInstancesPost', {
const createInstance = useApiMutation('instanceCreate', {
onSuccess(instance) {
// refetch list of instances
queryClient.invalidateQueries('projectInstancesGet', pageParams)
queryClient.invalidateQueries('instanceList', pageParams)
// avoid the instance fetch when the instance page loads since we have the data
queryClient.setQueryData(
'projectInstancesGetInstance',
'instanceView',
{ ...pageParams, instanceName: instance.name },
instance
)
Expand All @@ -109,7 +109,7 @@ export default function CreateInstanceForm({
onError,
})

const images = useApiQuery('imagesGet', {}).data?.items || []
const images = useApiQuery('imageGlobalList', {}).data?.items || []

initialValues.globalImage = images[0]?.id || ''

Expand Down
6 changes: 3 additions & 3 deletions app/forms/network-interface-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ export default function CreateNetworkInterfaceSideModalForm({
const queryClient = useApiQueryClient()
const pathParams = useParams('orgName', 'projectName')

const createNetworkInterface = useApiMutation('instanceNetworkInterfacesPost', {
const createNetworkInterface = useApiMutation('instanceNetworkInterfaceCreate', {
onSuccess(data) {
const { instanceName, ...others } = pathParams
invariant(instanceName, 'instanceName is required when posting a network interface')
queryClient.invalidateQueries('instanceNetworkInterfacesGet', {
queryClient.invalidateQueries('instanceNetworkInterfaceList', {
instanceName,
...others,
})
Expand All @@ -51,7 +51,7 @@ export default function CreateNetworkInterfaceSideModalForm({
onError,
})

const vpcs = useApiQuery('projectVpcsGet', { ...pathParams, limit: 50 }).data?.items || []
const vpcs = useApiQuery('vpcList', { ...pathParams, limit: 50 }).data?.items || []

return (
<SideModalForm
Expand Down
4 changes: 2 additions & 2 deletions app/forms/network-interface-edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ export default function EditNetworkInterfaceSideModalForm({
const queryClient = useApiQueryClient()
const pathParams = useParams('orgName', 'projectName')

const editNetworkInterface = useApiMutation('instanceNetworkInterfacesPutInterface', {
const editNetworkInterface = useApiMutation('instanceNetworkInterfaceUpdate', {
onSuccess(data) {
const { instanceName, ...others } = pathParams
invariant(instanceName, 'instanceName is required when posting a network interface')
queryClient.invalidateQueries('instanceNetworkInterfacesGet', {
queryClient.invalidateQueries('instanceNetworkInterfaceList', {
instanceName,
...others,
})
Expand Down
8 changes: 4 additions & 4 deletions app/forms/org-access.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ export function OrgAccessAddUserSideModal({
const userItems = users.map((u) => ({ value: u.id, label: u.displayName }))

const queryClient = useApiQueryClient()
const updatePolicy = useApiMutation('organizationPutPolicy', {
const updatePolicy = useApiMutation('organizationPolicyUpdate', {
onSuccess: (data) => {
queryClient.invalidateQueries('organizationGetPolicy', orgParams)
queryClient.invalidateQueries('organizationPolicyView', orgParams)
onSuccess?.(data)
onDismiss()
},
Expand Down Expand Up @@ -103,9 +103,9 @@ export function OrgAccessEditUserSideModal({
const orgParams = useParams('orgName')

const queryClient = useApiQueryClient()
const updatePolicy = useApiMutation('organizationPutPolicy', {
const updatePolicy = useApiMutation('organizationPolicyUpdate', {
onSuccess: (data) => {
queryClient.invalidateQueries('organizationGetPolicy', orgParams)
queryClient.invalidateQueries('organizationPolicyView', orgParams)
onSuccess?.(data)
onDismiss()
},
Expand Down
6 changes: 3 additions & 3 deletions app/forms/org-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ export function CreateOrgSideModalForm({
const queryClient = useApiQueryClient()
const addToast = useToast()

const createOrg = useApiMutation('organizationsPost', {
const createOrg = useApiMutation('organizationCreate', {
onSuccess(org) {
queryClient.invalidateQueries('organizationsGet', {})
queryClient.invalidateQueries('organizationList', {})
// avoid the org fetch when the org page loads since we have the data
queryClient.setQueryData('organizationsGetOrganization', { orgName: org.name }, org)
queryClient.setQueryData('organizationView', { orgName: org.name }, org)
addToast({
icon: <Success16Icon />,
title: 'Success!',
Expand Down
6 changes: 3 additions & 3 deletions app/forms/org-edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ export function EditOrgSideModalForm({
const queryClient = useApiQueryClient()
const addToast = useToast()

const updateOrg = useApiMutation('organizationsPutOrganization', {
const updateOrg = useApiMutation('organizationUpdate', {
onSuccess(org) {
queryClient.invalidateQueries('organizationsGet', {})
queryClient.invalidateQueries('organizationList', {})
// avoid the org fetch when the org page loads since we have the data
queryClient.setQueryData('organizationsGetOrganization', { orgName: org.name }, org)
queryClient.setQueryData('organizationView', { orgName: org.name }, org)
addToast({
icon: <Success16Icon />,
title: 'Success!',
Expand Down
8 changes: 4 additions & 4 deletions app/forms/project-access.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ export function ProjectAccessAddUserSideModal({
const userItems = users.map((u) => ({ value: u.id, label: u.displayName }))

const queryClient = useApiQueryClient()
const updatePolicy = useApiMutation('organizationProjectsPutProjectPolicy', {
const updatePolicy = useApiMutation('projectPolicyUpdate', {
onSuccess: (data) => {
queryClient.invalidateQueries('organizationProjectsGetProjectPolicy', projectParams)
queryClient.invalidateQueries('projectPolicyView', projectParams)
onSuccess?.(data)
onDismiss()
},
Expand Down Expand Up @@ -104,9 +104,9 @@ export function ProjectAccessEditUserSideModal({
const projectParams = useParams('orgName', 'projectName')

const queryClient = useApiQueryClient()
const updatePolicy = useApiMutation('organizationProjectsPutProjectPolicy', {
const updatePolicy = useApiMutation('projectPolicyUpdate', {
onSuccess: (data) => {
queryClient.invalidateQueries('organizationProjectsGetProjectPolicy', projectParams)
queryClient.invalidateQueries('projectPolicyView', projectParams)
onSuccess?.(data)
onDismiss()
},
Expand Down
6 changes: 3 additions & 3 deletions app/forms/project-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ export function CreateProjectSideModalForm({

const { orgName } = useParams('orgName')

const createProject = useApiMutation('organizationProjectsPost', {
const createProject = useApiMutation('projectCreate', {
onSuccess(project) {
// refetch list of projects in sidebar
queryClient.invalidateQueries('organizationProjectsGet', { orgName })
queryClient.invalidateQueries('projectList', { orgName })
// avoid the project fetch when the project page loads since we have the data
queryClient.setQueryData(
'organizationProjectsGetProject',
'projectView',
{ orgName, projectName: project.name },
project
)
Expand Down
6 changes: 3 additions & 3 deletions app/forms/project-edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ export function EditProjectSideModalForm({

const { orgName } = useParams('orgName')

const editProject = useApiMutation('organizationProjectsPutProject', {
const editProject = useApiMutation('projectUpdate', {
onSuccess(project) {
// refetch list of projects in sidebar
queryClient.invalidateQueries('organizationProjectsGet', { orgName })
queryClient.invalidateQueries('projectList', { orgName })
// avoid the project fetch when the project page loads since we have the data
queryClient.setQueryData(
'organizationProjectsGetProject',
'projectView',
{ orgName, projectName: project.name },
project
)
Expand Down
4 changes: 2 additions & 2 deletions app/forms/ssh-key-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ export function CreateSSHKeySideModalForm({
}: CreateSideModalFormProps<SshKeyCreate, SshKey>) {
const queryClient = useApiQueryClient()

const createSshKey = useApiMutation('sshkeysPost', {
const createSshKey = useApiMutation('sessionSshkeyCreate', {

@david-crespo david-crespo Jul 7, 2022 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the session prefix is weird for these operation IMO. will raise the issue on the API side

onSuccess(data) {
queryClient.invalidateQueries('sshkeysGet', {})
queryClient.invalidateQueries('sessionSshkeyList', {})
onSuccess?.(data)
onDismiss()
},
Expand Down
4 changes: 2 additions & 2 deletions app/forms/subnet-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ export function CreateSubnetSideModalForm({
const parentNames = useParams('orgName', 'projectName', 'vpcName')
const queryClient = useApiQueryClient()

const createSubnet = useApiMutation('vpcSubnetsPost', {
const createSubnet = useApiMutation('vpcSubnetCreate', {
onSuccess(data) {
queryClient.invalidateQueries('vpcSubnetsGet', parentNames)
queryClient.invalidateQueries('vpcSubnetList', parentNames)
onSuccess?.(data)
onDismiss()
},
Expand Down
4 changes: 2 additions & 2 deletions app/forms/subnet-edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ export function EditSubnetSideModalForm({
const parentNames = useParams('orgName', 'projectName', 'vpcName')
const queryClient = useApiQueryClient()

const updateSubnet = useApiMutation('vpcSubnetsPutSubnet', {
const updateSubnet = useApiMutation('vpcSubnetUpdate', {
onSuccess(data) {
queryClient.invalidateQueries('vpcSubnetsGet', parentNames)
queryClient.invalidateQueries('vpcSubnetList', parentNames)
onSuccess?.(data)
onDismiss()
},
Expand Down
10 changes: 3 additions & 7 deletions app/forms/vpc-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,11 @@ export function CreateVpcSideModalForm({
const queryClient = useApiQueryClient()
const addToast = useToast()

const createVpc = useApiMutation('projectVpcsPost', {
const createVpc = useApiMutation('vpcCreate', {
onSuccess(vpc) {
queryClient.invalidateQueries('projectVpcsGet', parentNames)
queryClient.invalidateQueries('vpcList', parentNames)
// avoid the vpc fetch when the vpc page loads since we have the data
queryClient.setQueryData(
'projectVpcsGetVpc',
{ ...parentNames, vpcName: vpc.name },
vpc
)
queryClient.setQueryData('vpcView', { ...parentNames, vpcName: vpc.name }, vpc)
addToast({
icon: <Success16Icon />,
title: 'Success!',
Expand Down
6 changes: 3 additions & 3 deletions app/forms/vpc-router-create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ export function CreateVpcRouterForm({
const queryClient = useApiQueryClient()
const addToast = useToast()

const createRouter = useApiMutation('vpcRoutersPost', {
const createRouter = useApiMutation('vpcRouterCreate', {
onSuccess(router) {
queryClient.invalidateQueries('vpcRoutersGet', parentNames)
queryClient.invalidateQueries('vpcRouterList', parentNames)
// avoid the vpc fetch when the vpc page loads since we have the data
queryClient.setQueryData(
'vpcRoutersGetRouter',
'vpcRouterView',
{ ...parentNames, routerName: router.name },
router
)
Expand Down
4 changes: 2 additions & 2 deletions app/forms/vpc-router-edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ export function EditVpcRouterForm({
const parentNames = useParams('orgName', 'projectName', 'vpcName')
const queryClient = useApiQueryClient()

const updateRouter = useApiMutation('vpcRoutersPutRouter', {
const updateRouter = useApiMutation('vpcRouterUpdate', {
onSuccess(data) {
queryClient.invalidateQueries('vpcRoutersGet', parentNames)
queryClient.invalidateQueries('vpcRouterList', parentNames)
onSuccess?.(data)
onDismiss()
},
Expand Down
2 changes: 1 addition & 1 deletion app/layouts/OrgLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {

const OrgLayout = () => {
const { orgName } = useParams('orgName')
const { data: projects } = useApiQuery('organizationProjectsGet', {
const { data: projects } = useApiQuery('projectList', {
orgName,
limit: 10,
})
Expand Down
6 changes: 3 additions & 3 deletions app/pages/OrgAccessPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ export const OrgAccessPage = () => {
const [addModalOpen, setAddModalOpen] = useState(false)
const [editingUserRow, setEditingUserRow] = useState<UserRow | null>(null)
const orgParams = useParams('orgName')
const { data: policy } = useApiQuery('organizationGetPolicy', orgParams)
const { data: policy } = useApiQuery('organizationPolicyView', orgParams)

const rows = useUserAccessRows(policy, orgRoleOrder)

const queryClient = useApiQueryClient()
const updatePolicy = useApiMutation('organizationPutPolicy', {
onSuccess: () => queryClient.invalidateQueries('organizationGetPolicy', orgParams),
const updatePolicy = useApiMutation('organizationPolicyUpdate', {
onSuccess: () => queryClient.invalidateQueries('organizationPolicyView', orgParams),
// TODO: handle 403
})

Expand Down
2 changes: 1 addition & 1 deletion app/pages/OrgPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useParams } from '../hooks'

export default function OrgPage() {
const { orgName } = useParams('orgName')
const { data: org } = useApiQuery('organizationsGetOrganization', { orgName })
const { data: org } = useApiQuery('organizationView', { orgName })

if (!org) return null

Expand Down
8 changes: 4 additions & 4 deletions app/pages/OrgsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ const OrgsPage = ({ modal }: OrgsPageProps) => {
const navigate = useNavigate()
const location = useLocation()

const { Table, Column } = useQueryTable('organizationsGet', {})
const { Table, Column } = useQueryTable('organizationList', {})
const queryClient = useApiQueryClient()

const { data: orgs } = useApiQuery('organizationsGet', {
const { data: orgs } = useApiQuery('organizationList', {
limit: 10, // to have same params as QueryTable
})

const deleteOrg = useApiMutation('organizationsDeleteOrganization', {
const deleteOrg = useApiMutation('organizationDelete', {
onSuccess() {
queryClient.invalidateQueries('organizationsGet', {})
queryClient.invalidateQueries('organizationList', {})
},
})

Expand Down
Loading