Skip to content

merge #2590

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

Merged
CarlaCostea merged 32 commits into from
May 22, 2025
Merged

merge #2590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ca61920
feat(passage): update authoring for additional passage, create own co…
arimieandreea May 1, 2025
9ff4eb1
feat(passage): add logic for addimg an additional passage PD-4040
arimieandreea May 2, 2025
393d6fa
feat(passage): create logic add remove passage, add translator PD-4040
arimieandreea May 6, 2025
5dfb968
feat(passage): handle corner cases, create new file for common compon…
arimieandreea May 7, 2025
b0693a1
feat(passage): rewrite tests as structure was changed and new func ad…
arimieandreea May 8, 2025
2666cf7
feat(inline-dropdown): change incorrect color and fix some warnings P…
PatriciaRomaniuc May 9, 2025
32d4ef2
fix(passage): correct failing test, validate all passages PD-4040
arimieandreea May 9, 2025
a0aa8bf
fix(passage): reset defaults values to their initial value PD-4040
arimieandreea May 9, 2025
c76c422
fix(passage): get rid of translator PD-4040
arimieandreea May 12, 2025
10ccc73
Merge pull request #2574 from pie-framework/master
CarlaCostea May 12, 2025
7bc2dda
feat(passage): add new config property to documentationPD-4040
arimieandreea May 12, 2025
d201c51
fix(pie-models): set d3-array to resolution dep PD-5014
arimieandreea May 13, 2025
c6b0f56
fix(pie-models): remobe empty spaces PD-5014
arimieandreea May 13, 2025
2c9d279
fix(passage): code review improvements PD-4040
arimieandreea May 14, 2025
8b77d22
feat(multiple-choice): clarify checkbox and radio purpose for screen …
CarlaCostea May 15, 2025
d9ecadf
refactor
CarlaCostea May 15, 2025
9bd4da9
fix(number-line): use state for values from ref, initialise onMounted…
arimieandreea May 16, 2025
854e576
PD-5009: fix: disabled showing of paragraphs in all places, except ex…
lakatosandrei May 17, 2025
a7c878c
fix: update pie-lib/pie-toolbox PD-4555, PD-4561
CarlaCostea May 19, 2025
2272274
Merge pull request #2581 from pie-framework/fix/PD-4557
CarlaCostea May 19, 2025
74243f9
Merge pull request #2584 from pie-framework/fix/update-pie-toolbox-19May
CarlaCostea May 19, 2025
6c373ca
fix(passage): fix table styling inside passage to be consistent PD-4594
PatriciaRomaniuc May 21, 2025
3d4ad6a
Merge pull request #2588 from pie-framework/feat/PD-4594
CarlaCostea May 22, 2025
6cd0190
Merge pull request #2582 from pie-framework/fix/PD-4923
CarlaCostea May 22, 2025
86ecdd0
Merge pull request #2580 from pie-framework/fix/PD-5014
CarlaCostea May 22, 2025
f3fda5c
Merge pull request #2572 from pie-framework/feat/PD-5002
CarlaCostea May 22, 2025
e00ac85
fix: tests PD-5009
CarlaCostea May 22, 2025
86c7245
Merge pull request #2570 from pie-framework/feat/PD-4040
CarlaCostea May 22, 2025
fce1a12
fix: conflicts
CarlaCostea May 22, 2025
2a86f0a
Merge pull request #2583 from pie-framework/fix/PD-5009
CarlaCostea May 22, 2025
9d5d7a3
fix: update pie-lib/pie-toolbox PD-5009, PD-5002
CarlaCostea May 22, 2025
61185c0
Merge pull request #2589 from pie-framework/fix/update-plib-22May
CarlaCostea May 22, 2025
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
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,8 @@
"@rollup/plugin-commonjs": "^20.0.0",
"express": "^4.17.1",
"rollup-plugin-analyzer": "^4.0.0"
},
"resolutions": {
"@types/d3-array": "3.0.3"
}
}
2 changes: 1 addition & 1 deletion packages/boilerplate-item-type/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"debug": "^3.1.0",
"lodash": "^4.17.15",
"prop-types": "^15.6.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/boilerplate-item-type/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"main": "lib/index.js",
"module": "src/index.js",
"dependencies": {
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"debug": "^3.1.0",
"lodash": "^4.17.15"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/boilerplate-item-type/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"prop-types": "^15.6.1",
"react": "^16.8.1",
"react-dom": "^16.8.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/calculator/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"react": "^16.8.1",
"react-dom": "^16.8.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/categorize/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.1",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"classnames": "^2.2.5",
"debug": "^3.1.0",
"lodash": "^4.17.15",
Expand Down
1 change: 1 addition & 0 deletions packages/categorize/configure/src/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export default {
image: { disabled: false },
textAlign: { disabled: true },
showParagraphs: { disabled: false },
separateParagraphs: { disabled: true },
},
spellCheck: {
label: 'Spellcheck',
Expand Down
2 changes: 1 addition & 1 deletion packages/categorize/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@pie-element/categorize-controller",
"private": true,
"dependencies": {
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"lodash": "^4.17.15"
},
"version": "7.8.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/categorize/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"classnames": "^2.2.5",
"debug": "^4.1.1",
"lodash": "^4.17.15",
Expand Down
2 changes: 1 addition & 1 deletion packages/charting/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"classnames": "^2.2.5",
"debug": "^4.1.1",
"prop-types": "^15.6.2",
Expand Down
12 changes: 12 additions & 0 deletions packages/charting/configure/src/__tests__/__snapshots__/configure.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ exports[`Configure renders snapshot 1`] = `
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down Expand Up @@ -334,6 +337,9 @@ exports[`Configure renders snapshot 1`] = `
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down Expand Up @@ -378,6 +384,9 @@ exports[`Configure renders snapshot 1`] = `
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down Expand Up @@ -720,6 +729,9 @@ exports[`Configure renders snapshot 1`] = `
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down
1 change: 1 addition & 0 deletions packages/charting/configure/src/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export default {
image: { disabled: false },
textAlign: { disabled: true },
showParagraphs: { disabled: false },
separateParagraphs: { disabled: true },
},
spellCheck: {
label: 'Spellcheck',
Expand Down
2 changes: 1 addition & 1 deletion packages/charting/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"test": "./node_modules/.bin/jest"
},
"dependencies": {
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"debug": "^4.1.1",
"lodash": "^4.17.15"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/charting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"classnames": "^2.2.5",
"debug": "^4.1.1",
"lodash": "^4.17.15",
Expand Down
2 changes: 1 addition & 1 deletion packages/complex-rubric/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"lodash": "^4.17.15"
},
"author": "",
Expand Down
2 changes: 1 addition & 1 deletion packages/drag-in-the-blank/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.1",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"debug": "^3.1.0",
"lodash": "^4.17.15",
"prop-types": "^15.6.2",
Expand Down
27 changes: 27 additions & 0 deletions packages/drag-in-the-blank/configure/src/__tests__/__snapshots__/main.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ exports[`Main snapshot renders with teacher instructions, prompt and rationale e
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down Expand Up @@ -253,6 +256,9 @@ exports[`Main snapshot renders with teacher instructions, prompt and rationale e
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down Expand Up @@ -313,6 +319,9 @@ exports[`Main snapshot renders with teacher instructions, prompt and rationale e
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down Expand Up @@ -426,6 +435,9 @@ There should be at least 2 tokens defined."
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down Expand Up @@ -518,6 +530,9 @@ There should be at least 2 tokens defined."
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down Expand Up @@ -575,6 +590,9 @@ There should be at least 2 tokens defined."
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down Expand Up @@ -630,6 +648,9 @@ exports[`Main snapshot renders without teacher instructions, prompt and rational
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down Expand Up @@ -903,6 +924,9 @@ There should be at least 2 tokens defined."
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down Expand Up @@ -995,6 +1019,9 @@ There should be at least 2 tokens defined."
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down
1 change: 1 addition & 0 deletions packages/drag-in-the-blank/configure/src/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export default {
blockquote: { disabled: true },
textAlign: { disabled: true },
showParagraphs: { disabled: false },
separateParagraphs: { disabled: true },
},
spellCheck: {
label: 'Spellcheck',
Expand Down
2 changes: 1 addition & 1 deletion packages/drag-in-the-blank/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"debug": "^3.1.0",
"lodash": "^4.17.15",
"type-of": "^2.0.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/drag-in-the-blank/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"classnames": "^2.2.5",
"lodash": "^4.17.10",
"prop-types": "^15.6.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/drawing-response/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"classnames": "^2.2.6",
"debug": "^3.1.0",
"lodash": "^4.17.15",
Expand Down
6 changes: 6 additions & 0 deletions packages/drawing-response/configure/src/__tests__/__snapshots__/root.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ exports[`Root snapshot renders 1`] = `
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down Expand Up @@ -159,6 +162,9 @@ exports[`Root snapshot renders 1`] = `
"image": Object {
"disabled": false,
},
"separateParagraphs": Object {
"disabled": true,
},
"showParagraphs": Object {
"disabled": false,
},
Expand Down
1 change: 1 addition & 0 deletions packages/drawing-response/configure/src/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export default {
image: { disabled: false },
textAlign: { disabled: true },
showParagraphs: { disabled: false },
separateParagraphs: { disabled: true },
},
spellCheck: {
label: 'Spellcheck',
Expand Down
2 changes: 1 addition & 1 deletion packages/drawing-response/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@mdi/js": "^3.6.95",
"@mdi/react": "^1.1.1",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"classnames": "^2.2.6",
"enzyme-to-json": "^3.3.5",
"konva": "^3.4.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/ebsr/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@material-ui/core": "^3.9.2",
"@pie-element/multiple-choice": "^9.15.5",
"@pie-framework/pie-configure-events": "^1.2.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"lodash": "^4.17.15",
"prop-types": "^15.6.2",
"react": "^16.8.1",
Expand Down
2 changes: 2 additions & 0 deletions packages/ebsr/configure/src/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ const defaultConfig = {
image: { disabled: false },
textAlign: { disabled: true },
showParagraphs: { disabled: false },
separateParagraphs: { disabled: true },
},
};

Expand Down Expand Up @@ -137,6 +138,7 @@ export default {
image: { disabled: false },
textAlign: { disabled: true },
showParagraphs: { disabled: false },
separateParagraphs: { disabled: true },
},
partialScoring: {
label: 'Allow Partial Scoring',
Expand Down
2 changes: 1 addition & 1 deletion packages/ebsr/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"lodash": "^4.17.15"
},
"author": "",
Expand Down
2 changes: 1 addition & 1 deletion packages/ebsr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"@pie-element/multiple-choice": "^9.15.5",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"classnames": "^2.2.5",
"debug": "^4.1.1",
"lodash": "^4.17.11"
Expand Down
2 changes: 1 addition & 1 deletion packages/explicit-constructed-response/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.1",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/pie-toolbox": "2.14.6",
"@pie-lib/pie-toolbox": "2.16.0",
"classnames": "^2.2.6",
"debug": "^3.1.0",
"lodash": "^4.17.15",
Expand Down
Loading
Loading