fix: Module graph in workspace of UI package #3636

g4rry420 · 2023-06-21T02:00:59Z

Signed-off-by: GurkiranSingh <[email protected]>

stackblitz · 2023-06-21T02:01:02Z

Run & review this pull request in StackBlitz Codeflow.

sheremet-va

I don't think this is a good solution. Module Graph should show module from the same workspace as the test file, not a random one

g4rry420 · 2023-06-26T15:32:46Z

@sheremet-va Please, correct me if I am wrong, but isn't this code will show module from the same workspace as the test file, as I am showing the module based on the id of the file.
Or is there a specific scenario that I am missing related to workspaces ? Please, let me know :)

const workspaceModules = workspaceProject?.ctx.getModuleProjects(id)
let workspaceMod: ModuleNode | undefined
if (workspaceModules && workspaceModules.length === 1) {
    const { server, browser } = workspaceModules[0]
    const mod = server.moduleGraph.getModuleById(id) || browser?.moduleGraph.getModuleById(id)
    workspaceMod = mod
}

sheremet-va · 2023-06-26T15:36:03Z

@sheremet-va Please, correct me if I am wrong, but isn't this code will show module from the same workspace as the test file, as I am showing the module based on the id of the file. Or is there a specific scenario that I am missing related to workspaces ? Please, let me know :)
const workspaceModules = workspaceProject?.ctx.getModuleProjects(id)
let workspaceMod: ModuleNode | undefined
if (workspaceModules && workspaceModules.length === 1) {
    const { server, browser } = workspaceModules[0]
    const mod = server.moduleGraph.getModuleById(id) || browser?.moduleGraph.getModuleById(id)
    workspaceMod = mod
}

It's possible to have the same test file in different workspace projects and process them differently. There is an example in test/workspaces with space_shared.

.getModuleProjects returns you an array for a reason.

g4rry420 · 2023-06-26T15:49:33Z

Ah okay, Thanks, Do you have suggestions about how this should be resolved then ?

sheremet-va · 2023-06-26T15:52:49Z

Ah okay, Thanks, Do you have suggestions about how this should be resolved then ?

Show a button with all workspaces (if there are more than one) to choose from on the module graph page.

sheremet-va · 2023-06-26T16:00:16Z

Ah okay, Thanks, Do you have suggestions about how this should be resolved then ?

Show a button with all workspaces (if there are more than one) to choose from on the module graph page.

Or! Which is probably better for now - display workspace name near the test file in the spec list. I think test files are now duplicated without the name there.

Then you can just pass workspace name to the module graph

…e workspace module fetch logic as per Vladimir suggestions Signed-off-by: GurkiranSingh <[email protected]>

netlify · 2023-07-01T03:00:52Z

✅ Deploy Preview for fastidious-cascaron-4ded94 canceled.

Name	Link
🔨 Latest commit	`11bb99d`
🔍 Latest deploy log	https://app.netlify.com/sites/fastidious-cascaron-4ded94/deploys/653d3d33d32b030008d36220

sheremet-va · 2023-07-04T09:40:09Z

packages/ui/client/components/TaskItem.vue

@@ -23,7 +23,7 @@ const duration = computed(() => {
  >
    <StatusIcon :task="task" mr-2 />
    <div flex items-end gap-2 :text="task?.result?.state === 'fail' ? 'red-500' : ''">
-      <span text-sm truncate font-light>{{ task.name }}</span>
+      <span text-sm truncate font-light>{{ `${(task.type === "suite" && task.projectName) ? `${task.projectName}/` : ''}${task.name}` }}</span>


I don't like how it's shown. In CLI it's marked as [${name}] and has a color

@sheremet-va Like this ?

Yellow/green/blue colors are unreadable in light theme:

@sheremet-va How about we if use a bit of blackish-shade with yellow - #7c7c05, green - #025402 and blue - rgb(2 2 131) color ?

happy-dom still looks unreadable to me

@sheremet-va How's this ?

Looks readable. Is it only for light mode? Won't be readable in dark mode

Change colors based on theme, use isDark from here https://github.com/vitest-dev/vitest/blob/main/packages/ui/client/composables/dark.ts

Yes, the colors in this image will only be for light mode - #3636 (comment)

Signed-off-by: GurkiranSingh <[email protected]>

sheremet-va · 2023-07-28T11:48:56Z

packages/vitest/src/utils/graph.ts

+    workspaceMod = mod
+  }
+
+  await get(ctx.server.moduleGraph.getModuleById(id) || workspaceMod)


Shouldn't you fallback to ctx.server.moduleGraph only if you didn't find the workspaceMod? This line looks suspicious to me

sheremet-va · 2023-07-28T11:49:19Z

packages/vitest/src/utils/graph.ts

+
+  const workspaceProject = ctx.projects.find(project => project.getName() === workspaceName)
+  const workspaceModules = workspaceProject?.ctx.getModuleProjects(id)
+  const selectedModule = workspaceModules?.find(module => module.getName() === workspaceName)


You do the same thing you did on #L33. Why?

You need to find the project by name and fallback to ctx.getCoreWorkspaceProject().server || ctx.server

@sheremet-va getCoreWorkspaceProject() is coming as null for test/workspaces folder.

Upon investigating, I have found that the conditons that executes the createCoreWorkspace function in packages\vitest\src\node\core.ts aren't satisfying

You do the same thing you did on #L33. Why?

This might be hacky, but I have found only this way where we get the workspaceMod

getCoreWorkspaceProject() is coming as null for test/workspaces folder.

Yes, it will be null if there is no core project. This is why I added || ctx.server. Core project is not created if main config file is not used by a workspace (so, when there is a global config and project configs and workspace specifies only project configs without manually using core project)

Core workspace project should be used AS THE LAST RESORT. Regular projects should be used if they are found by name.

This might be hacky, but I have found only this way where we get the workspaceMod

Then you must be doing something wrong?

Workspace project is just a project with the same name. If there is no such projects, just fallback to context which is always defined

sheremet-va · 2023-08-16T14:46:07Z

packages/vitest/src/utils/graph.ts

-  await get(ctx.server.moduleGraph.getModuleById(id))
+
+  const workspaceProject = ctx.projects.find(project => project.getName() === workspaceName)
+  const workspaceModules = workspaceProject?.ctx.getModuleProjects(id)


This code can be removed, you already have access to ctx

TECH7Fox · 2023-10-03T11:41:13Z

Any update on this? I would be happy to create another PR to get this fix merged.

Signed-off-by: GurkiranSingh <[email protected]>

…issue_3470

sheremet-va · 2024-02-16T11:02:54Z

Any update on this? I would be happy to create another PR to get this fix merged.

Feel free to open a separate PR.

sheremet-va · 2024-07-01T16:26:02Z

This is fixed in main.

fix: Module graph in workspace of UI package

cb8669b

Signed-off-by: GurkiranSingh <[email protected]>

Merge branch 'main' into issue_3470

bc9a074

sheremet-va requested changes Jun 21, 2023

View reviewed changes

feat: Workspace name will appear in test files name and also fixed th…

bec512c

…e workspace module fetch logic as per Vladimir suggestions Signed-off-by: GurkiranSingh <[email protected]>

Merge branch 'main' into issue_3470

a688acf

g4rry420 requested a review from sheremet-va July 1, 2023 03:58

sheremet-va requested changes Jul 4, 2023

View reviewed changes

g4rry420 added 2 commits July 4, 2023 12:10

Merge branch 'main' into issue_3470

3ed6363

chore: Added color for projectName in ui package

da1de1f

Signed-off-by: GurkiranSingh <[email protected]>

g4rry420 requested a review from sheremet-va July 5, 2023 00:56

g4rry420 and others added 5 commits July 20, 2023 19:49

Merge branch 'issue_3470'

5385c5e

chore: added light colors for module names in light mode

f66c06b

Signed-off-by: GurkiranSingh <[email protected]>

Merge branch 'main' of https://github.com/vitest-dev/vitest

480b7e5

Merge branch 'main' into issue_3470

76711f6

Merge branch 'main' into issue_3470

6afbb17

sheremet-va requested changes Jul 28, 2023

View reviewed changes

Merge branch 'main' into issue_3470

f5ce65e

sheremet-va reviewed Aug 16, 2023

View reviewed changes

g4rry420 added 2 commits October 28, 2023 12:55

chore: resolved conflicts

e1348d2

Signed-off-by: GurkiranSingh <[email protected]>

Merge branch 'issue_3470' of https://github.com/g4rry420/vitest into …

11bb99d

…issue_3470

sheremet-va closed this Jul 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Module graph in workspace of UI package #3636

fix: Module graph in workspace of UI package #3636

g4rry420 commented Jun 21, 2023 •

edited

Loading

stackblitz bot commented Jun 21, 2023

sheremet-va left a comment

g4rry420 commented Jun 26, 2023

sheremet-va commented Jun 26, 2023 •

edited

Loading

g4rry420 commented Jun 26, 2023

sheremet-va commented Jun 26, 2023

sheremet-va commented Jun 26, 2023

netlify bot commented Jul 1, 2023 •

edited

Loading

sheremet-va Jul 4, 2023

g4rry420 Jul 5, 2023

sheremet-va Jul 5, 2023

sheremet-va Jul 11, 2023 •

edited

Loading

g4rry420 Jul 25, 2023

sheremet-va Jul 25, 2023

g4rry420 Jul 26, 2023

sheremet-va Jul 26, 2023

userquin Jul 26, 2023

g4rry420 Jul 26, 2023 •

edited

Loading

sheremet-va Jul 28, 2023

sheremet-va Jul 28, 2023

g4rry420 Aug 9, 2023

sheremet-va Aug 16, 2023 •

edited

Loading

sheremet-va Aug 16, 2023

sheremet-va Aug 16, 2023 •

edited

Loading

TECH7Fox commented Oct 3, 2023

sheremet-va commented Feb 16, 2024

sheremet-va commented Jul 1, 2024

fix: Module graph in workspace of UI package #3636

fix: Module graph in workspace of UI package #3636

Conversation

g4rry420 commented Jun 21, 2023 • edited Loading

stackblitz bot commented Jun 21, 2023

sheremet-va left a comment

Choose a reason for hiding this comment

g4rry420 commented Jun 26, 2023

sheremet-va commented Jun 26, 2023 • edited Loading

g4rry420 commented Jun 26, 2023

sheremet-va commented Jun 26, 2023

sheremet-va commented Jun 26, 2023

netlify bot commented Jul 1, 2023 • edited Loading

✅ Deploy Preview for fastidious-cascaron-4ded94 canceled.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sheremet-va Jul 11, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

g4rry420 Jul 26, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sheremet-va Aug 16, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sheremet-va Aug 16, 2023 • edited Loading

Choose a reason for hiding this comment

TECH7Fox commented Oct 3, 2023

sheremet-va commented Feb 16, 2024

sheremet-va commented Jul 1, 2024

g4rry420 commented Jun 21, 2023 •

edited

Loading

sheremet-va commented Jun 26, 2023 •

edited

Loading

netlify bot commented Jul 1, 2023 •

edited

Loading

sheremet-va Jul 11, 2023 •

edited

Loading

g4rry420 Jul 26, 2023 •

edited

Loading

sheremet-va Aug 16, 2023 •

edited

Loading

sheremet-va Aug 16, 2023 •

edited

Loading