diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index bbf6f23e2..000000000 --- a/.eslintignore +++ /dev/null @@ -1,11 +0,0 @@ -public -src/frontend/components/dashboard/lib/react/polyfills -babel.config.js -webpack.config.js -jest.config.js -tsconfig.json -src/frontend/js/lib/jqplot -src/frontend/js/lib/jquery -src/frontend/js/lib/plotly -src/frontend/components/timeline -fengari-web.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 9d2f57a34..000000000 --- a/.eslintrc.js +++ /dev/null @@ -1,46 +0,0 @@ -module.exports = { - "env": { - "browser": true, - "es6": true, - "jest": true, - "jquery": true, - }, - "settings": { - "react": { - "version": "detect" - } - }, - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:react/recommended" - ], - "overrides": [ - { - "env": { - "node": true, - }, - "files": [ - ".eslintrc.{js,cjs}" - ], - "parserOptions": { - "sourceType": "script" - } - } - ], - "parser": "@typescript-eslint/parser", - "parserOptions": { - "ecmaVersion": "es6", - "sourceType": "module" - }, - "plugins": [ - "@typescript-eslint", - "react" - ], - "rules": { - "react/prop-types": 0, - "@typescript-eslint/no-explicit-any": 0, - "no-prototype-builtins": 0, - "@typescript-eslint/ban-types": 0, - } -}; diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7e2e364dc..5280c46f7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -157,9 +157,11 @@ jobs: echo '*:*:*:postgres:postgrespassword' > ~/.pgpass chmod 600 ~/.pgpass - name: 'Install YARN dependencies' + # If the code isn't built (public dir) then the tests will fail run: | sudo apt-get install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb yarn + yarn build --no-watch - name: 'Start the application' env: DANCER_CONFDIR: 'webdriver' diff --git a/.gitigore b/.gitigore deleted file mode 100644 index 722d5e71d..000000000 --- a/.gitigore +++ /dev/null @@ -1 +0,0 @@ -.vscode diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index a552917c6..000000000 --- a/.jshintrc +++ /dev/null @@ -1,22 +0,0 @@ -{ - "curly":true, - "eqeq":true, - "esversion":5, - "forin":true, - "freeze":true, - "futurehostile":true, - "latedef":true, - "nocomma":true, - "nonbsp":true, - "nonew":true, - "shadow":"inner", - "singleGroups":true, - "strict":true, - "trailingcomma":true, - "undef":true, - "unused":true, - "varstmt":false, - - "browser":true - -} diff --git a/.stylelintrc.js b/.stylelintrc.js deleted file mode 100644 index e1aa130db..000000000 --- a/.stylelintrc.js +++ /dev/null @@ -1,233 +0,0 @@ -module.exports = { - extends: 'stylelint-config-standard', - plugins: ['stylelint-order', 'stylelint-declaration-strict-value'], - rules: { - 'at-rule-no-unknown': [ - true, - { - ignoreAtRules: ['at-root', 'content', 'function', 'include', 'mixin', 'if', 'else', 'return', 'extend'], - }, - ], - 'at-rule-no-vendor-prefix': true, - 'color-hex-case': 'upper', - 'declaration-block-trailing-semicolon': 'always', - 'declaration-no-important': true, - 'property-no-vendor-prefix': true, - 'selector-max-id': 0, - 'selector-max-universal': 1, - 'selector-no-qualifying-type': [ - true, - { - ignore: ['attribute'], - } - ], - 'value-no-vendor-prefix': true, - 'order/order': [ - 'dollar-variables', - 'custom-properties', - { - type: 'at-rule', - name: 'include', - hasBlock: false, - }, - 'declarations', - 'rules', - { - type: 'at-rule', - name: 'include', - hasBlock: true, - }, - ], - 'order/properties-order': [ - 'content', - 'quotes', - 'display', - 'visibility', - 'position', - 'z-index', - 'top', - 'right', - 'bottom', - 'left', - 'box-sizing', - 'flex', - 'flex-basis', - 'flex-direction', - 'flex-flow', - 'flex-grow', - 'flex-shrink', - 'flex-wrap', - 'align-content', - 'align-items', - 'align-self', - 'justify-content', - 'order', - 'width', - 'min-width', - 'max-width', - 'height', - 'min-height', - 'max-height', - 'margin', - 'margin-top', - 'margin-right', - 'margin-bottom', - 'margin-left', - 'padding', - 'padding-top', - 'padding-right', - 'padding-bottom', - 'padding-left', - 'float', - 'clear', - 'overflow', - 'overflow-x', - 'overflow-y', - 'clip', - 'zoom', - 'columns', - 'column-gap', - 'column-fill', - 'column-rule', - 'column-span', - 'column-count', - 'column-width', - 'data-table-layout', - 'empty-cells', - 'caption-side', - 'border-spacing', - 'border-collapse', - 'list-style', - 'list-style-position', - 'list-style-type', - 'list-style-image', - 'transform', - 'transform-origin', - 'transform-style', - 'backface-visibility', - 'perspective', - 'perspective-origin', - 'transition', - 'transition-property', - 'transition-duration', - 'transition-timing-function', - 'transition-delay', - 'animation', - 'animation-name', - 'animation-duration', - 'animation-play-state', - 'animation-timing-function', - 'animation-delay', - 'animation-iteration-count', - 'animation-direction', - 'border', - 'border-top', - 'border-right', - 'border-bottom', - 'border-left', - 'border-width', - 'border-top-width', - 'border-right-width', - 'border-bottom-width', - 'border-left-width', - 'border-style', - 'border-top-style', - 'border-right-style', - 'border-bottom-style', - 'border-left-style', - 'border-radius', - 'border-top-left-radius', - 'border-top-right-radius', - 'border-bottom-left-radius', - 'border-bottom-right-radius', - 'border-color', - 'border-top-color', - 'border-right-color', - 'border-bottom-color', - 'border-left-color', - 'outline', - 'outline-color', - 'outline-offset', - 'outline-style', - 'outline-width', - 'stroke-width', - 'stroke-linecap', - 'stroke-dasharray', - 'stroke-dashoffset', - 'stroke', - 'opacity', - 'background', - 'background-color', - 'background-image', - 'background-repeat', - 'background-position', - 'background-size', - 'box-shadow', - 'fill', - 'color', - 'font', - 'font-family', - 'font-size', - 'font-size-adjust', - 'font-stretch', - 'font-effect', - 'font-style', - 'font-variant', - 'font-weight', - 'font-emphasize', - 'font-emphasize-position', - 'font-emphasize-style', - 'letter-spacing', - 'line-height', - 'list-style', - 'word-spacing', - 'text-align', - 'text-align-last', - 'text-decoration', - 'text-indent', - 'text-justify', - 'text-overflow', - 'text-overflow-ellipsis', - 'text-overflow-mode', - 'text-rendering', - 'text-outline', - 'text-shadow', - 'text-transform', - 'text-wrap', - 'word-wrap', - 'word-break', - 'text-emphasis', - 'text-emphasis-color', - 'text-emphasis-style', - 'text-emphasis-position', - 'vertical-align', - 'white-space', - 'word-spacing', - 'hyphens', - 'src', - 'tab-size', - 'counter-reset', - 'counter-increment', - 'resize', - 'cursor', - 'pointer-events', - 'speak', - 'user-select', - 'nav-index', - 'nav-up', - 'nav-right', - 'nav-down', - 'nav-left', - ], - 'scale-unlimited/declaration-strict-value': [ - ["/color/", "fill", "stroke"], - { - ignoreKeywords: { - "color": ["currentColor", "transparent", "inherit"], - "fill": ["currentColor", "transparent", "inherit"], - "stroke": ["currentColor", "transparent", "inherit"], - } - }, - ], - } -} diff --git a/cypress/e2e/functionality/02-homepage.cy.ts b/cypress/e2e/functionality/02-homepage.cy.ts index 5c3c4eaab..bba917fdd 100644 --- a/cypress/e2e/functionality/02-homepage.cy.ts +++ b/cypress/e2e/functionality/02-homepage.cy.ts @@ -2,17 +2,14 @@ import { goodPassword, goodUser } from "../../support/constants"; describe('Dashboard Tests', () => { const bigLipsum = `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque accumsan, sem et vulputate imperdiet, enim ipsum rhoncus massa, sit amet pellentesque lacus urna sit amet enim. In tristique mollis tincidunt. Sed eget ligula metus. Integer sodales placerat erat. Aliquam erat volutpat. Curabitur varius lacinia diam fringilla efficitur. Sed euismod purus vel turpis molestie, ac fringilla nisi vestibulum. Maecenas ullamcorper ornare dui sodales gravida. Donec maximus egestas eleifend. Etiam in ultrices ante. Duis quis volutpat turpis. Nulla dignissim ornare aliquet. -Fusce interdum gravida est, sit amet vehicula nisi suscipit at. Pellentesque nec fermentum leo, in vehicula nulla. Nam dapibus ultricies tortor in maximus. Donec enim velit, molestie nec feugiat sed, posuere non ex. Nulla pellentesque gravida feugiat. Sed ornare purus vel libero semper aliquet. Nulla rutrum nunc sed vulputate gravida. Cras lobortis, lacus non tincidunt suscipit, leo quam vehicula libero, in vehicula diam justo ac est. -Mauris tempus, mi nec sodales semper, metus neque blandit sem, non scelerisque nunc libero eu augue. Cras ornare ut lectus in mattis. Quisque magna elit, efficitur nec dolor sed, semper dictum nunc. Cras ultricies, augue eget interdum aliquam, quam ex blandit sem, nec sollicitudin ex elit non mauris. Fusce dui justo, feugiat id lacus sit amet, pulvinar tristique felis. Etiam rhoncus ex ut congue aliquet. Sed at felis eget neque rhoncus malesuada. Aliquam commodo condimentum massa, sed volutpat nibh congue et. Maecenas blandit massa sed nisl pulvinar, vitae consectetur tortor placerat. Nulla laoreet diam ipsum, sit amet consectetur sem condimentum quis. Nullam et justo sem. Sed et sapien tempus, scelerisque nisl ac, pretium arcu. -Donec quis finibus ante. Nulla et dui posuere, semper elit quis, maximus ipsum. Aliquam ante nulla, pellentesque sed neque sit amet, finibus cursus est. Aliquam sed sollicitudin orci. Nulla malesuada augue lectus, ac tincidunt orci fermentum ac. Nullam pulvinar diam felis, sed condimentum arcu ornare sit amet. Praesent eget lobortis purus. In hac habitasse platea dictumst. Ut lorem nisl, fringilla vitae quam lobortis, vehicula egestas magna. Sed convallis placerat ante quis convallis. Vivamus pharetra quam diam, ut ultricies neque mollis vitae. Morbi augue tellus, feugiat a interdum a, tincidunt vel ante. -Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut porttitor risus, at pulvinar tortor. Integer eleifend volutpat efficitur. Maecenas massa odio, pharetra eu eleifend eu, volutpat sed dui. Donec efficitur sed risus sit amet imperdiet. Pellentesque nec arcu non nibh congue cursus et a sapien. Phasellus ullamcorper magna nec varius facilisis. Curabitur et tempus est. Nulla tincidunt porttitor mollis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean vitae pretium felis. Aliquam vehicula et nisl sit amet pharetra. Nulla ac sollicitudin velit. Cras egestas ac sem vitae sollicitudin. Nullam convallis risus id massa vestibulum imperdiet. Cras in enim sit amet ligula placerat eleifend.` +Fusce interdum gravida est, sit amet vehicula nisi suscipit at. Pellentesque nec fermentum leo, in vehicula nulla. Nam dapibus ultricies tortor in maximus. Donec enim velit, molestie nec feugiat sed, posuere non ex. Nulla pellentesque gravida feugiat. Sed ornare purus vel libero semper aliquet. Nulla rutrum nunc sed vulputate gravida. Cras lobortis, lacus non tincidunt suscipit, leo quam vehicula libero, in vehicula diam justo ac est.` beforeEach(() => { - cy.loginAndGoTo(goodUser, goodPassword, 'http://localhost:3000/?did=1'); + cy.loginAndGoTo(goodUser, goodPassword, 'http://localhost:3000/'); }) afterEach(() => { - cy.visit('http://localhost:3000/?did=1'); + cy.visit('http://localhost:3000/'); cy.location("pathname").should("not.include", "/login"); cy.getByTitle("Logout") .should("exist") @@ -21,54 +18,66 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut }) it('Displays the home page correctly', () => { - cy.get("li.list__item").eq(0) + cy.get("div.nav-item").eq(0) .should("exist") .contains("Home dashboard (shared)") - .should("have.class", "link--active"); - cy.get("li.list__item").eq(1) + .should("have.class", "active"); + cy.get("div.nav-item").eq(1) .should("exist") .contains("Home dashboard (personal)") - .should("not.have.class", "link--active"); + .should("not.have.class", "active"); }); it('Should navigate to the personal dashboard', () => { - cy.get("li.list__item").eq(1) + cy.get("div.nav-item").eq(1) .should("exist") - .should("not.have.class", "link--active") + .children("a") + .should("not.have.class", "active") .click(); + cy.get("div.nav-item").eq(1) + .should("exist") + .children("a") + .should("have.class", "active"); }); it('Should navigate to the shared dashboard', () => { - cy.get("li.list__item").eq(0) + cy.get("div.nav-item").eq(0) .should("exist") - .should("not.have.class", "link--active") + .children("a") + .should("not.have.class", "active") .click(); + cy.get("div.nav-item").eq(0) + .should("exist") + .children("a") + .should("have.class", "active"); }); context("Shared Dashboard", () => { it('Should cancel creation of a shared dashboard widget', () => { + cy.visit('http://localhost:3000/?did=1'); cy.get(".ld-footer-container") .find("button") .eq(1) .click(); cy.get(".ld-footer-container") - .find(".dropdown__menu") + .find(".dropdown-menu") .find("a") - .eq(1) + .eq(0) .click(); cy.get("[aria-label='Edit Modal']").find("button.btn-cancel").click(); cy.get(".ld-widget").should("have.length", 0); }); it("Should create a shared dashboard widget", () => { + cy.visit('http://localhost:3000/?did=1'); cy.get(".ld-footer-container") .find("button") .eq(1) .click(); cy.get(".ld-footer-container") - .find(".dropdown__menu") + .find(".dropdown-menu") .find("a") - .eq(1) + .eq(0) .click(); cy.get("[aria-label='Edit Modal']") .find("input[name='title']", { timeout: 10000 }) @@ -81,6 +90,7 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut }); it("Should edit a shared dashboard widget", () => { + cy.visit('http://localhost:3000/?did=1'); cy.get(".ld-widget").find(".ld-edit-button").click(); cy.get("[aria-label='Edit Modal']") .find("input[name='title']", { timeout: 10000 }) @@ -95,6 +105,7 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut }); it("Should edit a shared dashboard widget with a lot of text", () => { + cy.visit('http://localhost:3000/?did=1'); cy.get(".ld-widget").find(".ld-edit-button").click(); cy.get("[aria-label='Edit Modal']") .find("input[name='title']", { timeout: 10000 }) @@ -109,6 +120,7 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut }); it("Should delete a shared dashboard widget", () => { + cy.visit('http://localhost:3000/?did=1'); cy.get(".ld-widget").find(".ld-edit-button").click(); cy.get("[aria-label='Edit Modal']") .find("input[name='title']", { timeout: 10000 }) @@ -120,30 +132,30 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut context("Personal Dashboard", () => { it('Should cancel creation of a personal dashboard widget', () => { - cy.get("a.link--primary").click(); + cy.visit('http://localhost:3000/?did=2'); cy.get(".ld-footer-container") .find("button") .eq(1) .click(); cy.get(".ld-footer-container") - .find(".dropdown__menu") + .find(".dropdown-menu") .find("a") - .eq(1) + .eq(0) .click(); cy.get("[aria-label='Edit Modal']").find("button.btn-cancel").click(); cy.get(".ld-widget").should("have.length", 1); }); it("Should create a personal dashboard widget", () => { - cy.get("a.link--primary").click(); + cy.visit('http://localhost:3000/?did=2'); cy.get(".ld-footer-container") .find("button") .eq(1) .click(); cy.get(".ld-footer-container") - .find(".dropdown__menu") + .find(".dropdown-menu") .find("a") - .eq(1) + .eq(0) .click(); cy.get("[aria-label='Edit Modal']") .find("input[name='title']", { timeout: 10000 }) @@ -156,7 +168,7 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut }); it("Should edit a personal dashboard widget", () => { - cy.get("a.link--primary").click(); + cy.visit('http://localhost:3000/?did=2'); cy.get(".ld-widget").eq(1).find(".ld-edit-button").click(); cy.get("[aria-label='Edit Modal']") .find("input[name='title']", { timeout: 10000 }) @@ -171,7 +183,7 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut }); it("Should edit a personal dashboard widget with a lot of text", () => { - cy.get("a.link--primary").click(); + cy.visit('http://localhost:3000/?did=2'); cy.get(".ld-widget").eq(1).find(".ld-edit-button").click(); cy.get("[aria-label='Edit Modal']") .find("input[name='title']", { timeout: 10000 }) @@ -186,7 +198,7 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut }); it("Should delete a personal dashboard widget", () => { - cy.get("a.link--primary").click(); + cy.visit('http://localhost:3000/?did=2'); cy.get(".ld-widget").eq(1).find(".ld-edit-button").click(); cy.get("[aria-label='Edit Modal']") .find("input[name='title']", { timeout: 10000 }) diff --git a/cypress/e2e/functionality/06-tables-and-wizard.cy.ts b/cypress/e2e/functionality/06-tables-and-wizard.cy.ts index 715778acb..1905d7050 100644 --- a/cypress/e2e/functionality/06-tables-and-wizard.cy.ts +++ b/cypress/e2e/functionality/06-tables-and-wizard.cy.ts @@ -8,7 +8,7 @@ describe('Another Test Suite', () => { //attempt save with incorrect (fails) it.skip('should fail to save new table with invalid shortname ', () => { - cy.get('[data-target="#newTableModal"]').click(); + cy.get('[data-bs-target="#newTableModal"]').click(); cy.get('#shortName').type('This value wont $4v£'); cy.get("#name").type("table to fail"); cy.get('.btn-js-next').eq(0).click(); @@ -19,7 +19,7 @@ describe('Another Test Suite', () => { }); it('should save a new table successfully', () => { - cy.get('[data-target="#newTableModal"]').click(); + cy.get('[data-bs-target="#newTableModal"]').click(); cy.get('#shortName').type('1-test_table'); cy.get("#name").type("1-test-table"); cy.get('.btn-js-next').eq(0).click(); diff --git a/cypress/support/builders/layout/LayoutBuilder.ts b/cypress/support/builders/layout/LayoutBuilder.ts index 4d10a75fd..7568543ca 100644 --- a/cypress/support/builders/layout/LayoutBuilder.ts +++ b/cypress/support/builders/layout/LayoutBuilder.ts @@ -52,7 +52,7 @@ abstract class LayoutBuilderBase implements ILayoutBuilder { build(navigate:boolean = false): void { if (navigate) { cy.visit("http://localhost:3000/table"); - cy.getDataTable() + cy.get("table") .find("tbody") .find("tr").first() .find("a").contains("Edit table") @@ -68,7 +68,7 @@ abstract class LayoutBuilderBase implements ILayoutBuilder { .type(this.name); this.setType(); if (this.shortName) { - cy.get("button") + cy.get("span") .contains("Advanced settings") .click(); cy.get("input[name='name_short']") @@ -101,7 +101,7 @@ abstract class LayoutBuilderBase implements ILayoutBuilder { } protected setPermissions(): void { - cy.get("button") + cy.get("span") .contains("Permissions") .click(); cy.getDataTable() @@ -135,14 +135,14 @@ class CodeLayoutBuilder extends LayoutBuilderBase implements ICodeLayoutBuilder buildSpecific() { // Expand the code editor if (this.layoutType === "RAG") { - cy.get("button") + cy.get("span") .contains("Field settings for RAG") .click(); // Enter the code cy.get("textarea[name='code_rag']") .type(this.code); } else if (this.layoutType === "CALC") { - cy.get("button") + cy.get("span") .contains("Field settings for calculated value") .click(); cy.get("textarea[name='code_calc']") @@ -174,7 +174,7 @@ class DropdownLayoutBuilder extends LayoutBuilderBase implements IDropdownLayout buildSpecific() { // Expand the options - cy.get("button") + cy.get("span") .contains("Field settings for dropdown list") .click(); // Enter the options @@ -210,7 +210,7 @@ class CurvalLayoutBuilder extends LayoutBuilderBase implements ICurvalLayoutBuil buildSpecific() { // Expand Field settings - cy.get("button") + cy.get("span") .contains("Field settings for fields from another table") .click(); // Enter the options @@ -222,7 +222,7 @@ class CurvalLayoutBuilder extends LayoutBuilderBase implements ICurvalLayoutBuil cy.get("label") .contains(this.field) .click(); - cy.get("button.btn-xs[data-delete='rule']") + cy.get("button.btn-sm[data-delete='rule']") .eq(1) .click(); //Someone owes me a drink! diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index 0e6209977..0f0b1acec 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/no-namespace */ /// import { IBuildable } from "./builders/layout/interfaces"; diff --git a/jest.config.js b/jest.config.js index f7fea59ff..487f06dbf 100644 --- a/jest.config.js +++ b/jest.config.js @@ -97,6 +97,7 @@ const config = { "^components/(.*)$": "/src/frontend/components/$1", "^set-field-values$": "/src/frontend/js/lib/set-field-values", "^guid$": "/src/frontend/js/lib/guid", + "^testing/(.*)$": "/src/frontend/testing/$1", }, // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader @@ -141,7 +142,7 @@ const config = { // runner: "jest-runner", // The paths to modules that run some code to configure or set up the testing environment before each test - // setupFiles: [], + setupFiles: ['./src/frontend/testing/setup.ts'], // A list of paths to modules that run some code to configure or set up the testing framework before each test // setupFilesAfterEnv: [], diff --git a/lib/GADS.pm b/lib/GADS.pm index 501ad4f85..3a7818db8 100644 --- a/lib/GADS.pm +++ b/lib/GADS.pm @@ -414,7 +414,7 @@ get '/' => require_login sub { dashboards_json => schema->resultset('Dashboard')->dashboards_json(%params), page => 'index', 'content_block_main_custom_classes' => 'pt-0', - 'content_block_custom_classes' => 'pl-0' + 'content_block_custom_classes' => 'ps-0' }; if (my $download = param('download')) @@ -2129,7 +2129,7 @@ prefix '/:layout_name' => sub { dashboards_json => schema->resultset('Dashboard')->dashboards_json(%params), page => 'table_index', header_type => "table_tabs", - content_block_custom_classes => "pl-0", + content_block_custom_classes => "ps-0", content_block_main_custom_classes => "pt-0", header_back_url => "${base_url}table", layout_obj => $layout, diff --git a/package.json b/package.json index 08d0428c1..074d4d867 100644 --- a/package.json +++ b/package.json @@ -16,83 +16,85 @@ "e2e:electron": "yarn cypress run --browser electron" }, "dependencies": { - "@egjs/hammerjs": "^2.0.0", - "@lol768/jquery-querybuilder-no-eval": "^2.6.0", - "bootstrap": "4.6", - "bootstrap-datepicker": "^1.9.0", + "@egjs/hammerjs": "^2.0.17", + "@popperjs/core": "^2.11.8", + "bootstrap": "^5.3.3", + "bootstrap-datepicker": "^1.10.0", "bootstrap-html5sortable": "^1.0.0", "bootstrap-select": "^1.13.18", "component-emitter": "^1.3.0", - "datatables.net-bs4": "^2.0.8", - "datatables.net-buttons-bs4": "^3.0.2", - "datatables.net-responsive-bs4": "^3.0.2", - "datatables.net-rowreorder-bs4": "^1.5.0", + "datatables.net-bs5": "^2.2.2", + "datatables.net-buttons-bs5": "^3.2.2", + "datatables.net-responsive-bs5": "^3.0.3", + "datatables.net-rowreorder-bs5": "^1.5.0", "form-serialize": "^0.7.2", - "handlebars": "^4.7.7", - "imports-loader": "^1.2.0", - "jquery": "^3.6.0", + "handlebars": "^4.7.8", + "imports-loader": "^5.0.0", + "jQuery-QueryBuilder": "^3.0.0", + "jquery": "^3.7.1", "jquery-ui-sortable-npm": "^1.0.0", - "jstree": "^3.3.12", - "keycharm": "^0.3.0", - "marked": "^9.1.1", - "moment": "^2.24.0", - "popper.js": "^1.16.1", - "propagating-hammerjs": "^1.4.0", - "react": "^16.13.1", - "react-app-polyfill": "^1.0.6", - "react-dom": "^16.13.1", - "react-grid-layout": "^0.18.3", - "react-modal": "^3.11.2", - "regenerator-runtime": "^0.13.11", - "summernote": "^0.8.20", + "jstree": "^3.3.17", + "keycharm": "^0.4.0", + "marked": "^15.0.7", + "moment": "^2.30.1", + "postcss": "^8.5.1", + "propagating-hammerjs": "^2.0.0", + "react": "^19.0.0", + "react-app-polyfill": "^3.0.0", + "react-bootstrap": "^2.10.9", + "react-dom": "^19.0.0", + "react-grid-layout": "^1.5.0", + "react-modal": "^3.16.3", + "regenerator-runtime": "^0.14.1", + "summernote": "^0.9.1", "tippy.js": "^6.3.7", "typeahead.js": "^0.11.1", - "uuid": "^7.0.0", - "vis-data": "^6.3.0", - "vis-timeline": "7.4.3", - "vis-util": "^4.0.0" + "uuid": "^9.0.0", + "vis-data": "^7.1.9", + "vis-timeline": "^7.7.3", + "vis-util": "^5.0.7", + "xss": "^1.0.15" }, "devDependencies": { - "@babel/core": "^7.14.6", - "@babel/plugin-transform-react-jsx": "^7.22.15", - "@babel/preset-env": "^7.14.7", - "@babel/preset-react": "^7.16.7", - "@babel/preset-typescript": "^7.16.7", - "@babel/runtime-corejs3": "^7.14.7", + "@babel/core": "^7.26.8", + "@babel/plugin-transform-react-jsx": "^7.25.9", + "@babel/preset-env": "^7.26.8", + "@babel/preset-react": "^7.26.3", + "@babel/preset-typescript": "^7.26.0", + "@babel/runtime-corejs3": "^7.26.7", "@jest/globals": "^29.7.0", - "@types/jest": "^29.5.6", - "@types/jquery": "^3.5.24", + "@testing-library/dom": "^10.4.0", + "@testing-library/react": "^16.2.0", + "@types/bootstrap": "^5.2.10", + "@types/form-serialize": "^0.7.4", + "@types/jquery": "^3.5.32", "@types/jstree": "^3.3.46", - "@types/react": "^17.0.41", - "@types/react-dom": "^17.0.14", - "@types/react-grid-layout": "^1.3.2", + "@types/react": "^19.0.8", + "@types/react-bootstrap": "^0.32.37", + "@types/react-dom": "^19.0.3", + "@types/react-grid-layout": "^1.3.5", + "@types/react-modal": "^3.16.3", "@types/typeahead.js": "^0.11.6", - "@typescript-eslint/eslint-plugin": "^7.7.0", - "@typescript-eslint/parser": "^7.7.0", - "@webpack-cli/serve": "^2.0.1", - "autoprefixer": "^9.8.8", - "babel-jest": "^29.7.0", - "babel-loader": "^8.2.2", - "buffer": "^6.0.3", + "@webpack-cli/serve": "^3.0.1", + "autoprefixer": "^10.4.20", + "babel-loader": "^9.2.1", "clean-webpack-plugin": "^4.0.0", - "copy-webpack-plugin": "6", - "core-js": "^3.15.2", - "css-loader": "^3.2.0", - "cypress": "^13.7.2", - "eslint": "^8.57.0", - "eslint-plugin-react": "^7.34.1", + "copy-webpack-plugin": "^12.0.2", + "core-js": "^3.40.0", + "css-loader": "^7.1.2", + "cypress": "^14.0.2", + "express": "^4.21.2", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", - "mini-css-extract-plugin": "^2.7.2", - "postcss-loader": "^3.0.0", - "sass": "^1.23.7", - "sass-loader": "^8.0.0", - "terser-webpack-plugin": "^5.3.6", - "ts-loader": "~8.2.0", - "typescript": "5.4.3", - "webpack": "^5.75.0", - "webpack-cli": "^5.0.1", - "webpack-dev-server": "^4.11.1", + "mini-css-extract-plugin": "^2.9.2", + "postcss-loader": "^8.1.1", + "sass": "^1.84.0", + "sass-loader": "^16.0.4", + "terser-webpack-plugin": "^5.3.11", + "ts-loader": "^9.5.2", + "typescript": "^5.7.3", + "webpack": "^5.97.1", + "webpack-cli": "^6.0.1", "webpack-manifest-plugin": "^5.0.0" }, "browserslist": [ diff --git a/public/js/163.f2109b00d1673a47556d.js b/public/js/163.3c3893feef4a66b1d89e.js similarity index 100% rename from public/js/163.f2109b00d1673a47556d.js rename to public/js/163.3c3893feef4a66b1d89e.js diff --git a/public/js/222.21f68ea0f350d6f85d6c.js b/public/js/222.0fdb0534aae8b292556f.js similarity index 100% rename from public/js/222.21f68ea0f350d6f85d6c.js rename to public/js/222.0fdb0534aae8b292556f.js diff --git a/public/js/258.67bff1d4e3460316c547.js b/public/js/258.67bff1d4e3460316c547.js new file mode 100644 index 000000000..ae286330a --- /dev/null +++ b/public/js/258.67bff1d4e3460316c547.js @@ -0,0 +1 @@ +"use strict";(self.webpackChunklinkspace=self.webpackChunklinkspace||[]).push([[258],{38258:(e,t,n)=>{n.r(t),n.d(t,{default:()=>r});var o=n(17527),s=(n(86888),n(11977)),a=n(74692);class i extends o.uA{constructor(e){super(e),this.initSummerNote()}initSummerNote(){const e=this;a(this.element).summernote({toolbar:[["style",["style"]],["font",["bold","underline","clear"]],["fontname",["fontname"]],["color",["color"]],["para",["ul","ol","paragraph"]],["table",["table"]],["insert",["link","picture","video"]],["view",["codeview","help"]]],dialogsInBody:!0,height:400,callbacks:{onInit:function(){const e=a(this).siblings("input[type=hidden].summernote_content");a(this).summernote("code",e.val())},onImageUpload:function(t){for(var n=0;n{n.r(t),n.d(t,{default:()=>i});var o=n(17527),s=(n(86888),n(11977)),a=n(74692);class SummerNoteComponent extends o.uA{constructor(e){super(e),this.initSummerNote()}initSummerNote(){const e=this;a(this.element).summernote({toolbar:[["style",["style"]],["font",["bold","underline","clear"]],["fontname",["fontname"]],["color",["color"]],["para",["ul","ol","paragraph"]],["table",["table"]],["insert",["link","picture","video"]],["view",["codeview","help"]]],dialogsInBody:!0,height:400,callbacks:{onInit:function(){const e=a(this).siblings("input[type=hidden].summernote_content");a(this).summernote("code",e.val())},onImageUpload:function(t){for(var n=0;n{"use strict";function n(e){var t,r,o="";if("string"==typeof e||"number"==typeof e)o+=e;else if("object"==typeof e)if(Array.isArray(e))for(t=0;to,default:()=>i});const i=o},50411:(e,t,r)=>{var n;!function(){"use strict";var o=!("undefined"==typeof window||!window.document||!window.document.createElement),i={canUseDOM:o,canUseWorkers:"undefined"!=typeof Worker,canUseEventListeners:o&&!(!window.addEventListener&&!window.attachEvent),canUseViewport:o&&!!window.screen};void 0===(n=function(){return i}.call(t,r,t,e))||(e.exports=n)}()},2076:e=>{var t=/^(?:submit|button|image|reset|file)$/i,r=/^(?:input|select|textarea|keygen)/i,n=/(\[[^\[\]]*\])/g;function o(e,t,r){if(0===t.length)return e=r;var n=t.shift(),i=n.match(/^\[(.+?)\]$/);if("[]"===n)return e=e||[],Array.isArray(e)?e.push(o(null,t,r)):(e._values=e._values||[],e._values.push(o(null,t,r))),e;if(i){var a=i[1],u=+a;isNaN(u)?(e=e||{})[a]=o(e[a],t,r):(e=e||[])[u]=o(e[u],t,r)}else e[n]=o(e[n],t,r);return e}function i(e,t,r){if(t.match(n)){o(e,function(e){var t=[],r=new RegExp(n),o=/^([^\[\]]*)/.exec(e);for(o[1]&&t.push(o[1]);null!==(o=r.exec(e));)t.push(o[1]);return t}(t),r)}else{var i=e[t];i?(Array.isArray(i)||(e[t]=[i]),e[t].push(r)):e[t]=r}return e}function a(e,t,r){return r=r.replace(/(\r)?\n/g,"\r\n"),r=(r=encodeURIComponent(r)).replace(/%20/g,"+"),e+(e?"&":"")+encodeURIComponent(t)+"="+r}e.exports=function(e,n){"object"!=typeof n?n={hash:!!n}:void 0===n.hash&&(n.hash=!0);for(var o=n.hash?{}:"",u=n.serializer||(n.hash?i:a),s=e&&e.elements?e.elements:[],l=Object.create(null),c=0;c{e=r.nmd(e);var n="__lodash_hash_undefined__",o=1,i=2,a=9007199254740991,u="[object Arguments]",s="[object Array]",l="[object AsyncFunction]",c="[object Boolean]",f="[object Date]",p="[object Error]",d="[object Function]",h="[object GeneratorFunction]",v="[object Map]",g="[object Number]",y="[object Null]",m="[object Object]",b="[object Promise]",w="[object Proxy]",x="[object RegExp]",S="[object Set]",E="[object String]",O="[object Symbol]",k="[object Undefined]",T="[object WeakMap]",P="[object ArrayBuffer]",C="[object DataView]",_=/^\[object .+?Constructor\]$/,R=/^(?:0|[1-9]\d*)$/,A={};A["[object Float32Array]"]=A["[object Float64Array]"]=A["[object Int8Array]"]=A["[object Int16Array]"]=A["[object Int32Array]"]=A["[object Uint8Array]"]=A["[object Uint8ClampedArray]"]=A["[object Uint16Array]"]=A["[object Uint32Array]"]=!0,A[u]=A[s]=A[P]=A[c]=A[C]=A[f]=A[p]=A[d]=A[v]=A[g]=A[m]=A[x]=A[S]=A[E]=A[T]=!1;var D="object"==typeof r.g&&r.g&&r.g.Object===Object&&r.g,M="object"==typeof self&&self&&self.Object===Object&&self,j=D||M||Function("return this")(),N=t&&!t.nodeType&&t,I=N&&e&&!e.nodeType&&e,z=I&&I.exports===N,L=z&&D.process,F=function(){try{return L&&L.binding&&L.binding("util")}catch(e){}}(),U=F&&F.isTypedArray;function W(e,t){for(var r=-1,n=null==e?0:e.length;++rl))return!1;var f=u.get(e);if(f&&u.get(t))return f==t;var p=-1,d=!0,h=r&i?new Pe:void 0;for(u.set(e,t),u.set(t,e);++p-1},ke.prototype.set=function(e,t){var r=this.__data__,n=Re(r,e);return n<0?(++this.size,r.push([e,t])):r[n][1]=t,this},Te.prototype.clear=function(){this.size=0,this.__data__={hash:new Oe,map:new(pe||ke),string:new Oe}},Te.prototype.delete=function(e){var t=Le(this,e).delete(e);return this.size-=t?1:0,t},Te.prototype.get=function(e){return Le(this,e).get(e)},Te.prototype.has=function(e){return Le(this,e).has(e)},Te.prototype.set=function(e,t){var r=Le(this,e),n=r.size;return r.set(e,t),this.size+=r.size==n?0:1,this},Pe.prototype.add=Pe.prototype.push=function(e){return this.__data__.set(e,n),this},Pe.prototype.has=function(e){return this.__data__.has(e)},Ce.prototype.clear=function(){this.__data__=new ke,this.size=0},Ce.prototype.delete=function(e){var t=this.__data__,r=t.delete(e);return this.size=t.size,r},Ce.prototype.get=function(e){return this.__data__.get(e)},Ce.prototype.has=function(e){return this.__data__.has(e)},Ce.prototype.set=function(e,t){var r=this.__data__;if(r instanceof ke){var n=r.__data__;if(!pe||n.length<199)return n.push([e,t]),this.size=++r.size,this;r=this.__data__=new Te(n)}return r.set(e,t),this.size=r.size,this};var Ue=se?function(e){return null==e?[]:(e=Object(e),function(e,t){for(var r=-1,n=null==e?0:e.length,o=0,i=[];++r-1&&e%1==0&&e-1&&e%1==0&&e<=a}function Xe(e){var t=typeof e;return null!=e&&("object"==t||"function"==t)}function Ke(e){return null!=e&&"object"==typeof e}var Je=U?function(e){return function(t){return e(t)}}(U):function(e){return Ke(e)&&Qe(e.length)&&!!A[Ae(e)]};function Ze(e){return null!=(t=e)&&Qe(t.length)&&!Ge(t)?_e(e):Ne(e);var t}e.exports=function(e,t){return Me(e,t)}},45228:e=>{"use strict";var t=Object.getOwnPropertySymbols,r=Object.prototype.hasOwnProperty,n=Object.prototype.propertyIsEnumerable;e.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},r=0;r<10;r++)t["_"+String.fromCharCode(r)]=r;if("0123456789"!==Object.getOwnPropertyNames(t).map((function(e){return t[e]})).join(""))return!1;var n={};return"abcdefghijklmnopqrst".split("").forEach((function(e){n[e]=e})),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},n)).join("")}catch(e){return!1}}()?Object.assign:function(e,o){for(var i,a,u=function(e){if(null==e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}(e),s=1;s{"use strict";var n=r(6925);function o(){}function i(){}i.resetWarningCache=o,e.exports=function(){function e(e,t,r,o,i,a){if(a!==n){var u=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");throw u.name="Invariant Violation",u}}function t(){return e}e.isRequired=e;var r={array:e,bigint:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,elementType:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t,checkPropTypes:i,resetWarningCache:o};return r.PropTypes=r,r}},5556:(e,t,r)=>{e.exports=r(2694)()},6925:e=>{"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},95191:(e,t,r)=>{"use strict";r(84315),r(7452)},22551:(e,t,r)=>{"use strict";var n=r(96540),o=r(45228),i=r(69982);function a(e){for(var t="https://reactjs.org/docs/error-decoder.html?invariant="+e,r=1;r