Skip to content

P
purescript-gargantext
Commit 992d6718 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski
Browse files
Options

[list selector] list tree works now

parent a23e755f
Pipeline #1768 failed with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 189 additions and 56 deletions
    dist/styles/sass.css
    View file @ 992d6718
    ...@@ -656,6 +656,14 @@ li .leaf:hover a.settings { ...@@ -656,6 +656,14 @@ li .leaf:hover a.settings {
    margin-bottom: 24px; margin-bottom: 24px;
    } }
    .ids-selector .tree .children {
    padding-left: 0.5em;
    }
    .ids-selector .tree .children .leaf input {
    padding-left: 0.1em;
    padding-right: 0.1em;
    }
    .code-editor .editor .code-area { .code-editor .editor .code-area {
    flex-grow: 1; flex-grow: 1;
    max-height: 200px; max-height: 200px;
    ......
    dist/styles/sass.css.map
    View file @ 992d6718
    {"version":3,"sourceRoot":"","sources":["../../src/sass/_menu.sass","../../src/sass/_context_menu.sass","../../src/sass/_graph.sass","../../src/sass/_login.sass","../../src/sass/_tree.sass","../../src/sass/abstract/_members.scss","../../src/sass/_code_editor.sass","../../src/sass/_styles.sass","../../src/sass/_range_slider.sass","../../src/sass/_annotation.sass","../../src/sass/_folder_view.sass"],"names":[],"mappings":"AAEA;AAEA;AACA;AACA;AACA;AACA;AAEA;EACE;EACA;EACA;EACA;EAEA;;;AAEF;EACI;EACA;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;;;AAEF;AACI;EACA;;;AAEJ;AACI;EACA;;;AAGJ;AACA;EACI;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;EACA;;;AAEF;EACE;;;AAME;EACE;;;AC9DN;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;;AClBF;EACE;EACA;EACA;;;AAEF;AAkCE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAxCA;EAZA;EACA;EAEA;EAWE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AACN;EACE;;AACF;EACE;;AAEF;EApCA;EACA;EAEA;EAmCE;EACA;;AACF;EACE;;AACF;EACE;;AAWF;EAEE;EAEA;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AAEJ;EACE;;AAEA;EACE;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;ACjFJ;EACE;;AACA;EACE;EACA;;;AAEJ;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;AAEE;EACE;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACN;EACE;EACA;EACA;EACA;;;AAGN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAGF;EACE;;;AAEJ;EACI;EACA;;;AAGF;EACE;;;AAEJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AC/IF;EACE;;;AAGA;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGA;EACE;;AACF;EACE;;AAEJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAKJ;EACE;;AACA;EACE;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACF;EACE;;AACF;EACE;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AACF;EACE;;AAGN;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AAIR;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAEV;EACE;;AACF;EACE;;AAEE;EACE;;AACF;EACE;;AACN;EACE;;AAEE;EACE;;;AAGR;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAEN;EAWE;;AAGE;EACE;;AAEA;EACE;;;AAUR;EAEE;EACA,MAFW;EAGX;;;AAEF;EAEE;EACA,OAFW;EAGX;;;AAGA;EACE;;AACF;EACE;;AACF;EACE;;;AAMF;EACE;;;AAEJ;EAEE;EACA;;;AAEF;EAEE;EACA;;;AAEF;EAGE;EAKA;EACA;EACA;EACA;EAGA;EACA;EACA;EAKA;;AAHA;EACE;;;AAKJ;EAGE;;AC9NS;ED/BP;EACA;;;ACqBO;EDlBP;EACA;;;AC0BO;EDiOP;;AAEA;EACE;;;AC7OK;EDgPP;;AAEA;EACE;;;AAON;EAIE;EAEA;EACA;EACA;EACA,QA9RmC;EA+RnC;;AC3PS;ED+PP;;;ACxQO;ED2QP;;;AAEJ;EAGE;EAEA;EACA;EACA;EACA,QAjTgC;EAkThC;;AC7QS;EDiRP;;;AC1RO;ED6RP;;;AAKF;EAIE;EACA;;AC9RO;ED/BP;EACA;;;ACqBO;EDlBP;EACA;;;AA0TA;EACE,eArU+B;;;AEsBjC;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EApCR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AA0CM;EACE;EACA;EACA;EACA;EACA;EA5CR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAkDE;EACE;EACA;EACA;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAGE;EACE;;AAEF;EACE;;AAEV;EACE;;AAEA;EACE;;;AC9FN;EACE;;;AAEA;EAEE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAER;EAEE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAEV;EACE;;AACA;EACE;;AACF;EACE;EACA;EACA;;;AAIA;EACE;;AACA;EACE;EACA;;AACF;EACE;;AACA;EACE;;AACJ;EACE;;;AAER;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;AAGI;EACE;;AACF;EACE;;;AAEN;EACE;EACA;EACA;;;AAIA;EACE;;AACF;EACE;;;AAEJ;EACE;;AACA;EACE;;;AAEJ;EACE;EACA;;;AAGF;EACE;;;AAEF;EACE;;AAEA;EACE;;AAEF;EACE;;;AAGJ;EAKE;;AAEA;EACE;;AAIE;EACE;;AACF;EACE;;AAEJ;EAGE;;AAGJ;EACE,SAtBa;EAuBb;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAKE;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;;AAKN;EACE;;AFhIO;EEmIL;;;AF5IK;EE+IL;;;AAEJ;EACE,SAZa;;;ACpKjB;EACE;AACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EAEA;EAEA;;AAEA;EACE;EAEA;EACA;EACA;;;AAGN;EACE;;;ACxBJ;EACE;;AAEA;EANE;EACA;;AAQF;EAbE;EACA;;AAeF;EAhBE;EACA;;AAkBF;EAnBE;EACA;;AAqBF;EA1BE;EACA,kBANyB;;AAkC3B;EA7BE;EACA,kBAPqB;;AAsCvB;EAhCE;EACA,kBAJoB;;;AAuCtB;EApCE;EACA,kBANyB;;AA4C3B;EAvCE;EACA,kBAPqB;;AAgDvB;EA1CE;EACA,kBAJoB;;;ACNxB;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA","file":"sass.css"} {"version":3,"sourceRoot":"","sources":["../../src/sass/_menu.sass","../../src/sass/_context_menu.sass","../../src/sass/_graph.sass","../../src/sass/_login.sass","../../src/sass/_tree.sass","../../src/sass/abstract/_members.scss","../../src/sass/_code_editor.sass","../../src/sass/_styles.sass","../../src/sass/_range_slider.sass","../../src/sass/_annotation.sass","../../src/sass/_folder_view.sass"],"names":[],"mappings":"AAEA;AAEA;AACA;AACA;AACA;AACA;AAEA;EACE;EACA;EACA;EACA;EAEA;;;AAEF;EACI;EACA;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;;;AAEF;AACI;EACA;;;AAEJ;AACI;EACA;;;AAGJ;AACA;EACI;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;EACA;;;AAEF;EACE;;;AAME;EACE;;;AC9DN;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;;AClBF;EACE;EACA;EACA;;;AAEF;AAkCE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAxCA;EAZA;EACA;EAEA;EAWE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AACN;EACE;;AACF;EACE;;AAEF;EApCA;EACA;EAEA;EAmCE;EACA;;AACF;EACE;;AACF;EACE;;AAWF;EAEE;EAEA;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AAEJ;EACE;;AAEA;EACE;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;ACjFJ;EACE;;AACA;EACE;EACA;;;AAEJ;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;AAEE;EACE;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACN;EACE;EACA;EACA;EACA;;;AAGN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAGF;EACE;;;AAEJ;EACI;EACA;;;AAGF;EACE;;;AAEJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AC/IF;EACE;;;AAGA;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGA;EACE;;AACF;EACE;;AAEJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAKJ;EACE;;AACA;EACE;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACF;EACE;;AACF;EACE;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AACF;EACE;;AAGN;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AAIR;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAEV;EACE;;AACF;EACE;;AAEE;EACE;;AACF;EACE;;AACN;EACE;;AAEE;EACE;;;AAGR;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAEN;EAWE;;AAGE;EACE;;AAEA;EACE;;;AAUR;EAEE;EACA,MAFW;EAGX;;;AAEF;EAEE;EACA,OAFW;EAGX;;;AAGA;EACE;;AACF;EACE;;AACF;EACE;;;AAMF;EACE;;;AAEJ;EAEE;EACA;;;AAEF;EAEE;EACA;;;AAEF;EAGE;EAKA;EACA;EACA;EACA;EAGA;EACA;EACA;EAKA;;AAHA;EACE;;;AAKJ;EAGE;;AC9NS;ED/BP;EACA;;;ACqBO;EDlBP;EACA;;;AC0BO;EDiOP;;AAEA;EACE;;;AC7OK;EDgPP;;AAEA;EACE;;;AAON;EAIE;EAEA;EACA;EACA;EACA,QA9RmC;EA+RnC;;AC3PS;ED+PP;;;ACxQO;ED2QP;;;AAEJ;EAGE;EAEA;EACA;EACA;EACA,QAjTgC;EAkThC;;AC7QS;EDiRP;;;AC1RO;ED6RP;;;AAKF;EAIE;EACA;;AC9RO;ED/BP;EACA;;;ACqBO;EDlBP;EACA;;;AA0TA;EACE,eArU+B;;;AA2UjC;EACE;;AAEE;EACE;EACA;;;AE1TN;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EApCR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AA0CM;EACE;EACA;EACA;EACA;EACA;EA5CR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAkDE;EACE;EACA;EACA;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAGE;EACE;;AAEF;EACE;;AAEV;EACE;;AAEA;EACE;;;AC9FN;EACE;;;AAEA;EAEE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAER;EAEE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAEV;EACE;;AACA;EACE;;AACF;EACE;EACA;EACA;;;AAIA;EACE;;AACA;EACE;EACA;;AACF;EACE;;AACA;EACE;;AACJ;EACE;;;AAER;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;AAGI;EACE;;AACF;EACE;;;AAEN;EACE;EACA;EACA;;;AAIA;EACE;;AACF;EACE;;;AAEJ;EACE;;AACA;EACE;;;AAEJ;EACE;EACA;;;AAGF;EACE;;;AAEF;EACE;;AAEA;EACE;;AAEF;EACE;;;AAGJ;EAKE;;AAEA;EACE;;AAIE;EACE;;AACF;EACE;;AAEJ;EAGE;;AAGJ;EACE,SAtBa;EAuBb;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAKE;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;AADF;EACE;;;AAKN;EACE;;AFhIO;EEmIL;;;AF5IK;EE+IL;;;AAEJ;EACE,SAZa;;;ACpKjB;EACE;AACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EAEA;EAEA;;AAEA;EACE;EAEA;EACA;EACA;;;AAGN;EACE;;;ACxBJ;EACE;;AAEA;EANE;EACA;;AAQF;EAbE;EACA;;AAeF;EAhBE;EACA;;AAkBF;EAnBE;EACA;;AAqBF;EA1BE;EACA,kBANyB;;AAkC3B;EA7BE;EACA,kBAPqB;;AAsCvB;EAhCE;EACA,kBAJoB;;;AAuCtB;EApCE;EACA,kBANyB;;AA4C3B;EAvCE;EACA,kBAPqB;;AAgDvB;EA1CE;EACA,kBAJoB;;;ACNxB;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA","file":"sass.css"}
    \ No newline at end of file \ No newline at end of file
    package.json
    View file @ 992d6718
    ...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
    "prod:bundle": "pulp browserify --skip-compile -o dce-output -t app.js", "prod:bundle": "pulp browserify --skip-compile -o dce-output -t app.js",
    "prod:pack": "parcel build index.html -d prod --public-url . --no-source-maps", "prod:pack": "parcel build index.html -d prod --public-url . --no-source-maps",
    "test-pulp": "pulp test", "test-pulp": "pulp test",
    "test": "gauge run specs/" "test": "gauge run specs/"
    }, },
    "dependencies": { "dependencies": {
    "@popperjs/core": "^2.9.2", "@popperjs/core": "^2.9.2",
    "aes-js": "^3.1.1", "aes-js": "^3.1.1",
    "base-x": "^3.0.2", "base-x": "^3.0.2",
    "bootstrap": "^4.6.0", "bootstrap": "^5.1.0",
    "bootstrap-dark": "^1.0.3", "bootstrap-dark": "^1.0.3",
    "create-react-class": "^15.6.3", "create-react-class": "^15.6.3",
    "echarts": "^5.1.2", "echarts": "^5.1.2",
    ...@@ -50,12 +50,12 @@ ...@@ -50,12 +50,12 @@
    "devDependencies": { "devDependencies": {
    "@babel/core": "^7.15.0", "@babel/core": "^7.15.0",
    "@babel/preset-react": "^7.12.7", "@babel/preset-react": "^7.12.7",
    "@getgauge/cli": "^1.4.0", "@getgauge/cli": "^1.4.0",
    "parcel": "^2.0.0-beta.2", "parcel": "^2.0.0-beta.2",
    "react-testing-library": "^8.0.1", "react-testing-library": "^8.0.1",
    "sass": "^1.35.2", "sass": "^1.35.2",
    "serve": "^12.0.0", "serve": "^12.0.0",
    "taiko": "latest", "taiko": "latest",
    "vscode-languageserver": "^7.0.0", "vscode-languageserver": "^7.0.0",
    "xhr2": "^0.2.1" "xhr2": "^0.2.1"
    }, },
    ......
    shell.nix
    View file @ 992d6718
    ...@@ -68,6 +68,7 @@ pkgs.mkShell { ...@@ -68,6 +68,7 @@ pkgs.mkShell {
    build-purs build-purs
    build-watch build-watch
    build build
    pkgs.nodejs
    repl repl
    pkgs.pulp pkgs.pulp
    pkgs.spago pkgs.spago
    ......
    src/Gargantext/Components/FolderView.purs
    View file @ 992d6718
    ...@@ -72,7 +72,7 @@ folderViewCpt = here.component "folderViewCpt" cpt where ...@@ -72,7 +72,7 @@ folderViewCpt = here.component "folderViewCpt" cpt where
    , nodeId , nodeId
    , reload , reload
    , session , session
    , setPopoverRef } } , setPopoverRef } [] }
    where where
    errorHandler err = here.log2 "[folderView] RESTError" err errorHandler err = here.log2 "[folderView] RESTError" err
    ...@@ -86,8 +86,8 @@ type FolderViewProps = ...@@ -86,8 +86,8 @@ type FolderViewProps =
    , setPopoverRef :: R.Ref (Maybe (Boolean -> Effect Unit)) , setPopoverRef :: R.Ref (Maybe (Boolean -> Effect Unit))
    ) )
    folderViewMain :: Record FolderViewProps -> R.Element folderViewMain :: R2.Component FolderViewProps
    folderViewMain props = R.createElement folderViewMainCpt props [] folderViewMain = R.createElement folderViewMainCpt
    folderViewMainCpt :: R.Component FolderViewProps folderViewMainCpt :: R.Component FolderViewProps
    folderViewMainCpt = here.component "folderViewMainCpt" cpt where folderViewMainCpt = here.component "folderViewMainCpt" cpt where
    cpt { backFolder cpt { backFolder
    ......
    src/Gargantext/Components/Forest/Tree/Node/Action/Upload.purs
    View file @ 992d6718
    ...@@ -97,7 +97,6 @@ uploadFileViewCpt = here.component "uploadFileView" cpt ...@@ -97,7 +97,6 @@ uploadFileViewCpt = here.component "uploadFileView" cpt
    lang <- T.useBox EN lang <- T.useBox EN
    selection <- T.useBox ListSelection.MyListsFirst selection <- T.useBox ListSelection.MyListsFirst
    let Session { treeId: root } = session
    let setFileType' val = T.write_ val fileType let setFileType' val = T.write_ val fileType
    let setLang' val = T.write_ val lang let setLang' val = T.write_ val lang
    ...@@ -131,7 +130,7 @@ uploadFileViewCpt = here.component "uploadFileView" cpt ...@@ -131,7 +130,7 @@ uploadFileViewCpt = here.component "uploadFileView" cpt
    ] ]
    , R2.row , R2.row
    [ H.div { className: "col-6 flex-space-around" } [ H.div { className: "col-6 flex-space-around" }
    [ ListSelection.selection { root, selection } [] ] [ ListSelection.selection { selection, session } [] ]
    ] ]
    ] ]
    ......
    src/Gargantext/Components/ListSelection.purs
    View file @ 992d6718
    ...@@ -2,17 +2,23 @@ module Gargantext.Components.ListSelection where ...@@ -2,17 +2,23 @@ module Gargantext.Components.ListSelection where
    import Gargantext.Prelude import Gargantext.Prelude
    import Control.Bind ((=<<))
    import Data.Array as A import Data.Array as A
    import Data.Either (Either)
    import Data.Eq.Generic (genericEq) import Data.Eq.Generic (genericEq)
    import Data.Generic.Rep (class Generic) import Data.Generic.Rep (class Generic)
    import Data.Maybe (Maybe(..)) import Data.Maybe (Maybe(..))
    import Gargantext.Components.App.Data (Boxes) import Data.Newtype (class Newtype)
    import Gargantext.Components.Forest.Tree.Node.Tools (formChoiceSafe) import Gargantext.Components.Forest.Tree.Node.Tools (formChoiceSafe)
    import Gargantext.Sessions (Session(..), unSessions) import Gargantext.Config.REST (RESTError(..), AffRESTError)
    import Gargantext.Types (ListId) import Gargantext.Hooks.Loader (useLoader)
    import Gargantext.Routes (SessionRoute(..))
    import Gargantext.Sessions (Session(..), get)
    import Gargantext.Types (ID, ListId, NodeType(..), fldr)
    import Gargantext.Utils.Reactix as R2 import Gargantext.Utils.Reactix as R2
    import Reactix as R import Reactix as R
    import Reactix.DOM.HTML as H import Reactix.DOM.HTML as H
    import Simple.JSON as JSON
    import Toestand as T import Toestand as T
    here :: R2.Here here :: R2.Here
    ...@@ -31,20 +37,25 @@ instance Read Selection where ...@@ -31,20 +37,25 @@ instance Read Selection where
    read "Selected lists" = Just $ SelectedLists [] read "Selected lists" = Just $ SelectedLists []
    read _ = Nothing read _ = Nothing
    selectedListIds :: Selection -> Array ListId
    selectedListIds (SelectedLists ids) = ids
    selectedListIds _ = []
    type Props = type Props =
    ( root :: Int ( selection :: T.Box Selection
    , selection :: T.Box Selection ) , session :: Session
    )
    selection :: R2.Component Props selection :: R2.Component Props
    selection = R.createElement selectionCpt selection = R.createElement selectionCpt
    selectionCpt :: R.Component Props selectionCpt :: R.Component Props
    selectionCpt = here.component "selection" cpt where selectionCpt = here.component "selection" cpt where
    cpt { root, selection } _ = do cpt { selection, session } _ = do
    pure $ H.div {} pure $ H.div { className: "list-selection" }
    [ formChoiceSafe [ MyListsFirst [ formChoiceSafe [ MyListsFirst
    , OtherListsFirst , OtherListsFirst
    , SelectedLists [] ] MyListsFirst setSelection show , SelectedLists [] ] MyListsFirst setSelection show
    , selectedIds { root, selection } [] , selectedIds { selection, session } []
    ] ]
    where where
    setSelection val = T.write_ val selection setSelection val = T.write_ val selection
    ...@@ -53,48 +64,155 @@ selectedIds :: R2.Component Props ...@@ -53,48 +64,155 @@ selectedIds :: R2.Component Props
    selectedIds = R.createElement selectedIdsCpt selectedIds = R.createElement selectedIdsCpt
    selectedIdsCpt :: R.Component Props selectedIdsCpt :: R.Component Props
    selectedIdsCpt = here.component "selectedIds" cpt where selectedIdsCpt = here.component "selectedIds" cpt where
    cpt { root, selection } _ = do cpt { selection, session } _ = do
    selection' <- T.useLive T.unequal selection selection' <- T.useLive T.unequal selection
    pure $ case selection' of pure $ case selection' of
    SelectedLists ids -> H.div {} [ idsSelector { ids, root, selection } [] ] SelectedLists ids -> H.div {} [ idsSelector { selection, session } [] ]
    _ -> H.div {} [] _ -> H.div {} []
    type IdsSelectorProps = type IdsSelectorProps =
    ( ids :: Array ListId ( selection :: T.Box Selection
    , root :: Int , session :: Session )
    , selection :: T.Box Selection )
    idsSelector :: R2.Component IdsSelectorProps idsSelector :: R2.Component IdsSelectorProps
    idsSelector = R.createElement idsSelectorCpt idsSelector = R.createElement idsSelectorCpt
    idsSelectorCpt :: R.Component IdsSelectorProps idsSelectorCpt :: R.Component IdsSelectorProps
    idsSelectorCpt = here.component "idsSelector" cpt where idsSelectorCpt = here.component "idsSelector" cpt where
    cpt { ids, root, selection } _ = do cpt { selection, session } _ = do
    R.useEffect' $ do pure $ H.div { className: "ids-selector" }
    here.log2 "[idsSelector] ids" ids [ listTree { name: "", root, selection, session } ] -- $ map checkbox [1, 2, 3, 4]
    pure $ H.div {} [ listTree { ids, root, selection } [] ] -- $ map checkbox [1, 2, 3, 4]
    where where
    checkbox val = H.div {} Session { treeId: root } = session
    [ H.input { className: "form-check-input"
    , on: { click } listIdsRoute :: ID -> SessionRoute
    , type: "checkbox" listIdsRoute = Children NodeList 0 1 Nothing <<< Just
    , value: A.elem val ids }
    , H.label {} [ H.text $ show val ] treeFirstLevelRoute :: ID -> SessionRoute
    ] treeFirstLevelRoute id = TreeFirstLevel (Just id) ""
    where
    click _ = do -- A simplified data structure (we don't want the full-blown (NodePoly
    let f (SelectedLists lst) = -- a), we care only about Corpus and NodeList node types, with id,
    if A.elem val ids -- name and that's all).
    then SelectedLists (A.delete val lst) newtype NodeSimple =
    else SelectedLists (A.cons val lst) NodeSimple { id :: ID
    f x = x , name :: String
    T.modify_ f selection , nodeType :: NodeType }
    derive instance Generic NodeSimple _
    listTree :: R2.Component IdsSelectorProps derive instance Newtype NodeSimple _
    listTree = R.createElement listTreeCpt derive instance Eq NodeSimple
    listTreeCpt :: R.Component IdsSelectorProps instance JSON.ReadForeign NodeSimple where
    readImpl f = do
    { node } :: { node :: { id :: ID
    , name :: String
    , type :: NodeType } } <- JSON.read' f
    pure $ NodeSimple { id: node.id
    , name: node.name
    , nodeType: node.type }
    loadTreeChildren :: { root :: ID, session :: Session } -> AffRESTError (Array NodeSimple)
    loadTreeChildren { root, session } = do
    eResult :: (Either RESTError { children :: Array NodeSimple }) <- get session $ treeFirstLevelRoute root
    pure $ (\{ children } -> children) <$> eResult
    type ListTreeProps =
    ( name :: String
    , root :: ID
    , selection :: T.Box Selection
    , session :: Session )
    listTree :: R2.Leaf ListTreeProps
    listTree props = R.createElement listTreeCpt props []
    listTreeCpt :: R.Component ListTreeProps
    listTreeCpt = here.component "listTree" cpt where listTreeCpt = here.component "listTree" cpt where
    cpt { ids, root, selection } _ = do cpt { name, root, selection, session } _ = do
    pure $ H.div { className: "tree" }
    [ H.div { className: "root" }
    [ H.i { className: fldr Corpus true } []
    , H.text $ "[" <> show root <> "] " <> name ]
    , listTreeChildren { render: listTree
    , root
    , selection
    , session } []
    ]
    type Render = Record ListTreeProps -> R.Element
    type ListTreeChildrenProps =
    ( render :: Render
    , root :: ID
    , selection :: T.Box Selection
    , session :: Session )
    listTreeChildren :: R2.Component ListTreeChildrenProps
    listTreeChildren = R.createElement listTreeChildrenCpt
    listTreeChildrenCpt :: R.Component ListTreeChildrenProps
    listTreeChildrenCpt = here.component "listTreeChildren" cpt where
    cpt { render, root, selection, session } _ = do
    useLoader { errorHandler
    , loader: loadTreeChildren
    , path: { root, session }
    , render: \loaded ->
    listTreeChildrenLoaded { loaded
    , render
    , root
    , selection
    , session } [] }
    where
    errorHandler err = case err of
    ReadJSONError err' -> here.log2 "[listTreeChildren] ReadJSONError" $ show err'
    _ -> here.log2 "[listTreeChildren] RESTError" err
    type ListTreeChildrenLoadedProps =
    ( loaded :: Array NodeSimple
    , render :: Render
    , root :: ID
    , selection :: T.Box Selection
    , session :: Session )
    listTreeChildrenLoaded :: R2.Component ListTreeChildrenLoadedProps
    listTreeChildrenLoaded = R.createElement listTreeChildrenLoadedCpt
    listTreeChildrenLoadedCpt :: R.Component ListTreeChildrenLoadedProps
    listTreeChildrenLoadedCpt = here.component "listTreeChildrenLoaded" cpt where
    cpt { loaded, render, root, selection, session } _ = do
    pure $ H.div { className: "children" } (element <$> loaded)
    where
    element (NodeSimple { id, name, nodeType: Corpus }) =
    render { root: id, name, selection, session }
    element (NodeSimple { id, name, nodeType: NodeList}) =
    renderListElement { id, name, selection }
    element _ = H.div {} []
    type RenderListElementProps =
    ( id :: ID
    , name :: String
    , selection :: T.Box Selection )
    renderListElement :: R2.Leaf RenderListElementProps
    renderListElement props = R.createElement renderListElementCpt props []
    renderListElementCpt :: R.Component RenderListElementProps
    renderListElementCpt = here.component "renderListElement" cpt where
    cpt { id, name, selection } _ = do
    selection' <- T.useLive T.unequal selection
    let ids = selectedListIds selection'
    R.useEffect' $ do
    here.log2 "[renderListElement] ids" ids
    here.log2 "[renderListElement] value" $ A.elem id ids
    pure $ H.div { className: "leaf" }
    [ H.input { checked: A.elem id ids
    , on: { click: click ids }
    , type: "checkbox" }
    , H.i { className: fldr NodeList true } []
    , H.text $ "[" <> show id <> "] " <> name
    ]
    where
    click ids _ = do
    let f (SelectedLists lst) =
    if A.elem id ids
    then SelectedLists (A.delete id lst)
    else SelectedLists (A.cons id lst)
    f x = x
    T.modify_ f selection
    pure $ H.div {} [ H.text $ show root ]
    src/Gargantext/Components/Node.purs
    View file @ 992d6718
    ...@@ -38,4 +38,5 @@ instance JSON.ReadForeign a => JSON.ReadForeign (NodePoly a) where ...@@ -38,4 +38,5 @@ instance JSON.ReadForeign a => JSON.ReadForeign (NodePoly a) where
    newtype HyperdataList = HyperdataList { preferences :: Maybe String } newtype HyperdataList = HyperdataList { preferences :: Maybe String }
    derive instance Generic HyperdataList _ derive instance Generic HyperdataList _
    derive instance Newtype HyperdataList _ derive instance Newtype HyperdataList _
    derive instance Eq HyperdataList
    derive newtype instance JSON.ReadForeign HyperdataList derive newtype instance JSON.ReadForeign HyperdataList
    src/Gargantext/Config/REST.purs
    View file @ 992d6718
    ...@@ -29,7 +29,6 @@ data RESTError = ...@@ -29,7 +29,6 @@ data RESTError =
    SendResponseError Affjax.Error SendResponseError Affjax.Error
    | ReadJSONError Foreign.MultipleErrors | ReadJSONError Foreign.MultipleErrors
    | CustomError String | CustomError String
    derive instance Generic RESTError _ derive instance Generic RESTError _
    instance Show RESTError where instance Show RESTError where
    show (SendResponseError e) = "SendResponseError " <> showError e show (SendResponseError e) = "SendResponseError " <> showError e
    ...@@ -45,6 +44,8 @@ instance Eq RESTError where ...@@ -45,6 +44,8 @@ instance Eq RESTError where
    -- this is crude but we need it only because of useLoader -- this is crude but we need it only because of useLoader
    eq _ _ = false eq _ _ = false
    type AffRESTError a = Aff (Either RESTError a)
    readJSON :: forall a b. JSON.ReadForeign a => readJSON :: forall a b. JSON.ReadForeign a =>
    Either Affjax.Error Either Affjax.Error
    ......
    src/sass/_tree.sass
    View file @ 992d6718
    ...@@ -327,3 +327,13 @@ li ...@@ -327,3 +327,13 @@ li
    &:last-child &:last-child
    margin-bottom: $forest-layout-bottom-teaser-height margin-bottom: $forest-layout-bottom-teaser-height
    /////////////////////////////////////////
    .ids-selector
    .tree
    .children
    padding-left: 0.5em
    .leaf
    input
    margin: 0.1em
    yarn.lock
    View file @ 992d6718
    ...@@ -1609,16 +1609,11 @@ bootstrap-dark@^1.0.3: ...@@ -1609,16 +1609,11 @@ bootstrap-dark@^1.0.3:
    dependencies: dependencies:
    bootstrap ">=4.3" bootstrap ">=4.3"
    bootstrap@>=4.3: bootstrap@>=4.3, bootstrap@^5.1.0:
    version "5.1.0" version "5.1.0"
    resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.0.tgz#543ef8f44f4b9af67b0230f19508542fec38ef55" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.0.tgz#543ef8f44f4b9af67b0230f19508542fec38ef55"
    integrity sha512-bs74WNI9BgBo3cEovmdMHikSKoXnDgA6VQjJ7TyTotU6L7d41ZyCEEelPwkYEzsG/Zjv3ie9IE3EMAje0W9Xew== integrity sha512-bs74WNI9BgBo3cEovmdMHikSKoXnDgA6VQjJ7TyTotU6L7d41ZyCEEelPwkYEzsG/Zjv3ie9IE3EMAje0W9Xew==
    bootstrap@^4.6.0:
    version "4.6.0"
    resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
    integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
    boxen@1.3.0: boxen@1.3.0:
    version "1.3.0" version "1.3.0"
    resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment