feat(ui-studies): add on click fetch and display list of non studies folder #2224

smailio · 2024-11-14T09:20:25Z

No description provided.

webapp/src/components/App/Studies/utils.ts

webapp/src/services/api/study.ts

webapp/src/components/App/Studies/StudyTree.tsx

webapp/src/components/App/Studies/StudyTree.test.tsx

webapp/src/components/App/Studies/StudyTree.tsx

webapp/src/services/api/study.ts

webapp/src/components/App/Studies/StudyTree/index.tsx

webapp/src/components/App/Studies/utils.ts

hdinia

You have an import error in components/Studies/SideNav.tsx

update this import StudyTree from "./StudyTree";
to: import StudyTree from "@/components/App/Studies/StudyTree";

do you have all frontend tools properly setup, eslint, typescript etc ?

webapp/src/components/App/Studies/StudyTree/index.tsx

hdinia · 2024-11-21T14:09:57Z

webapp/src/services/api/study.ts

+export const getWorkspaces = async (): Promise<string[]> => {
+  const res = await client.get(`/v1/private/explorer/_list_workspaces`);
+  return res.data.map((folder: { name: string }) => folder.name);
+};


you can pass types to axios methods, like this:

interface Workspace { name: string; } export const getWorkspaces = async => { const res = await client.get<Workspace[]>( `/v1/private/explorer/_list_workspaces`, ); return res.data.map((workspace) => workspace.name); };

webapp/src/services/api/study.ts

hdinia · 2024-11-21T14:21:04Z

webapp/src/services/api/study.ts

@@ -48,6 +49,37 @@ export const getStudies = async (): Promise<StudyMetadata[]> => {
  });
 };

+export const getWorkspaces = async (): Promise<string[]> => {
+  const res = await client.get(`/v1/private/explorer/_list_workspaces`);


Any specific reason why we have underscores in the api url ? /v1/private/explorer/_list_workspaces
We follow REST conventions, this should be something like /v1/private/explorer/workspaces, and if separators are needed we usually use a hyphen "-"

It's as per the specs, convention for private routes

MartinBelthle

The back-end side seems legit

hdinia

Some minor feedback, otherwise it looks good to me 👍🏼

webapp/public/locales/en/main.json

webapp/src/components/App/Studies/StudiesList/index.tsx

webapp/src/components/App/Studies/StudyTree/index.tsx

skamril · 2024-12-04T09:28:45Z

webapp/public/locales/fr/main.json

@@ -667,7 +669,9 @@
  "studies.exportOutput": "Exporter une sortie",
  "studies.exportOutputFilter": "Exporter une sortie filtrée",
  "studies.selectOutput": "Selectionnez une sortie",
-  "studies.variant": "Variante",


Remove also the key in the english file

I think it was a duplicate in tis file or something

skamril · 2024-12-04T09:31:09Z

webapp/src/components/App/Studies/StudiesList/index.tsx

+                control={<Checkbox checked={isRecursiveScan} />}
+                label={t("studies.requestDeepScan")}
+                onChange={handleRecursiveScan}
+              />{" "}


Remove {" "}

skamril · 2024-12-04T09:33:41Z

webapp/src/components/App/Studies/StudiesList/index.tsx

              onConfirm={handleFolderScan}
              alert="warning"
              open
            >
              {`${t("studies.scanFolder")} ${folder}?`}
+              <FormControlLabel


Use our component CheckBoxFE

skamril · 2024-12-04T09:41:35Z

webapp/src/components/App/Studies/StudyTree/index.tsx

+          treeWithWorkspaces,
+        );
+        setStudiesTree(updatedTree);
+        failedPaths.forEach((path) => {


This can flood the user with popups. Include them in one snackbar instead.

skamril · 2024-12-04T09:42:52Z

webapp/src/components/App/Studies/StudyTree/index.tsx

+        setStudiesTree(initialStudiesTree);
+        enqueueErrorSnackbar(
+          t("studies.tree.error.failToFetchWorkspace"),
+          error as AxiosError,


Use toError(err)

skamril · 2024-12-04T09:46:35Z

webapp/src/components/App/Studies/StudyTree/fixtures.ts

@@ -0,0 +1,157 @@
+/**


It's not better to have a test folder inside component @hdinia?

indeed to not mix concerns if their is multiple files related to tests in a folder we should put them inside their __tests__ folder

skamril · 2024-12-04T09:47:50Z

webapp/src/components/App/Studies/StudyTree/index.tsx

+        t("studies.tree.error.detailsInConsole"),
+      );
+    }
+  };


Add a line break

skamril · 2024-12-04T09:55:17Z

webapp/src/components/App/Studies/StudyTree/index.tsx

+        );
+      }
+    }
+    const chidrenPaths = studyTreeNode.children.map(


This code and the code from the effect can be move in a common function

skamril · 2024-12-04T10:26:22Z

webapp/src/components/App/Studies/StudyTree/utils.ts

+ * @param path path of the subfolder to fetch, should sart with root, e.g. root/workspace/folder1
+ * @returns list of subfolders under the given path
+ */
+async function fetchSubfolders(path: string): Promise<NonStudyFolderDTO[]> {


async / await and return type are not necessary

…factor code into a functional style

…cursive scan, show only studies in the current folder by default use a tree icon when we show studies for all descendants

pull-request-size bot added the size/L label Nov 14, 2024

skamril requested changes Nov 14, 2024

View reviewed changes

hdinia requested changes Nov 15, 2024

View reviewed changes

hdinia assigned smailio Nov 15, 2024

skamril reviewed Nov 15, 2024

View reviewed changes

webapp/src/services/api/study.ts Outdated Show resolved Hide resolved

pull-request-size bot added size/XL and removed size/L labels Nov 19, 2024

skamril requested changes Nov 21, 2024

View reviewed changes

smailio marked this pull request as ready for review November 21, 2024 10:56

hdinia requested changes Nov 21, 2024

View reviewed changes

webapp/src/components/App/Studies/StudyTree/index.tsx Outdated Show resolved Hide resolved

webapp/src/components/App/Studies/StudyTree/index.tsx Outdated Show resolved Hide resolved

webapp/src/components/App/Studies/StudyTree/index.tsx Outdated Show resolved Hide resolved

hdinia reviewed Nov 21, 2024

View reviewed changes

webapp/src/services/api/study.ts Outdated Show resolved Hide resolved

hdinia reviewed Nov 21, 2024

View reviewed changes

MartinBelthle previously approved these changes Nov 22, 2024

View reviewed changes

smailio dismissed MartinBelthle’s stale review via dcd76c4 November 22, 2024 15:50

smailio force-pushed the feature/615-optimize-listing-studies branch from 7f3197d to 700cfe3 Compare November 28, 2024 10:23

hdinia requested changes Nov 28, 2024

View reviewed changes

hdinia previously approved these changes Dec 4, 2024

View reviewed changes

skamril requested changes Dec 4, 2024

View reviewed changes

Anis SMAIL added 10 commits December 4, 2024 13:48

feat(ui): add on click fetch and display list of non studies folder

077feeb

refactor(ui): fix build to pass npm lint add docs

3860608

refactor(ui): make npm lint pass

fe91d5a

refactor(ui): make npm lint pass

37bb38e

refactor(ui): move files, better naming

4d8db33

refactor(ui): wip, add snack bar error alert for failed path load, re…

65b8d8e

…factor code into a functional style

feat(ui): add workspace merge + optimize folder merge

ea5950f

fix(ui): fix build

c70db00

fix(ui): fix build for real

360cd2d

refactor(ui): refactor some test + ui

10a7223

Anis SMAIL added 11 commits December 4, 2024 13:48

fix(ui): over escaped special charachters

f8521dc

fix(explorer): fix build

a7b1b97

fix(ui): fix build

74a47c4

fix(ui): fix build

16283c9

feat(ui): make the scan non recursive by defaul, add an option for re…

54177b8

…cursive scan, show only studies in the current folder by default use a tree icon when we show studies for all descendants

fix(ui): fix build npm lint

72e4e8f

fix(ui): fix build

4442a5f

fix(ui): fix nonense tooltip messsage

6612892

fix(ui): fix build

fc19796

fix(ui): fix build

e54429f

refactor(ui): better naming and messages

eb1a170

smailio force-pushed the feature/615-optimize-listing-studies branch from f546844 to eb1a170 Compare December 4, 2024 12:48

Anis SMAIL added 2 commits December 5, 2024 18:08

refactor(ui): refactor duplicate code and fix style

e24f1da

fix(ui): fix build

b59eb6f

smailio dismissed hdinia’s stale review via b59eb6f December 5, 2024 17:08

Anis SMAIL added 2 commits December 6, 2024 02:24

refactor(ui): move code into clean sections

474169b

refactor(ui): move test for study tree in their own folder

d1fb134

skamril changed the title ~~feat(ui): add on click fetch and display list of non studies folder~~ feat(ui-studies): add on click fetch and display list of non studies folder Dec 17, 2024

skamril previously approved these changes Dec 17, 2024

View reviewed changes

refactor(ui): remove useless await

dfe103c

smailio dismissed skamril’s stale review via dfe103c December 17, 2024 16:22

Anis SMAIL added 6 commits December 17, 2024 17:30

Merge branch 'dev' into feature/615-optimize-listing-studies

763ea55

fix(build): add forgotten file

8361ec5

Merge branch 'dev' into feature/615-optimize-listing-studies

ab26401

feat(ui): fetch current folder and not only children

b8ab1f7

refactor(ui): add docs

03c9ef0

refactor(ui): small refactor

442cd41

hdinia approved these changes Dec 18, 2024

View reviewed changes

smailio merged commit 763f370 into dev Dec 18, 2024
13 checks passed

smailio deleted the feature/615-optimize-listing-studies branch December 18, 2024 17:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(ui-studies): add on click fetch and display list of non studies folder #2224

feat(ui-studies): add on click fetch and display list of non studies folder #2224

smailio commented Nov 14, 2024

hdinia left a comment •

edited

Loading

hdinia Nov 21, 2024 •

edited

Loading

hdinia Nov 21, 2024

smailio Nov 22, 2024

MartinBelthle left a comment

hdinia left a comment

skamril Dec 4, 2024

smailio Dec 17, 2024

skamril Dec 4, 2024

skamril Dec 4, 2024

skamril Dec 4, 2024

skamril Dec 4, 2024

skamril Dec 4, 2024

hdinia Dec 4, 2024 •

edited

Loading

skamril Dec 4, 2024

smailio Dec 17, 2024

skamril Dec 4, 2024

skamril Dec 4, 2024

feat(ui-studies): add on click fetch and display list of non studies folder #2224

feat(ui-studies): add on click fetch and display list of non studies folder #2224

Conversation

smailio commented Nov 14, 2024

hdinia left a comment • edited Loading

Choose a reason for hiding this comment

hdinia Nov 21, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MartinBelthle left a comment

Choose a reason for hiding this comment

hdinia left a 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hdinia Dec 4, 2024 • 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

hdinia left a comment •

edited

Loading

hdinia Nov 21, 2024 •

edited

Loading

hdinia Dec 4, 2024 •

edited

Loading