Skip to content
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

chore: [M3-8524] - Attempt to get dependencies in a more healthy state #11005

Merged
merged 18 commits into from
Sep 27, 2024
Merged

chore: [M3-8524] - Attempt to get dependencies in a more healthy state #11005

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
eb1ce36
initial fixes
bnussman Sep 25, 2024
0c2a3dd
fix all new type errors
bnussman Sep 25, 2024
dba5125
begin removing resolutions
bnussman Sep 25, 2024
97084b8
more resolutions
bnussman Sep 25, 2024
47d01c9
more resolutions
bnussman Sep 25, 2024
bf4fc73
Merge branch 'develop' into fix/attempt-to-get-dependencies-in-sane-s…
bnussman Sep 25, 2024
3063aa1
fix tests
bnussman Sep 25, 2024
c973748
remove `jackspeak` resolution
bnussman Sep 25, 2024
554dd86
bump
bnussman Sep 25, 2024
483857f
switch out `ts-node` for `tsx` to fix Cypress pipeline notification n…
bnussman Sep 25, 2024
30ae5b1
switch out `ts-node` for `tsx` to fix Cypress pipeline notification n…
bnussman Sep 25, 2024
d2f70cb
Added changeset: Get dependencies in a more healthy state
bnussman Sep 25, 2024
5d0cd00
fix autocomplete ui bug
bnussman Sep 25, 2024
c7be943
remove `react-test-renderer` because I think it unused
bnussman Sep 25, 2024
33779d4
remove `reselect-tools` because it is unused
bnussman Sep 25, 2024
986c94e
remove more unused dependencies
bnussman Sep 25, 2024
8a37058
fix console error caused by the Primary Nav
bnussman Sep 26, 2024
196b607
fix stroybook dark mode bug @dwiley-akamai
bnussman Sep 26, 2024
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
18 changes: 3 additions & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,27 +37,15 @@
"generate-changelogs": "node scripts/changelog/generate-changelogs.mjs",
"coverage": "yarn workspace linode-manager coverage",
"coverage:summary": "yarn workspace linode-manager coverage:summary",
"junit:summary": "ts-node scripts/junit-summary/index.ts",
"generate-tod": "ts-node scripts/tod-payload/index.ts",
"junit:summary": "tsx scripts/junit-summary/index.ts",
"generate-tod": "tsx scripts/tod-payload/index.ts",
"docs": "bunx [email protected] dev docs",
"prepare": "husky"
},
"resolutions": {
"braces": "^3.0.3",
"@babel/traverse": "^7.23.3",
"minimist": "^1.2.3",
"yargs-parser": "^21.1.1",
"kind-of": "^6.0.3",
"node-fetch": "^2.6.7",
"ua-parser-js": "^0.7.33",
"immer": "^9.0.6",
"glob-parent": "^5.1.2",
"hosted-git-info": "^5.0.0",
"yaml": "^2.3.0",
"word-wrap": "^1.2.4",
"semver": "^7.5.2",
"tough-cookie": "^4.1.3",
"jackspeak": "2.1.1"
"semver": "^7.5.2"
},
"workspaces": {
"packages": [
Expand Down
2 changes: 1 addition & 1 deletion packages/api-v4/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@types/node": "^12.7.1",
"@types/yup": "^0.29.13",
"axios-mock-adapter": "^1.22.0",
"concurrently": "^4.1.1",
"concurrently": "^9.0.1",
"eslint": "^6.8.0",
"eslint-plugin-ramda": "^2.5.1",
"eslint-plugin-sonarjs": "^0.5.0",
Expand Down
5 changes: 5 additions & 0 deletions packages/manager/.changeset/pr-11005-tech-stories-1727294313614.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Tech Stories
---

Get dependencies in a more healthy state ([#11005](https://github.com/linode/manager/pull/11005))
9 changes: 6 additions & 3 deletions packages/manager/cypress/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import react from '@vitejs/plugin-react-swc';
import svgr from 'vite-plugin-svgr';
import { defineConfig } from 'vite';
import { URL } from 'url';
import { defineConfig } from 'vite';
import svgr from 'vite-plugin-svgr';

import type { UserConfig } from 'vite';

// ESM-friendly alternative to `__dirname`.
const DIRNAME = new URL('.', import.meta.url).pathname;

export default defineConfig({
plugins: [react(), svgr({ exportAsDefault: true })],
// @todo Remove this `as` when we upgrade our package manager. Yarn v1's hoisting behavior is causing a type error
plugins: [react(), svgr({ exportAsDefault: true })] as UserConfig['plugins'],
build: {
rollupOptions: {
// Suppress "SOURCEMAP_ERROR" warnings.
Expand Down
2 changes: 1 addition & 1 deletion packages/manager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
"simple-git": "^3.19.0",
"storybook": "^8.3.0",
"storybook-dark-mode": "^4.0.1",
"ts-node": "^10.9.2",
"tsx": "^4.19.1",
Copy link
Member Author

@bnussman-akamai bnussman-akamai Sep 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

ts-node was causing our cypress helper scripts issues. I found tsx. It fixes the issue and appears to be a better / more lightweight alternative to ts-node

Copy link
Contributor

@jdamore-linode jdamore-linode Sep 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I know we've also talked about using Bun for these scripts too -- iirc it's only a couple of the scripts in the scripts dir that we use for the Jenkins pipeline that even rely on ts-node, but lately I've been opting to keep that type of stuff in internal repos. I'd be up to move these out of Cloud altogether if it means we can drop the ts-node/tsx dependency

Copy link
Member Author

@bnussman-akamai bnussman-akamai Sep 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I like the idea of moving scripts like this in internal repos. In the mean time (and because we don't have Bun readily available in CI) I'm totally cool with keeping tsx around. It seems very minimal and useful for us even for things like scripts/package-versions/index.js (if we were to make it .ts)

Eventually, I'd love Bun to be our go-to tool for running this stuff, but we should probably get that setup in CI and formalized before we commit to that

"vite": "^5.4.6",
"vite-plugin-svgr": "^3.2.0",
"vitest": "^2.1.1"
Expand Down
12 changes: 10 additions & 2 deletions packages/manager/src/features/Linodes/LinodeCreatev2/Firewall.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { waitFor } from '@testing-library/react';
import React from 'react';

import { firewallFactory } from 'src/factories';
Expand Down Expand Up @@ -53,12 +54,19 @@ describe('Linode Create v2 Firewall', () => {
);

const {
findByDisplayValue,
getByLabelText,
} = renderWithThemeAndHookFormContext<CreateLinodeRequest>({
component: <Firewall />,
useFormOptions: { defaultValues: { firewall_id: firewall.id } },
});

await findByDisplayValue(firewall.label);
await waitFor(
() => {
expect(getByLabelText('Assign Firewall')).toHaveDisplayValue(
firewall.label
);
},
{ timeout: 5_000 }
);
});
});
51 changes: 27 additions & 24 deletions packages/manager/src/features/Linodes/LinodeCreatev2/Security.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ import { Security } from './Security';
import type { LinodeCreateFormValues } from './utilities';

describe('Security', () => {
// TODO: Unskip once M3-8559 is addressed.
it.skip(
it(
'should render a root password input',
async () => {
const { findByLabelText } = renderWithThemeAndHookFormContext({
Expand Down Expand Up @@ -55,31 +54,35 @@ describe('Security', () => {
expect(addSSHKeyButton).toBeEnabled();
});

it('should disable the password input if the user does not have permission to create linodes', async () => {
server.use(
http.get('*/v4/profile', () => {
return HttpResponse.json(profileFactory.build({ restricted: true }));
}),
http.get('*/v4/profile/sshkeys', () => {
return HttpResponse.json(makeResourcePage([]));
}),
http.get('*/v4/profile/grants', () => {
return HttpResponse.json(
grantsFactory.build({ global: { add_linodes: false } })
);
})
);
it(
'should disable the password input if the user does not have permission to create linodes',
async () => {
server.use(
http.get('*/v4/profile', () => {
return HttpResponse.json(profileFactory.build({ restricted: true }));
}),
http.get('*/v4/profile/sshkeys', () => {
return HttpResponse.json(makeResourcePage([]));
}),
http.get('*/v4/profile/grants', () => {
return HttpResponse.json(
grantsFactory.build({ global: { add_linodes: false } })
);
})
);

const { findByLabelText } = renderWithThemeAndHookFormContext({
component: <Security />,
});
const { findByLabelText } = renderWithThemeAndHookFormContext({
component: <Security />,
});

const rootPasswordInput = await findByLabelText('Root Password');
const rootPasswordInput = await findByLabelText('Root Password');

await waitFor(() => {
expect(rootPasswordInput).toBeDisabled();
});
});
await waitFor(() => {
expect(rootPasswordInput).toBeDisabled();
});
},
{ timeout: 5_000 }
);

it('should disable ssh key selection if the user does not have permission to create linodes', async () => {
const sshKeys = sshKeyFactory.buildList(3);
Expand Down
4 changes: 2 additions & 2 deletions ...ger/src/features/Linodes/LinodesDetail/LinodeResize/LinodeResizeUnifiedMigrationPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const UnifiedMigrationPanel = (props: Props) => {
}
status="help"
tooltipPosition="right"
width={[theme.breakpoints.up('sm')] ? 375 : 300}
width={375}
/>
</Box>
<Box width="100%">
Expand Down Expand Up @@ -112,7 +112,7 @@ export const UnifiedMigrationPanel = (props: Props) => {
}
status="help"
tooltipPosition="right"
width={[theme.breakpoints.up('sm')] ? 450 : 300}
Copy link
Member Author

Choose a reason for hiding this comment

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

We had a handful of things like this. We would get a type error saying [theme.breakpoints.up('sm')] is always truthy so I just updated the code to just use 450

width={450}
/>
</Box>
</RadioGroup>
Expand Down
4 changes: 2 additions & 2 deletions packages/manager/src/features/PlacementGroups/PlacementGroupsUnassignModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ export const PlacementGroupsUnassignModal = (props: Props) => {
error,
isPending,
mutateAsync: unassignLinodes,
} = useUnassignLinodesFromPlacementGroup(+placementGroupId ?? -1);
} = useUnassignLinodesFromPlacementGroup(+placementGroupId);

const { data: linodeFromQuery, isFetching } = useLinodeQuery(
+linodeId ?? -1,
+linodeId,
open && selectedLinode === undefined
);

Expand Down
2 changes: 1 addition & 1 deletion packages/manager/src/features/Volumes/VolumeCreate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ export const VolumeCreate = () => {
onBlur={handleBlur}
onChange={(id: number) => setFieldValue('config_id', id)}
value={config_id}
width={[theme.breakpoints.down('sm')] ? 320 : 400}
width={320}
/>
</Box>
<Box alignItems="flex-end" display="flex" position="relative">
Expand Down
8 changes: 4 additions & 4 deletions packages/manager/src/mocks/utilities/response.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { HttpResponse } from 'msw';

import { getPaginatedSlice } from '../utilities/pagination';

import type { APIError } from '@linode/api-v4';
import type { APIError, ResourcePage } from '@linode/api-v4';
import type { JsonBodyType } from 'msw';

export interface APIPaginatedResponse<T> {
Expand Down Expand Up @@ -30,7 +30,7 @@ export const makeResponse = <T extends JsonBodyType>(
status: number = 200,
headers: {} = {}
) => {
return HttpResponse.json(body, {
return HttpResponse.json<T>(body, {
headers,
status,
});
Expand All @@ -52,7 +52,7 @@ export const makeErrorResponse = (
) => {
const reasonsArray = Array.isArray(reason) ? reason : [reason];

return HttpResponse.json(
return HttpResponse.json<APIErrorResponse>(
{
errors: reasonsArray.map((reasonString) => ({
reason: reasonString,
Expand Down Expand Up @@ -144,7 +144,7 @@ export const makePaginatedResponse = <T extends JsonBodyType>({
const pageCount = Math.ceil(filteredData.length / pageSize);
const pageSlice = getPaginatedSlice(filteredData, requestedPage, pageSize);

return HttpResponse.json({
return HttpResponse.json<ResourcePage<T>>({
data: pageSlice,
page: requestedPage,
pages: pageCount,
Expand Down
4 changes: 3 additions & 1 deletion packages/manager/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import react from '@vitejs/plugin-react-swc';
import svgr from 'vite-plugin-svgr';
import { defineConfig } from 'vitest/config';
import type { UserConfig } from 'vitest/config';
import { URL } from 'url';

// ESM-friendly alternative to `__dirname`.
Expand All @@ -11,7 +12,8 @@ export default defineConfig({
outDir: 'build',
},
envPrefix: 'REACT_APP_',
plugins: [react(), svgr({ exportAsDefault: true })],
// @todo Remove this `as` when we upgrade our package manager. Yarn v1's hoisting behavior is causing a type error
plugins: [react(), svgr({ exportAsDefault: true })] as UserConfig['plugins'],
resolve: {
alias: {
src: `${DIRNAME}/src`,
Expand Down
2 changes: 1 addition & 1 deletion packages/validation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"devDependencies": {
"@types/node": "^12.7.1",
"concurrently": "^4.1.1",
"concurrently": "^9.0.1",
"eslint": "^6.8.0",
"eslint-plugin-ramda": "^2.5.1",
"eslint-plugin-sonarjs": "^0.5.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/validation/src/vpcs.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export const createSubnetSchema = object().shape(
{
label: labelValidation.required(LABEL_REQUIRED),
ipv4: string().when('ipv6', {
is: '' || null || undefined,
is: (value: unknown) => value === '' || value === null || value === undefined,
then: string()
.required(IP_EITHER_BOTH_NOT_NEITHER)
.test({
Expand Down Expand Up @@ -163,7 +163,7 @@ export const createSubnetSchema = object().shape(
}),
}),
ipv6: string().when('ipv4', {
is: '' || null || undefined,
is: (value: unknown) => value === '' || value === null || value === undefined,
then: string()
.required(IP_EITHER_BOTH_NOT_NEITHER)
.test({
Expand Down
Loading
Loading