From 65f8cc732cd9d1272bfa7ea6ccdd3fdd913c32a7 Mon Sep 17 00:00:00 2001 From: rschamp Date: Wed, 26 May 2021 09:40:34 -0400 Subject: [PATCH 01/37] Revert "Merge pull request #5493 from LLK/revert-5478-rearrange-conference-2021" This reverts commit 8cdd89586aaba93cb206ce806c4a3d8afe90c08c, reversing changes made to 4edab6927e6709cccf71f6c11144a085dfd84a51. --- test/integration/footer-links.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/footer-links.test.js b/test/integration/footer-links.test.js index fe5c8eeda..1e2eadd2f 100644 --- a/test/integration/footer-links.test.js +++ b/test/integration/footer-links.test.js @@ -139,7 +139,7 @@ describe('www-integration footer links', () => { await clickText('Scratch Conference'); let url = await driver.getCurrentUrl(); let pathname = (new URL(url)).pathname; - expect(pathname).toMatch(/^\/conference\/2020\/?$/); + expect(pathname).toMatch(/^\/conference\/2021\/?$/); }); }); From 232d9f3bbd27a0045e60f4a29bdb93f641c1dec8 Mon Sep 17 00:00:00 2001 From: rschamp Date: Wed, 26 May 2021 09:40:41 -0400 Subject: [PATCH 02/37] Revert "Merge pull request #5494 from LLK/revert-5476-rearrange-conference-2021" This reverts commit 4edab6927e6709cccf71f6c11144a085dfd84a51, reversing changes made to 7b7322c9f9e5d480a7752fab014b2ce36cc59814. --- src/routes.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/routes.json b/src/routes.json index 97976d6bb..8d351c0f8 100644 --- a/src/routes.json +++ b/src/routes.json @@ -25,7 +25,7 @@ "name": "conference-index", "pattern": "^/conference/?(\\?.*)?$", "routeAlias": "/conference(?!/201[4-9])", - "redirect": "/conference/2020" + "redirect": "/conference/2021" }, { "name": "conference-index-2017", @@ -83,6 +83,12 @@ "name": "conference-index-2020", "pattern": "^/conference/2020/?$", "routeAlias": "/conference(?!/201[4-9])", + "redirect": "/conference/2021" + }, + { + "name": "conference-index-2021", + "pattern": "^/conference/2021/?$", + "routeAlias": "/conference(?!/201[4-9])", "view": "conference/2020/index/index", "title": "Scratch Conferences", "viewportWidth": "device-width" From 31e6616544e99fa158e3704fcf84dd60ec361a4c Mon Sep 17 00:00:00 2001 From: rschamp Date: Wed, 26 May 2021 09:57:13 -0400 Subject: [PATCH 03/37] Rename all Conference 2020 folders to 2021 This is both to reduce confusion in the future, and so that Transifex sees what it expects, with the name of the resource corresponding to the path to the l10n file. --- .../conference/{2020 => 2021}/footer.jsx | 4 +- .../conference/{2020 => 2021}/navigation.jsx | 6 +- .../conference/{2020 => 2021}/navigation.scss | 8 +- .../page/conference/{2020 => 2021}/page.jsx | 4 +- src/routes.json | 2 +- src/views/conference/2020/index/l10n.json | 18 ---- .../conference/{2020 => 2021}/index/index.jsx | 60 +++++++------- .../{2020 => 2021}/index/index.scss | 78 +++++++++--------- src/views/conference/2021/index/l10n.json | 18 ++++ .../index/{2020 => 2021}/title-banner.jpg | Bin 10 files changed, 99 insertions(+), 99 deletions(-) rename src/components/footer/conference/{2020 => 2021}/footer.jsx (98%) rename src/components/navigation/conference/{2020 => 2021}/navigation.jsx (87%) rename src/components/navigation/conference/{2020 => 2021}/navigation.scss (93%) rename src/components/page/conference/{2020 => 2021}/page.jsx (79%) delete mode 100644 src/views/conference/2020/index/l10n.json rename src/views/conference/{2020 => 2021}/index/index.jsx (62%) rename src/views/conference/{2020 => 2021}/index/index.scss (63%) create mode 100644 src/views/conference/2021/index/l10n.json rename static/images/conference/index/{2020 => 2021}/title-banner.jpg (100%) diff --git a/src/components/footer/conference/2020/footer.jsx b/src/components/footer/conference/2021/footer.jsx similarity index 98% rename from src/components/footer/conference/2020/footer.jsx rename to src/components/footer/conference/2021/footer.jsx index 59e9fba0b..3e10e4a15 100644 --- a/src/components/footer/conference/2020/footer.jsx +++ b/src/components/footer/conference/2021/footer.jsx @@ -145,8 +145,8 @@ const ConferenceFooter = props => ( -
- +
+
); diff --git a/src/components/navigation/conference/2020/navigation.jsx b/src/components/navigation/conference/2021/navigation.jsx similarity index 87% rename from src/components/navigation/conference/2020/navigation.jsx rename to src/components/navigation/conference/2021/navigation.jsx index de71426f6..163626da4 100644 --- a/src/components/navigation/conference/2020/navigation.jsx +++ b/src/components/navigation/conference/2021/navigation.jsx @@ -6,9 +6,9 @@ require('./navigation.scss'); const Navigation = () => ( -
+
+ +
+ + +
+
); diff --git a/src/views/studio/modals/promote-modal.scss b/src/views/studio/modals/promote-modal.scss index 8f429d2f9..4884d963d 100644 --- a/src/views/studio/modals/promote-modal.scss +++ b/src/views/studio/modals/promote-modal.scss @@ -33,9 +33,24 @@ padding: 2rem; } + .promote-alert-and-button-row { + padding: 0 1.5rem 1.5rem 1.5rem; + } + + // Override alert-wrapper positioning for this modal + .alert-wrapper { + position: unset; + } + + .promote-alert { + width: 100%; + padding: 0 1rem; + } + .promote-button-row { display: flex; justify-content: flex-end; + padding-top: 1.5rem; } .button { From 96aeabd255955d002c4e8019e21cf051275d0b1d Mon Sep 17 00:00:00 2001 From: Karishma Chadha Date: Thu, 10 Jun 2021 19:24:25 -0400 Subject: [PATCH 14/37] Display info to managers/studio creator about how close the studio is to reaching the manager limit when over a threshold. Display info about removing managers when a studio has reached the limit. --- src/views/studio/l10n.json | 5 ++ src/views/studio/studio-info-box.jsx | 31 +++++++++++ src/views/studio/studio-managers.jsx | 81 ++++++++++++++++++++++++++-- src/views/studio/studio.scss | 44 +++++++++++++-- 4 files changed, 154 insertions(+), 7 deletions(-) create mode 100644 src/views/studio/studio-info-box.jsx diff --git a/src/views/studio/l10n.json b/src/views/studio/l10n.json index 4341f47b4..cd363e087 100644 --- a/src/views/studio/l10n.json +++ b/src/views/studio/l10n.json @@ -68,6 +68,11 @@ "studio.managerLimitReachedHeader": "This studio has reached the limit of {managerLimit} managers.", "studio.managerLimitMessageCollaborative": "It’s great to see that this studio is collaborative!", "studio.managerLimitMessageRemoveManagers": "Before you can add another manager, you will need to remove an existing manager.", + + "studio.managerCountInfo": "{numberOfManagers} of {managerLimit}", + "studio.managerThresholdInfo": "This studio has {numberOfManagers} managers. Studios can have a maximum of {managerLimit} managers.", + "studio.managerThresholdRemoveManagers": "Before you can add another manager, you will need to remove managers until there are fewer than {managerLimit}.", + "studio.remove": "Remove", "studio.promote": "Promote", "studio.cancel": "Cancel", diff --git a/src/views/studio/studio-info-box.jsx b/src/views/studio/studio-info-box.jsx new file mode 100644 index 000000000..78d7e725e --- /dev/null +++ b/src/views/studio/studio-info-box.jsx @@ -0,0 +1,31 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import {connect} from 'react-redux'; +import Button from '../../components/forms/button.jsx'; + +const StudioInfoBox = ({showInfoBox, onClose, ...props}) => { + if (!showInfoBox) return null; + + return ( +
{/* TODO move more styling into studio-info-box? */} + {props.children} +
+ ); +}; + +StudioInfoBox.propTypes = { + showInfoBox: PropTypes.bool, + onClose: PropTypes.func, + children: PropTypes.node +}; + +const mapStateToProps = () => ({}); + +const mapDispatchToProps = () => ({}); + +export default connect(mapStateToProps, mapDispatchToProps)(StudioInfoBox); diff --git a/src/views/studio/studio-managers.jsx b/src/views/studio/studio-managers.jsx index e70b28e35..50076a78b 100644 --- a/src/views/studio/studio-managers.jsx +++ b/src/views/studio/studio-managers.jsx @@ -1,28 +1,89 @@ -import React, {useEffect} from 'react'; +import React, {useEffect, useState} from 'react'; import PropTypes from 'prop-types'; import {connect} from 'react-redux'; import {FormattedMessage} from 'react-intl'; import classNames from 'classnames'; import {managers} from './lib/redux-modules'; +import { + STUDIO_MANAGER_LIMIT, + selectStudioManagerCount, + selectStudioHasReachedManagerLimit, + selectStudioHasReachedManagerThreshold +} from '../../redux/studio.js'; import {loadManagers} from './lib/studio-member-actions'; import Debug from './debug.jsx'; import {ManagerTile} from './studio-member-tile.jsx'; +import StudioInfoBox from './studio-info-box.jsx'; import AlertProvider from '../../components/alert/alert-provider.jsx'; import Alert from '../../components/alert/alert.jsx'; +import { + selectCanRemoveManager, selectCanPromoteCurators +} from '../../redux/studio-permissions'; -const StudioManagers = ({items, error, loading, moreToLoad, onLoadMore}) => { +const StudioManagers = ({ + canPromoteCurators, + canRemoveManagers, + managerCount, + hasReachedManagerLimit, + hasReachedManagerThreshold, + items, + error, + loading, + moreToLoad, + onLoadMore +}) => { useEffect(() => { if (items.length === 0) onLoadMore(); }, []); + const [infoBoxDismissed, setInfoBoxDismissed] = useState(false); + + const showManagerLimitInfoBox = + !infoBoxDismissed && canPromoteCurators && + canRemoveManagers && hasReachedManagerLimit; + return (
-
+ setInfoBoxDismissed(true)} + > +
+ + + + +
+ +

+ {canPromoteCurators && canRemoveManagers && hasReachedManagerThreshold && +
+ +
+ }
{error && { }; StudioManagers.propTypes = { + canPromoteCurators: PropTypes.bool, + canRemoveManagers: PropTypes.bool, + managerCount: PropTypes.number, + hasReachedManagerLimit: PropTypes.bool, + hasReachedManagerThreshold: PropTypes.bool, items: PropTypes.arrayOf(PropTypes.shape({ id: PropTypes.id, username: PropTypes.string, @@ -72,7 +138,14 @@ StudioManagers.propTypes = { }; export default connect( - state => managers.selector(state), + state => ({ + canPromoteCurators: selectCanPromoteCurators(state), + canRemoveManagers: selectCanRemoveManager(state), + managerCount: selectStudioManagerCount(state), + hasReachedManagerLimit: selectStudioHasReachedManagerLimit(state), + hasReachedManagerThreshold: selectStudioHasReachedManagerThreshold(state), + ...managers.selector(state) + }), { onLoadMore: loadManagers } diff --git a/src/views/studio/studio.scss b/src/views/studio/studio.scss index 985017da0..3d6021ed3 100644 --- a/src/views/studio/studio.scss +++ b/src/views/studio/studio.scss @@ -187,6 +187,32 @@ $radius: 8px; position: relative; } +.studio-manager-count { + margin-left: 1.5rem; + width: 4.875rem; + height: 2rem; + + border: 1px solid $ui-blue; + border-radius: 1rem; + + font-weight: bold; + color: $ui-blue; + font-size: 12px; + display: flex; + justify-content: center; + align-items: center; + +} + +.manager-threshold-message { + display: flex; + flex-direction: column; + + .manager-threshold-info { + font-weight: bold; + } +} + .studio-projects-grid { margin-top: 20px; display: grid; @@ -421,6 +447,10 @@ $radius: 8px; } } +.studio-managers-header { + justify-content: flex-start; +} + .studio-compose-container { padding-top: 8px; } @@ -459,9 +489,9 @@ $radius: 8px; box-sizing: border-box; min-height: 85px; /* So the box doesn't change height after being accepted */ - display: flex; - justify-content: space-between; - align-items: center; + // display: flex; + // justify-content: space-between; + // align-items: center; @media #{$intermediate-and-smaller} { flex-direction: column; @@ -473,6 +503,10 @@ $radius: 8px; } .studio-info-box { + display: flex; + justify-content: space-between; + align-items: center; + border-radius: 4px; background: $ui-blue-10percent; border: 1px solid $ui-blue-25percent; @@ -485,6 +519,10 @@ $radius: 8px; background: #FFF0DF; border: 1px solid $ui-dark-orange; } + + .studio-info-close-button { + position: unset; + } } .studio-thumb-edit-button { From 9fc2f8167d96e3729ebd0c1de2452c47f1e5105f Mon Sep 17 00:00:00 2001 From: Karishma Chadha Date: Thu, 10 Jun 2021 19:24:54 -0400 Subject: [PATCH 15/37] Fix prop warning in the studio curator invite box. --- src/views/studio/studio-curator-invite.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/studio/studio-curator-invite.jsx b/src/views/studio/studio-curator-invite.jsx index 9995367c7..9c0a19fc7 100644 --- a/src/views/studio/studio-curator-invite.jsx +++ b/src/views/studio/studio-curator-invite.jsx @@ -64,7 +64,7 @@ const StudioCuratorInvite = ({showCuratorInvite, onSubmit}) => { }; StudioCuratorInvite.propTypes = { - showCuratorInvite: PropTypes.func, + showCuratorInvite: PropTypes.bool, onSubmit: PropTypes.func }; From 6486f119a3a7db7329369d42de37d7251f2df921 Mon Sep 17 00:00:00 2001 From: Karishma Chadha Date: Thu, 10 Jun 2021 19:40:53 -0400 Subject: [PATCH 16/37] fix trailing space issue --- src/views/studio/studio-managers.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/studio/studio-managers.jsx b/src/views/studio/studio-managers.jsx index 50076a78b..fcba3f62d 100644 --- a/src/views/studio/studio-managers.jsx +++ b/src/views/studio/studio-managers.jsx @@ -67,7 +67,7 @@ const StudioManagers = ({ id="studio.managerThresholdRemoveManagers" values={{ managerLimit: STUDIO_MANAGER_LIMIT - }} + }} />
From b6c769bd46afcd5b585c8b9d56489405dad388df Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 11 Jun 2021 03:29:21 +0000 Subject: [PATCH 17/37] Bump scratch-l10n from 3.11.20210610031613 to 3.11.20210611031724 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210610031613 to 3.11.20210611031724. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210610031613...3.11.20210611031724) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 862e84afe..fc89c3e7d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21407,9 +21407,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210610031613", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210610031613.tgz", - "integrity": "sha512-1OKFX+E408wGP8KEImdtnHIT2QIMJd7ovqeT3i8CsOIH7+BCYw8lDewqRO5X7XjUWVQUEDi0x8jRmLm7IH/G8g==", + "version": "3.11.20210611031724", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210611031724.tgz", + "integrity": "sha512-KLmYVWquTPhUeSDwZsJFUlCIlVkjRigRy8GsEB1/P1XbFnh7ylACR8wnbctaXhY8UxN5jdna7F7u59batGBcww==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 6228f7890..910f2cbe8 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210610000654", - "scratch-l10n": "3.11.20210610031613", + "scratch-l10n": "3.11.20210611031724", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 5d94af2dc451764846d3de59234ef00705782566 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 11 Jun 2021 10:44:25 +0000 Subject: [PATCH 18/37] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210610000654 to 0.1.0-prerelease.20210611035846. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210610000654...0.1.0-prerelease.20210611035846) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 39 +++++++++++++-------------------------- package.json | 2 +- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc89c3e7d..7ca9d3172 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17223,9 +17223,9 @@ "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -17883,9 +17883,9 @@ "dev": true }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -20883,9 +20883,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210610000654", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210610000654.tgz", - "integrity": "sha512-0XqUnKAii9mJ9HGhfQE88bi8WBuRr5pG3JuuGLWL4KLI6qrMtDAcefp8GgU1PGjtRgdeAL7IDwLeaPAiQBR7BQ==", + "version": "0.1.0-prerelease.20210611035846", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210611035846.tgz", + "integrity": "sha512-ENce/PoG1owFgljkA6v17ai8l5jYIdrQALhrL2QeGsh87X59AYsV4Mv//vJi8utAaxe4628YgTdf2PGFzlLILQ==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20937,7 +20937,7 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20210609211941", - "scratch-l10n": "3.11.20210609031630", + "scratch-l10n": "3.11.20210611031724", "scratch-paint": "0.2.0-prerelease.20210407203313", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -21199,9 +21199,9 @@ } }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -21328,19 +21328,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.11.20210609031630", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210609031630.tgz", - "integrity": "sha512-gqBAjoWNYPm6KY5TlFIdkxnWQO3cjuwO89EQj9DeX16iS9B3n+l8E7NrO0uvZPSs2MTOjGXLkD0sWS8iyI18iA==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "react-intl": "^2.8.0", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", diff --git a/package.json b/package.json index 910f2cbe8..00df9287b 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210610000654", + "scratch-gui": "0.1.0-prerelease.20210611035846", "scratch-l10n": "3.11.20210611031724", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 75687e52f77340f0c7a0d060b5f91f54a3758a33 Mon Sep 17 00:00:00 2001 From: Karishma Chadha Date: Fri, 11 Jun 2021 14:17:21 -0400 Subject: [PATCH 19/37] Remove commented out CSS styling --- src/views/studio/studio.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/views/studio/studio.scss b/src/views/studio/studio.scss index 3d6021ed3..3eabfaaa7 100644 --- a/src/views/studio/studio.scss +++ b/src/views/studio/studio.scss @@ -489,10 +489,6 @@ $radius: 8px; box-sizing: border-box; min-height: 85px; /* So the box doesn't change height after being accepted */ - // display: flex; - // justify-content: space-between; - // align-items: center; - @media #{$intermediate-and-smaller} { flex-direction: column; .studio-invitation-msg { From c773018c8e0abc4bba69e78b2b5f485d3c0a9a48 Mon Sep 17 00:00:00 2001 From: Karishma Chadha Date: Fri, 11 Jun 2021 15:55:28 -0400 Subject: [PATCH 20/37] Update managerCount in redux when promoting a curator or removing a manager. --- src/views/studio/lib/studio-member-actions.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/studio/lib/studio-member-actions.js b/src/views/studio/lib/studio-member-actions.js index 976fb508f..56044f384 100644 --- a/src/views/studio/lib/studio-member-actions.js +++ b/src/views/studio/lib/studio-member-actions.js @@ -3,7 +3,7 @@ import keyMirror from 'keymirror'; import api from '../../../lib/api'; import {curators, managers} from './redux-modules'; import {selectUsername} from '../../../redux/session'; -import {selectStudioId, setRoles} from '../../../redux/studio'; +import {selectStudioId, setRoles, setInfo} from '../../../redux/studio'; const Errors = keyMirror({ NETWORK: null, @@ -85,6 +85,7 @@ const removeManager = username => ((dispatch, getState) => new Promise((resolve, if (selectUsername(state) === username) { dispatch(setRoles({manager: false})); } + dispatch(setInfo({managers: state.studio.managers - 1})); return resolve(); }); })); @@ -147,6 +148,7 @@ const promoteCurator = username => ((dispatch, getState) => new Promise((resolve const curatorItem = curatorList[index]; if (index !== -1) dispatch(curators.actions.remove(index)); dispatch(managers.actions.create(curatorItem, true)); + dispatch(setInfo({managers: state.studio.managers + 1})); return resolve(); }); })); From 85beabad193bd0f61abfbdf971dfb9f75eecad24 Mon Sep 17 00:00:00 2001 From: Karishma Chadha Date: Fri, 11 Jun 2021 15:58:22 -0400 Subject: [PATCH 21/37] Remove unneded redux connect code --- src/views/studio/studio-info-box.jsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/views/studio/studio-info-box.jsx b/src/views/studio/studio-info-box.jsx index 78d7e725e..1e6ed11c9 100644 --- a/src/views/studio/studio-info-box.jsx +++ b/src/views/studio/studio-info-box.jsx @@ -1,6 +1,5 @@ import React from 'react'; import PropTypes from 'prop-types'; -import {connect} from 'react-redux'; import Button from '../../components/forms/button.jsx'; const StudioInfoBox = ({showInfoBox, onClose, ...props}) => { @@ -24,8 +23,4 @@ StudioInfoBox.propTypes = { children: PropTypes.node }; -const mapStateToProps = () => ({}); - -const mapDispatchToProps = () => ({}); - -export default connect(mapStateToProps, mapDispatchToProps)(StudioInfoBox); +export default StudioInfoBox; From b6328ee0de761e6f1308db02fa65462f3e4a4ef9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 11 Jun 2021 21:13:16 +0000 Subject: [PATCH 22/37] Bump scratch-l10n from 3.11.20210611031724 to 3.11.20210611210725 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210611031724 to 3.11.20210611210725. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210611031724...3.11.20210611210725) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 19 ++++++++++++++++--- package.json | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ca9d3172..3f39f4588 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21328,6 +21328,19 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.11.20210611031724", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210611031724.tgz", + "integrity": "sha512-KLmYVWquTPhUeSDwZsJFUlCIlVkjRigRy8GsEB1/P1XbFnh7ylACR8wnbctaXhY8UxN5jdna7F7u59batGBcww==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "react-intl": "^2.8.0", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21394,9 +21407,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210611031724", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210611031724.tgz", - "integrity": "sha512-KLmYVWquTPhUeSDwZsJFUlCIlVkjRigRy8GsEB1/P1XbFnh7ylACR8wnbctaXhY8UxN5jdna7F7u59batGBcww==", + "version": "3.11.20210611210725", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210611210725.tgz", + "integrity": "sha512-WP/hCarmItUf6KjJYu1zcguZdLHAS/+etOcmXvHtYe/o6OYfkqlV47zLkky7UAi+C1j4sliyT4IMXIPHQLeudQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 00df9287b..85ce71b40 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210611035846", - "scratch-l10n": "3.11.20210611031724", + "scratch-l10n": "3.11.20210611210725", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 46150c9980496b0f139ee1cdfc57c438ebd95f64 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 12 Jun 2021 03:21:56 +0000 Subject: [PATCH 23/37] Bump scratch-l10n from 3.11.20210611210725 to 3.11.20210612031607 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210611210725 to 3.11.20210612031607. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210611210725...3.11.20210612031607) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3f39f4588..50b4c377f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21407,9 +21407,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210611210725", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210611210725.tgz", - "integrity": "sha512-WP/hCarmItUf6KjJYu1zcguZdLHAS/+etOcmXvHtYe/o6OYfkqlV47zLkky7UAi+C1j4sliyT4IMXIPHQLeudQ==", + "version": "3.11.20210612031607", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210612031607.tgz", + "integrity": "sha512-a8kVub24uQcuEXAaaL0uGnrssLm/4awPWr4qwPG0fIg1d5+uYoTuUKIPkki4hPahf/osQxoi0tOb4sRgJPBPeQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 85ce71b40..fd27a56a4 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210611035846", - "scratch-l10n": "3.11.20210611210725", + "scratch-l10n": "3.11.20210612031607", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From e97921cf8d440689d468a6c5eb30f0b607daa20a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 13 Jun 2021 03:23:39 +0000 Subject: [PATCH 24/37] Bump scratch-l10n from 3.11.20210612031607 to 3.11.20210613031652 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210612031607 to 3.11.20210613031652. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210612031607...3.11.20210613031652) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 50b4c377f..b7ff225cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21407,9 +21407,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210612031607", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210612031607.tgz", - "integrity": "sha512-a8kVub24uQcuEXAaaL0uGnrssLm/4awPWr4qwPG0fIg1d5+uYoTuUKIPkki4hPahf/osQxoi0tOb4sRgJPBPeQ==", + "version": "3.11.20210613031652", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210613031652.tgz", + "integrity": "sha512-FFYBuvMI8ukrk+11wPRSOT2ZJ0FrJrUNeXmnSjjaqV5BJxqws/Z+VCSnav1YKhDlnePxlp4PrxHEw4O/MvY0DA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index fd27a56a4..ad668f576 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210611035846", - "scratch-l10n": "3.11.20210612031607", + "scratch-l10n": "3.11.20210613031652", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 4c9cc533d3c37cb8dcbd2ec9d6d54d0db0433321 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 03:41:51 +0000 Subject: [PATCH 25/37] Bump scratch-l10n from 3.11.20210613031652 to 3.11.20210614031633 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210613031652 to 3.11.20210614031633. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210613031652...3.11.20210614031633) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index b7ff225cd..0801aa7fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21407,9 +21407,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210613031652", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210613031652.tgz", - "integrity": "sha512-FFYBuvMI8ukrk+11wPRSOT2ZJ0FrJrUNeXmnSjjaqV5BJxqws/Z+VCSnav1YKhDlnePxlp4PrxHEw4O/MvY0DA==", + "version": "3.11.20210614031633", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210614031633.tgz", + "integrity": "sha512-Gi3uw1ULWYDVVzgLCpCHU7AUCQOgiKXqb/to140uQvSMH5KZnH3FpzsAMpahPQPEe5rHIM0NcbznF+IRDcSwJg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index ad668f576..350c0dbd6 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210611035846", - "scratch-l10n": "3.11.20210613031652", + "scratch-l10n": "3.11.20210614031633", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 01a93e3adfc5e2ca10e9f8eae94c80523638fd6c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:36:02 +0000 Subject: [PATCH 26/37] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210611035846 to 0.1.0-prerelease.20210614040305. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210611035846...0.1.0-prerelease.20210614040305) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 29 ++++++++--------------------- package.json | 2 +- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0801aa7fe..83c53d0a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20873,9 +20873,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210609211941", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210609211941.tgz", - "integrity": "sha512-lVPmB4DMpM9RxEXcWMBPsm8qdT63Ef90A9HBZnUmh+eCdIc8bylJyNKLNfbiDHItVuEhA0KE/UBMMCy7fanEBA==", + "version": "0.1.0-prerelease.20210613032754", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210613032754.tgz", + "integrity": "sha512-uQhnB1ZY2qVuQExZh/CsXN8IdoMnVQ2292nOa1warQ797EEopXKwo/dkfZv7BK0J6ioKmYnN7jeL+DfCLCz3Og==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -20883,9 +20883,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210611035846", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210611035846.tgz", - "integrity": "sha512-ENce/PoG1owFgljkA6v17ai8l5jYIdrQALhrL2QeGsh87X59AYsV4Mv//vJi8utAaxe4628YgTdf2PGFzlLILQ==", + "version": "0.1.0-prerelease.20210614040305", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210614040305.tgz", + "integrity": "sha512-l5xs5jxDedsjd4yYTTdezRA+pxv45tvpudl3tmHIIggs+TiWBxSdZG/4wPVozd8jF4jiv+0kCu9mEoVFw+lFfg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20936,8 +20936,8 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210609211941", - "scratch-l10n": "3.11.20210611031724", + "scratch-blocks": "0.1.0-prerelease.20210613032754", + "scratch-l10n": "3.11.20210614031633", "scratch-paint": "0.2.0-prerelease.20210407203313", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -21328,19 +21328,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.11.20210611031724", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210611031724.tgz", - "integrity": "sha512-KLmYVWquTPhUeSDwZsJFUlCIlVkjRigRy8GsEB1/P1XbFnh7ylACR8wnbctaXhY8UxN5jdna7F7u59batGBcww==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "react-intl": "^2.8.0", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", diff --git a/package.json b/package.json index 350c0dbd6..38d5c0988 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210611035846", + "scratch-gui": "0.1.0-prerelease.20210614040305", "scratch-l10n": "3.11.20210614031633", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 88211c2d1b9092632eb4b78094adbb1573f5b0f3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 18:37:55 +0000 Subject: [PATCH 27/37] Bump scratch-l10n from 3.11.20210614031633 to 3.12.20210614183204 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210614031633 to 3.12.20210614183204. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210614031633...3.12.20210614183204) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 19 ++++++++++++++++--- package.json | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 83c53d0a0..02e839e67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21328,6 +21328,19 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.11.20210614031633", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210614031633.tgz", + "integrity": "sha512-Gi3uw1ULWYDVVzgLCpCHU7AUCQOgiKXqb/to140uQvSMH5KZnH3FpzsAMpahPQPEe5rHIM0NcbznF+IRDcSwJg==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "react-intl": "^2.8.0", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21394,9 +21407,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210614031633", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210614031633.tgz", - "integrity": "sha512-Gi3uw1ULWYDVVzgLCpCHU7AUCQOgiKXqb/to140uQvSMH5KZnH3FpzsAMpahPQPEe5rHIM0NcbznF+IRDcSwJg==", + "version": "3.12.20210614183204", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.12.20210614183204.tgz", + "integrity": "sha512-Wq2SXXqvhY6nP31wKwvmUBfF8wSwkqtL7eaQOx0a597a0AEfrdhnldhyWbzXLoXYD71QUin6LPvAiqRMHtXClQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 38d5c0988..f65e67180 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210614040305", - "scratch-l10n": "3.11.20210614031633", + "scratch-l10n": "3.12.20210614183204", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 3ecf94deb6d2b4e8c1080d4775e7f5bdca8b035e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 21:09:57 +0000 Subject: [PATCH 28/37] Bump scratch-l10n from 3.12.20210614183204 to 3.12.20210614210413 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.12.20210614183204 to 3.12.20210614210413. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.12.20210614183204...3.12.20210614210413) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 02e839e67..5387fcc5f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21407,9 +21407,9 @@ } }, "scratch-l10n": { - "version": "3.12.20210614183204", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.12.20210614183204.tgz", - "integrity": "sha512-Wq2SXXqvhY6nP31wKwvmUBfF8wSwkqtL7eaQOx0a597a0AEfrdhnldhyWbzXLoXYD71QUin6LPvAiqRMHtXClQ==", + "version": "3.12.20210614210413", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.12.20210614210413.tgz", + "integrity": "sha512-/YbWnY2xuo88kXHvUSUys972Qp+h3BN2d7ANnbqk0qr0ciNhH0LYQRZ7RMYu2JVgfVEbCF4BYbggxW/9yX8qeA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index f65e67180..c0aeb1258 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210614040305", - "scratch-l10n": "3.12.20210614183204", + "scratch-l10n": "3.12.20210614210413", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 11ed09d763b8c11c79a34f1cf9b81f8b96a534ac Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Jun 2021 02:13:16 +0000 Subject: [PATCH 29/37] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210614040305 to 0.1.0-prerelease.20210615013557. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210614040305...0.1.0-prerelease.20210615013557) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 45 ++++++++++++++++----------------------------- package.json | 2 +- 2 files changed, 17 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5387fcc5f..4b2405b99 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20873,9 +20873,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210613032754", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210613032754.tgz", - "integrity": "sha512-uQhnB1ZY2qVuQExZh/CsXN8IdoMnVQ2292nOa1warQ797EEopXKwo/dkfZv7BK0J6ioKmYnN7jeL+DfCLCz3Og==", + "version": "0.1.0-prerelease.20210614211225", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210614211225.tgz", + "integrity": "sha512-peq5FRojyu+siMBQl+1Be93YLMBz4UVMOO8YModJeAS6aedLW9o8UB2EwItLOGdpUdzCxJBZLQQw8bq/5he5Ig==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -20883,9 +20883,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210614040305", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210614040305.tgz", - "integrity": "sha512-l5xs5jxDedsjd4yYTTdezRA+pxv45tvpudl3tmHIIggs+TiWBxSdZG/4wPVozd8jF4jiv+0kCu9mEoVFw+lFfg==", + "version": "0.1.0-prerelease.20210615013557", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210615013557.tgz", + "integrity": "sha512-HNuXznO0jn/WT9vmiJ5ljNTtGgLtYxBWTXSSOFRvdkx2tJbAbmrIg+6tIfEHi7z1gbDOtJheoeG/NnrSSkRb9w==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20936,14 +20936,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210613032754", - "scratch-l10n": "3.11.20210614031633", - "scratch-paint": "0.2.0-prerelease.20210407203313", + "scratch-blocks": "0.1.0-prerelease.20210614211225", + "scratch-l10n": "3.12.20210614210413", + "scratch-paint": "0.2.0-prerelease.20210615011117", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210511195415", - "scratch-vm": "0.2.0-prerelease.20210601191643", + "scratch-vm": "0.2.0-prerelease.20210615010833", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21328,19 +21328,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.11.20210614031633", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210614031633.tgz", - "integrity": "sha512-Gi3uw1ULWYDVVzgLCpCHU7AUCQOgiKXqb/to140uQvSMH5KZnH3FpzsAMpahPQPEe5rHIM0NcbznF+IRDcSwJg==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "react-intl": "^2.8.0", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21420,9 +21407,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210407203313", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210407203313.tgz", - "integrity": "sha512-dAg+7Bh8X4PxukXnIXN1NVDELSCmPsTRh2a2taM1MGIl9zqZLTo3nxz95qZ2aC6tnVZYY/oJRjl9UAnm47Fe4g==", + "version": "0.2.0-prerelease.20210615011117", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210615011117.tgz", + "integrity": "sha512-rgJwmtKXhbfZLtsR5jurxcFLNCUkNiDHPFYJq2bjA1n0HYYfNoG/r68fe+WfBQ6jppsOqFCNmRaNDqoF1VgsTg==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -21676,9 +21663,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210601191643", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210601191643.tgz", - "integrity": "sha512-SWXa176Ymo2EER+dEF5yJXGOaq7xekHcmggEJ2p+8vt3LZUlBpmUlL/U1FTY65wjaYLxQWMi7q+d+IpnO/vkEg==", + "version": "0.2.0-prerelease.20210615010833", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210615010833.tgz", + "integrity": "sha512-xft3AjqII4j/mbDNs89/CUyjB82i0r20QW/xiGRKmKwRUVSyccfHwjJ6XGcxseSUkvjRqNtl4PXcSjYVL2vN8A==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index c0aeb1258..f2d767816 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210614040305", + "scratch-gui": "0.1.0-prerelease.20210615013557", "scratch-l10n": "3.12.20210614210413", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From ac41cd1d319b157ed03358c8f7427970c2ff6185 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Jun 2021 03:45:53 +0000 Subject: [PATCH 30/37] Bump scratch-l10n from 3.12.20210614210413 to 3.12.20210615031544 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.12.20210614210413 to 3.12.20210615031544. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.12.20210614210413...3.12.20210615031544) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 59 +++++++++++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4b2405b99..4adc44a49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -225,17 +225,17 @@ "dev": true }, "@babel/core": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.5.tgz", - "integrity": "sha512-RN/AwP2DJmQTZSfiDaD+JQQ/J99KsIpOCfBE5pL+5jJSt7nI3nYGoAXZu+ffYSQ029NLs2DstZb+eR81uuARgg==", + "version": "7.14.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz", + "integrity": "sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==", "dev": true, "requires": { "@babel/code-frame": "^7.14.5", "@babel/generator": "^7.14.5", "@babel/helper-compilation-targets": "^7.14.5", "@babel/helper-module-transforms": "^7.14.5", - "@babel/helpers": "^7.14.5", - "@babel/parser": "^7.14.5", + "@babel/helpers": "^7.14.6", + "@babel/parser": "^7.14.6", "@babel/template": "^7.14.5", "@babel/traverse": "^7.14.5", "@babel/types": "^7.14.5", @@ -308,9 +308,9 @@ } }, "@babel/parser": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.5.tgz", - "integrity": "sha512-TM8C+xtH/9n1qzX+JNHi7AN2zHMTiPUtspO0ZdHflW8KaskkALhMmuMHb4bCmNdv9VAPzJX3/bXqkVLnAvsPfg==", + "version": "7.14.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.6.tgz", + "integrity": "sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ==", "dev": true }, "@babel/template": { @@ -695,9 +695,9 @@ } }, "@babel/parser": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.5.tgz", - "integrity": "sha512-TM8C+xtH/9n1qzX+JNHi7AN2zHMTiPUtspO0ZdHflW8KaskkALhMmuMHb4bCmNdv9VAPzJX3/bXqkVLnAvsPfg==", + "version": "7.14.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.6.tgz", + "integrity": "sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ==", "dev": true }, "@babel/template": { @@ -914,9 +914,9 @@ } }, "@babel/parser": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.5.tgz", - "integrity": "sha512-TM8C+xtH/9n1qzX+JNHi7AN2zHMTiPUtspO0ZdHflW8KaskkALhMmuMHb4bCmNdv9VAPzJX3/bXqkVLnAvsPfg==", + "version": "7.14.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.6.tgz", + "integrity": "sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ==", "dev": true }, "@babel/template": { @@ -1076,9 +1076,9 @@ "dev": true }, "@babel/helpers": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.5.tgz", - "integrity": "sha512-xtcWOuN9VL6nApgVHtq3PPcQv5qFBJzoSZzJ/2c0QK/IP/gxVcoWSNQwFEGvmbQsuS9rhYqjILDGGXcTkA705Q==", + "version": "7.14.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz", + "integrity": "sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==", "dev": true, "requires": { "@babel/template": "^7.14.5", @@ -1147,9 +1147,9 @@ } }, "@babel/parser": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.5.tgz", - "integrity": "sha512-TM8C+xtH/9n1qzX+JNHi7AN2zHMTiPUtspO0ZdHflW8KaskkALhMmuMHb4bCmNdv9VAPzJX3/bXqkVLnAvsPfg==", + "version": "7.14.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.6.tgz", + "integrity": "sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ==", "dev": true }, "@babel/template": { @@ -21328,6 +21328,19 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.12.20210614210413", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.12.20210614210413.tgz", + "integrity": "sha512-/YbWnY2xuo88kXHvUSUys972Qp+h3BN2d7ANnbqk0qr0ciNhH0LYQRZ7RMYu2JVgfVEbCF4BYbggxW/9yX8qeA==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "react-intl": "^2.8.0", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21394,9 +21407,9 @@ } }, "scratch-l10n": { - "version": "3.12.20210614210413", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.12.20210614210413.tgz", - "integrity": "sha512-/YbWnY2xuo88kXHvUSUys972Qp+h3BN2d7ANnbqk0qr0ciNhH0LYQRZ7RMYu2JVgfVEbCF4BYbggxW/9yX8qeA==", + "version": "3.12.20210615031544", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.12.20210615031544.tgz", + "integrity": "sha512-8U2y0wu+xy29ayND5bY4odklo9D/5mVW1XQ+YrBx7rykUPHiJOzPUYHvTUQVXC0CI8khAtW98Lt3SI9m4MxBuw==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index f2d767816..19d96e702 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210615013557", - "scratch-l10n": "3.12.20210614210413", + "scratch-l10n": "3.12.20210615031544", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From df19f1b42172f1c39655a469722d84ea15c3cdaf Mon Sep 17 00:00:00 2001 From: DD Liu Date: Tue, 15 Jun 2021 03:49:41 -0400 Subject: [PATCH 31/37] Adjust thumbnail css --- src/views/studio/studio.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/studio/studio.scss b/src/views/studio/studio.scss index 250681e40..cfc5029cf 100644 --- a/src/views/studio/studio.scss +++ b/src/views/studio/studio.scss @@ -150,9 +150,11 @@ $radius: 8px; .studio-image { width: 300px; - height: 225px; - object-fit: cover; + height: 195px; + object-fit: stretch; border-radius: 8px; + background: white; + border: 2px solid rgba(0, 0, 0, 0.15); } .studio-follow-button { From 24646958cbfa4903c1c8ea5fe508fad538ff8e2c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Jun 2021 10:38:51 +0000 Subject: [PATCH 32/37] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210615013557 to 0.1.0-prerelease.20210615041617. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210615013557...0.1.0-prerelease.20210615041617) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 29 ++++++++--------------------- package.json | 2 +- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4adc44a49..9e62cbaf9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20873,9 +20873,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210614211225", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210614211225.tgz", - "integrity": "sha512-peq5FRojyu+siMBQl+1Be93YLMBz4UVMOO8YModJeAS6aedLW9o8UB2EwItLOGdpUdzCxJBZLQQw8bq/5he5Ig==", + "version": "0.1.0-prerelease.20210615035054", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210615035054.tgz", + "integrity": "sha512-/YGZN3QiMa41gtcyHUUUVTfhztoT7zEb0+N+FeBmtbkZfeESOtEugJ0y0ftttUY7WJRga35TTDp1UdEyo7sxAg==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -20883,9 +20883,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210615013557", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210615013557.tgz", - "integrity": "sha512-HNuXznO0jn/WT9vmiJ5ljNTtGgLtYxBWTXSSOFRvdkx2tJbAbmrIg+6tIfEHi7z1gbDOtJheoeG/NnrSSkRb9w==", + "version": "0.1.0-prerelease.20210615041617", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210615041617.tgz", + "integrity": "sha512-HVmqbo9MLfV5tvc5owt7BT+fJKj5QRrz+c4S2vc8WyAsxMEerAYKfaNCHI89LmA5CRb42sgb0Z6YnwlsNVsaiw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20936,8 +20936,8 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210614211225", - "scratch-l10n": "3.12.20210614210413", + "scratch-blocks": "0.1.0-prerelease.20210615035054", + "scratch-l10n": "3.12.20210615031544", "scratch-paint": "0.2.0-prerelease.20210615011117", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -21328,19 +21328,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.12.20210614210413", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.12.20210614210413.tgz", - "integrity": "sha512-/YbWnY2xuo88kXHvUSUys972Qp+h3BN2d7ANnbqk0qr0ciNhH0LYQRZ7RMYu2JVgfVEbCF4BYbggxW/9yX8qeA==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "react-intl": "^2.8.0", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", diff --git a/package.json b/package.json index 19d96e702..8b072735a 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210615013557", + "scratch-gui": "0.1.0-prerelease.20210615041617", "scratch-l10n": "3.12.20210615031544", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 56dc892ee55d4715cf1205af165eaea28ee2f483 Mon Sep 17 00:00:00 2001 From: seotts Date: Tue, 8 Jun 2021 13:37:12 -0400 Subject: [PATCH 33/37] =?UTF-8?q?Muted=20user=20can=E2=80=99t=20add=20proj?= =?UTF-8?q?=20to=20studio=20via=20proj=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/preview/l10n.json | 3 +- src/views/preview/preview.scss | 2 - src/views/preview/subactions.jsx | 207 +++++++++++------- src/views/preview/subactions.scss | 7 + src/views/studio/studio-mute-edit-message.jsx | 11 +- 5 files changed, 146 insertions(+), 84 deletions(-) diff --git a/src/views/preview/l10n.json b/src/views/preview/l10n.json index cdd473f16..df9efaed3 100644 --- a/src/views/preview/l10n.json +++ b/src/views/preview/l10n.json @@ -46,5 +46,6 @@ "project.cloudVariables": "Cloud Variables", "project.cloudDataLink": "See Data", "project.usernameBlockAlert": "This project can detect who is using it, through the \"username\" block. To hide your identity, sign out before using the project.", - "project.inappropriateUpdate": "Hmm...the bad word detector thinks there is a problem with your text. Please change it and remember to be respectful." + "project.inappropriateUpdate": "Hmm...the bad word detector thinks there is a problem with your text. Please change it and remember to be respectful.", + "project.mutedAddToStudio": "You will be able to add to studios again {inDuration}." } diff --git a/src/views/preview/preview.scss b/src/views/preview/preview.scss index 4698d4dfd..b7d4d8b98 100644 --- a/src/views/preview/preview.scss +++ b/src/views/preview/preview.scss @@ -160,7 +160,6 @@ $stage-width: 480px; margin-top: $arrow-border-width; border: 1px solid $active-gray; border-radius: 5px; - background-color: $ui-orange; padding: 1rem; max-width: 18.75rem; min-height: 1rem; @@ -185,7 +184,6 @@ $stage-width: 480px; border-left: 1px solid $active-gray; border-radius: 5px; - background-color: $ui-orange; width: $arrow-border-width; height: $arrow-border-width; diff --git a/src/views/preview/subactions.jsx b/src/views/preview/subactions.jsx index 0c02623cb..1a487b6f8 100644 --- a/src/views/preview/subactions.jsx +++ b/src/views/preview/subactions.jsx @@ -8,90 +8,132 @@ const Button = require('../../components/forms/button.jsx'); const AddToStudioModal = require('./add-to-studio.jsx'); const SocialModal = require('../../components/modal/social/container.jsx'); const ReportModal = require('../../components/modal/report/modal.jsx'); +const {connect} = require('react-redux'); +const {selectShowProjectMuteError} = require('../../redux/studio-permissions.js'); +const {useState} = require('react'); const projectShape = require('./projectshape.jsx').projectShape; +import StudioMuteEditMessage from '../studio/studio-mute-edit-message.jsx'; + require('./subactions.scss'); -const Subactions = props => ( - -
-
©
- {' '} - {/* eslint-disable react/jsx-sort-props */} - {props.shareDate ? ( - - ) : 'Unshared'} - {/* eslint-enable react/jsx-sort-props */} -
- - {(props.canReport) && - - - {props.reportOpen && ( - - )} - - } - {props.canAddToStudio && - - - {props.addToStudioOpen && ( - - )} - - } - {/* only show copy link button, modal if project is shared */} - {props.isShared && props.projectInfo && props.projectInfo.id && ( - - - {props.socialOpen && ( - - )} - - )} +const Subactions = ({ + addToStudioOpen, + canAddToStudio, + canReport, + isAdmin, + isShared, + onAddToStudioClicked, + onAddToStudioClosed, + onReportClicked, + onReportClose, + onReportSubmit, + onSocialClicked, + onSocialClosed, + onToggleStudio, + projectInfo, + reportOpen, + shareDate, + showAddToStudioMuteError, + socialOpen, + userOwnsProject +}) => { + const [showMuteMessage, setShowMuteMessage] = useState(false); + + return ( + +
+
©
+ {' '} + {/* eslint-disable react/jsx-sort-props */} + {shareDate ? ( + + ) : 'Unshared'} + {/* eslint-enable react/jsx-sort-props */} +
+ + {(canReport) && + + + {reportOpen && ( + + )} + + } + {canAddToStudio && + +
showAddToStudioMuteError && setShowMuteMessage(true)} + onMouseLeave={() => showAddToStudioMuteError && setShowMuteMessage(false)} + /* eslint-enable react/jsx-no-bind */ + > + + {showMuteMessage && } +
+ {addToStudioOpen && ( + + )} + + } + {/* only show copy link button, modal if project is shared */} + {isShared && projectInfo && projectInfo.id && ( + + + {socialOpen && ( + + )} + + )} + - -); + ); +}; Subactions.propTypes = { addToStudioOpen: PropTypes.bool, @@ -110,8 +152,13 @@ Subactions.propTypes = { projectInfo: projectShape, reportOpen: PropTypes.bool, shareDate: PropTypes.string, + showAddToStudioMuteError: PropTypes.bool, socialOpen: PropTypes.bool, userOwnsProject: PropTypes.bool }; -module.exports = Subactions; +module.exports = connect( + state => ({ + showAddToStudioMuteError: selectShowProjectMuteError(state) + }) +)(Subactions); diff --git a/src/views/preview/subactions.scss b/src/views/preview/subactions.scss index bba4bd6c8..d70791d94 100644 --- a/src/views/preview/subactions.scss +++ b/src/views/preview/subactions.scss @@ -109,3 +109,10 @@ } } } + +.studio-button-error { + top: auto; + transform: none; + width: 100%; + margin-left: 0; +} diff --git a/src/views/studio/studio-mute-edit-message.jsx b/src/views/studio/studio-mute-edit-message.jsx index 44adce7ac..7d99c0b23 100644 --- a/src/views/studio/studio-mute-edit-message.jsx +++ b/src/views/studio/studio-mute-edit-message.jsx @@ -9,12 +9,15 @@ import {selectMuteStatus} from '../../redux/session'; import {formatRelativeTime} from '../../lib/format-time.js'; const StudioMuteEditMessage = ({ + className, + messageId, muteExpiresAtMs }) => ( ({ muteExpiresAtMs: (selectMuteStatus(state).muteExpiresAt * 1000 || 0) From 1a753dfde3afa82ef071e7cdc4cf6a0786d97eb2 Mon Sep 17 00:00:00 2001 From: seotts Date: Tue, 15 Jun 2021 09:44:47 -0400 Subject: [PATCH 34/37] Put Add to Studio change behind session flag --- src/redux/session.js | 2 ++ src/views/preview/subactions.jsx | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/redux/session.js b/src/redux/session.js index fc2822721..0cad26359 100644 --- a/src/redux/session.js +++ b/src/redux/session.js @@ -145,6 +145,8 @@ module.exports.selectProjectCommentsGloballyEnabled = state => module.exports.selectMuteStatus = state => get(state, ['session', 'session', 'permissions', 'mute_status'], {muteExpiresAt: 0, offenses: [], showWarning: false}); module.exports.selectIsMuted = state => (module.exports.selectMuteStatus(state).muteExpiresAt || 0) * 1000 > Date.now(); +module.exports.selectNewStudiosLaunched = state => get(state, ['session', 'session', 'flags', 'new_studios_launched'], + false); module.exports.selectHasFetchedSession = state => state.session.status === module.exports.Status.FETCHED; diff --git a/src/views/preview/subactions.jsx b/src/views/preview/subactions.jsx index 1a487b6f8..9510611cd 100644 --- a/src/views/preview/subactions.jsx +++ b/src/views/preview/subactions.jsx @@ -13,6 +13,7 @@ const {selectShowProjectMuteError} = require('../../redux/studio-permissions.js' const {useState} = require('react'); const projectShape = require('./projectshape.jsx').projectShape; +import {selectNewStudiosLaunched} from '../../redux/session.js'; import StudioMuteEditMessage from '../studio/studio-mute-edit-message.jsx'; require('./subactions.scss'); @@ -90,7 +91,7 @@ const Subactions = ({ className="action-button studio-button" disabled={showAddToStudioMuteError} key="add-to-studio-button" - onClick={showMuteMessage && onAddToStudioClicked} + onClick={showMuteMessage ? null : onAddToStudioClicked} > @@ -159,6 +160,6 @@ Subactions.propTypes = { module.exports = connect( state => ({ - showAddToStudioMuteError: selectShowProjectMuteError(state) + showAddToStudioMuteError: selectShowProjectMuteError(state) && selectNewStudiosLaunched(state) }) )(Subactions); From a344f1280df2303194692088697f39033b24eae2 Mon Sep 17 00:00:00 2001 From: Eric Rosenbaum Date: Tue, 15 Jun 2021 12:16:04 -0400 Subject: [PATCH 35/37] style fixes --- src/views/studio/studio.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/studio/studio.scss b/src/views/studio/studio.scss index cfc5029cf..608b13af9 100644 --- a/src/views/studio/studio.scss +++ b/src/views/studio/studio.scss @@ -151,9 +151,9 @@ $radius: 8px; .studio-image { width: 300px; height: 195px; - object-fit: stretch; border-radius: 8px; background: white; + box-sizing: border-box; border: 2px solid rgba(0, 0, 0, 0.15); } From 6bbc62c5e3d2b5100c1f91feeb8a72ab50f6fcd7 Mon Sep 17 00:00:00 2001 From: Eric Rosenbaum Date: Tue, 15 Jun 2021 12:16:33 -0400 Subject: [PATCH 36/37] thumbnail in report matches main thumbnail style --- src/views/studio/modals/studio-report-modal.scss | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/studio/modals/studio-report-modal.scss b/src/views/studio/modals/studio-report-modal.scss index fe7b1538c..2449ff143 100644 --- a/src/views/studio/modals/studio-report-modal.scss +++ b/src/views/studio/modals/studio-report-modal.scss @@ -75,9 +75,12 @@ } .studio-report-tile-image { - border-radius: 0.5rem; - max-width: 130px; - max-height: 100px; + width: 150px; + height: 98px; + border-radius: 4px; + background: white; + box-sizing: border-box; + border: 2px solid rgba(0, 0, 0, 0.15); } .studio-report-selected { From a454686a92d26e21f2f260644d48a63232122a0e Mon Sep 17 00:00:00 2001 From: BryceLTaylor Date: Tue, 15 Jun 2021 16:12:40 -0400 Subject: [PATCH 37/37] run jest tests with --runInBand --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8b072735a..01ae88a91 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "test:lint": "eslint . --ext .js,.jsx,.json", "test:lint:ci": "eslint . --ext .js,.jsx,.json --format junit -o ./test/results/lint-results.xml", "test:integration": "npm run test:integration:jest && npm run test:smoke", - "test:integration:jest": "jest ./test/integration/*.test.js --reporters=default", + "test:integration:jest": "jest ./test/integration/*.test.js --reporters=default --runInBand", "test:integration:remote": "npm run test:integration:jest:remote && npm run test:smoke:sauce", - "test:integration:jest:remote": "SMOKE_REMOTE=true jest ./test/integration/*.test.js --reporters=default", + "test:integration:jest:remote": "SMOKE_REMOTE=true jest ./test/integration/*.test.js --reporters=default --runInBand", "test:smoke": "tap ./test/integration-legacy/smoke-testing/*.js --timeout=3600 --no-coverage -R classic", "test:smoke:verbose": "tap ./test/integration-legacy/smoke-testing/*.js --timeout=3600 --no-coverage -R spec", "test:smoke:sauce": "SMOKE_REMOTE=true tap ./test/integration-legacy/smoke-testing/*.js --timeout=60000 --no-coverage -R classic",