From 8dd7adf2d73ecbc37a8d1524e02269500786fede Mon Sep 17 00:00:00 2001 From: Brian Fleming Date: Wed, 17 Jul 2024 09:39:59 -0400 Subject: [PATCH 01/11] Use consistent empty state for tags in setttings area and make table look like the rules table more --- .../team/TeamTags/TeamTagsComponent.json | 5 + .../team/TeamTags/TeamTagsComponent.js | 137 +++++++++--------- 2 files changed, 73 insertions(+), 69 deletions(-) diff --git a/localization/react-intl/src/app/components/team/TeamTags/TeamTagsComponent.json b/localization/react-intl/src/app/components/team/TeamTags/TeamTagsComponent.json index 67c338cfa8..e694464917 100644 --- a/localization/react-intl/src/app/components/team/TeamTags/TeamTagsComponent.json +++ b/localization/react-intl/src/app/components/team/TeamTags/TeamTagsComponent.json @@ -29,6 +29,11 @@ "description": "Pagination button to go to next page", "defaultMessage": "Next page" }, + { + "id": "teamTagsComponent.blank", + "description": "Message displayed when there are no tags in the workspace", + "defaultMessage": "No Workspace Tags" + }, { "id": "teamTagsComponent.tableHeaderName", "description": "Column header in tags table.", diff --git a/src/app/components/team/TeamTags/TeamTagsComponent.js b/src/app/components/team/TeamTags/TeamTagsComponent.js index 47eab39793..6ede03eff2 100644 --- a/src/app/components/team/TeamTags/TeamTagsComponent.js +++ b/src/app/components/team/TeamTags/TeamTagsComponent.js @@ -2,12 +2,12 @@ import React from 'react'; import PropTypes from 'prop-types'; import cx from 'classnames/bind'; import { FormattedMessage, FormattedHTMLMessage } from 'react-intl'; -import { makeStyles } from '@material-ui/core/styles'; import Table from '@material-ui/core/Table'; import TableBody from '@material-ui/core/TableBody'; import TableCell from '@material-ui/core/TableCell'; import TableHead from '@material-ui/core/TableHead'; import TableRow from '@material-ui/core/TableRow'; +import BlankState from '../../layout/BlankState'; import ButtonMain from '../../cds/buttons-checkboxes-chips/ButtonMain'; import Tooltip from '../../cds/alerts-and-prompts/Tooltip'; import NextIcon from '../../../icons/chevron_right.svg'; @@ -22,15 +22,6 @@ import styles from './TeamTagsComponent.module.css'; import Can from '../../Can'; import settingsStyles from '../Settings.module.css'; -const useStyles = makeStyles({ - teamTagsTableCell: { - borderBottom: 0, - }, - teamTagsNewTagButton: { - whiteSpace: 'nowrap', - }, -}); - const TeamTagsComponent = ({ teamId, teamDbid, @@ -46,7 +37,6 @@ const TeamTagsComponent = ({ setSearchTerm, }) => { const teamSlug = window.location.pathname.match(/^\/([^/]+)/)[1]; - const classes = useStyles(); const [showCreateTag, setShowCreateTag] = React.useState(false); const [cursor, setCursor] = React.useState(0); const [isPaginationLoading, setIsPaginationLoading] = React.useState(false); @@ -81,7 +71,6 @@ const TeamTagsComponent = ({ theme="brand" size="default" onClick={() => { setShowCreateTag(true); }} - className={classes.teamTagsNewTagButton} label={ }
-
- - - - - - - - - - - - - - - - { isPaginationLoading && } - - { tags.slice(cursor, cursor + pageSize).map(tag => ( - - - {tag.text} - - - + {totalTags === 0 ? + + + + : +
+
+ + + + - - - {tag.tags_count} - + + - - - - + + + - ))} - -
-
+ + { isPaginationLoading && } + + { tags.slice(cursor, cursor + pageSize).map(tag => ( + + + {tag.text} + + + + + + + {tag.tags_count} + + + + + + + + + ))} + + +
+ } { showCreateTag ? Date: Wed, 17 Jul 2024 10:04:36 -0400 Subject: [PATCH 02/11] Clean up privacy requests while reviewing Articles [CV2-4874] --- .../src/app/components/user/UserPrivacy.json | 19 ++--- src/app/components/user/UserPrivacy.js | 71 +++++++------------ src/app/customHelpers.js | 1 + 3 files changed, 33 insertions(+), 58 deletions(-) diff --git a/localization/react-intl/src/app/components/user/UserPrivacy.json b/localization/react-intl/src/app/components/user/UserPrivacy.json index f7729a44d2..ace7310aaf 100644 --- a/localization/react-intl/src/app/components/user/UserPrivacy.json +++ b/localization/react-intl/src/app/components/user/UserPrivacy.json @@ -35,24 +35,19 @@ "defaultMessage": "Please review our {ppLink} to learn how {appName} uses and stores your information." }, { - "id": "userPrivacy.seeInformationText", - "description": "Description of what the app will do when the user requests their information", - "defaultMessage": "We will send you a file with the content and data you created and generated on {appName}. This can be kept for your records or transferred to another service." + "id": "userPrivacy.userRequests", + "description": "Title for area instructing how to request data from Check", + "defaultMessage": "User Information Requests" }, { - "id": "userPrivacy.seeInformationButton", - "description": "Button text for the user to see their privacy information", - "defaultMessage": "See my information" + "id": "userPrivacy.seeInformationText", + "description": "Description of what the app will do when the user requests their information", + "defaultMessage": "Request a file with the content and data you created and generated on {appName} by contacting {privacyEmail}." }, { "id": "userPrivacy.stopProcessingText", "description": "Help text to tell the user how they can request a change to their privacy settings", - "defaultMessage": "You can request {appName} to stop processing your information under certain conditions." - }, - { - "id": "userPrivacy.stopProcessingButton", - "description": "Button text for the user to request a change to their privacy settings", - "defaultMessage": "Request to stop processing" + "defaultMessage": "Request {appName} to stop processing your information under certain conditions by contacting {privacyEmail}." }, { "id": "userPrivacy.connectedAccounts", diff --git a/src/app/components/user/UserPrivacy.js b/src/app/components/user/UserPrivacy.js index fe7edb2aa6..6a63cc9fde 100644 --- a/src/app/components/user/UserPrivacy.js +++ b/src/app/components/user/UserPrivacy.js @@ -1,7 +1,7 @@ import React from 'react'; import { graphql, commitMutation } from 'react-relay/compat'; import PropTypes from 'prop-types'; -import { FormattedMessage, defineMessages, injectIntl } from 'react-intl'; +import { FormattedMessage, FormattedHTMLMessage, defineMessages, injectIntl } from 'react-intl'; import Relay from 'react-relay/classic'; import ButtonMain from '../cds/buttons-checkboxes-chips/ButtonMain'; import SettingsHeader from '../team/SettingsHeader'; @@ -34,11 +34,6 @@ const UserPrivacy = (props, context) => { const [dialogOpen, setDialogOpen] = React.useState(false); const [message, setMessage] = React.useState(false); - const handleSubmit = (subject) => { - const email = 'privacy@meedan.com'; - window.location.href = `mailto:${email}?subject=${subject}`; - }; - const handleOpenDialog = () => { setDialogOpen(true); }; @@ -140,46 +135,30 @@ const UserPrivacy = (props, context) => { }} />
- - - } - /> -
-
- - - } - /> + +
+
    + + +
diff --git a/src/app/customHelpers.js b/src/app/customHelpers.js index a0fc96086e..095b5c2287 100644 --- a/src/app/customHelpers.js +++ b/src/app/customHelpers.js @@ -7,6 +7,7 @@ const customStrings = { CONTACT_HUMAN_URL: 'https://meedan.typeform.com/to/Tvf0b8', PP_URL: 'https://meedan.com/legal/privacy-policy', SUPPORT_EMAIL: 'check@meedan.com', + PRIVACY_EMAIL: 'privacy@meedan.com', TOS_URL: 'https://meedan.com/legal/terms-of-service', LOGO_URL: '/images/logo/check.svg', }, From 0fd0cdbdd0dd05cabcd56e0972a6de811898a04e Mon Sep 17 00:00:00 2001 From: Brian Fleming Date: Wed, 17 Jul 2024 10:40:34 -0400 Subject: [PATCH 03/11] tweak empty annotations message --- localization/react-intl/src/app/components/task/Tasks.json | 2 +- .../src/app/components/team/TeamMetadataRender.json | 2 +- src/app/components/task/Tasks.js | 2 +- src/app/components/team/TeamMetadataRender.js | 2 +- test/spec/annotation_spec.rb | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/localization/react-intl/src/app/components/task/Tasks.json b/localization/react-intl/src/app/components/task/Tasks.json index ec9edbe496..1750f63a89 100644 --- a/localization/react-intl/src/app/components/task/Tasks.json +++ b/localization/react-intl/src/app/components/task/Tasks.json @@ -2,7 +2,7 @@ { "id": "tasks.blankAnnotation", "description": "A message that appears when the Annotation menu is opened but no Annotation fields have been created in the project settings.", - "defaultMessage": "No annotation fields" + "defaultMessage": "No Workspace Annotations" }, { "id": "tasks.goToSettings", diff --git a/localization/react-intl/src/app/components/team/TeamMetadataRender.json b/localization/react-intl/src/app/components/team/TeamMetadataRender.json index 8626e113a8..3d7eb34ef0 100644 --- a/localization/react-intl/src/app/components/team/TeamMetadataRender.json +++ b/localization/react-intl/src/app/components/team/TeamMetadataRender.json @@ -27,6 +27,6 @@ { "id": "teamMetadataRender.blankAnnotations", "description": "Text for empty annotations", - "defaultMessage": "No annotation fields" + "defaultMessage": "No Workspace Annotations" } ] \ No newline at end of file diff --git a/src/app/components/task/Tasks.js b/src/app/components/task/Tasks.js index cd9473bbda..189da3a001 100644 --- a/src/app/components/task/Tasks.js +++ b/src/app/components/task/Tasks.js @@ -29,7 +29,7 @@ const Tasks = ({ return ( - + { !isBrowserExtension ?
diff --git a/src/app/components/team/TeamMetadataRender.js b/src/app/components/team/TeamMetadataRender.js index fe37e13870..b53f7edefc 100644 --- a/src/app/components/team/TeamMetadataRender.js +++ b/src/app/components/team/TeamMetadataRender.js @@ -78,7 +78,7 @@ function TeamMetadataRender({ team, about }) { diff --git a/test/spec/annotation_spec.rb b/test/spec/annotation_spec.rb index b7ccf1c339..6cf151bd5d 100644 --- a/test/spec/annotation_spec.rb +++ b/test/spec/annotation_spec.rb @@ -7,10 +7,10 @@ wait_for_selector("//span[contains(text(), 'annotation')]", :xpath) # Create annotation - expect(@driver.page_source.include?('No annotation fields')).to be(true) + expect(@driver.page_source.include?('No Workspace Annotations')).to be(true) expect(@driver.page_source.include?('my metadata')).to be(false) create_annotation(tab_class: '.team-settings__metadata-tab', task_type_class: '.edit-task-dialog__menu-item-free_text', task_name: 'my metadata') - expect(@driver.page_source.include?('No annotation fields')).to be(false) + expect(@driver.page_source.include?('No Workspace Annotations')).to be(false) expect(@driver.page_source.include?('my metadata')).to be(true) # Edit annotation From 77daa722e828bbe5666ba6f87f921312cffffc05 Mon Sep 17 00:00:00 2001 From: Brian Fleming Date: Wed, 17 Jul 2024 11:12:52 -0400 Subject: [PATCH 04/11] update scrolling on articles list --- src/app/components/article/Articles.module.css | 8 +++----- src/app/components/article/MediaArticles.js | 4 +--- src/app/components/cds/slideout/Slideout.js | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/app/components/article/Articles.module.css b/src/app/components/article/Articles.module.css index deeefbb1b8..a57077a139 100644 --- a/src/app/components/article/Articles.module.css +++ b/src/app/components/article/Articles.module.css @@ -1,7 +1,10 @@ .articlesSidebar { + overflow-y: auto; padding: 16px; + width: 100%; .articlesSidebarTopBar { + background: var(--color-white-100); display: flex; gap: 16px; justify-content: flex-end; @@ -16,11 +19,6 @@ text-align: center; } - .articlesSidebarListComponent { - max-height: 400px; - overflow: auto; - } - .articlesSidebarList { display: flex; flex-direction: column; diff --git a/src/app/components/article/MediaArticles.js b/src/app/components/article/MediaArticles.js index 128cf8a502..fde0f01627 100644 --- a/src/app/components/article/MediaArticles.js +++ b/src/app/components/article/MediaArticles.js @@ -151,9 +151,7 @@ const MediaArticlesComponent = ({ description="Message displayed on articles sidebar when an item has no articles." />
-
- -
+ )} diff --git a/src/app/components/cds/slideout/Slideout.js b/src/app/components/cds/slideout/Slideout.js index 0a82871ec7..996f20f029 100644 --- a/src/app/components/cds/slideout/Slideout.js +++ b/src/app/components/cds/slideout/Slideout.js @@ -111,7 +111,7 @@ const Slideout = ({ Slideout.defaultProps = { content: null, - footer: true, + footer: false, showCancel: false, cancelProps: {}, mainActionButton: null, From ed903ed51234e1636045ee4b3391def547a9e96a Mon Sep 17 00:00:00 2001 From: Brian Fleming Date: Wed, 17 Jul 2024 11:36:32 -0400 Subject: [PATCH 05/11] add tooltip for remove article button --- .../article/RemoveArticleButton.json | 5 ++++ .../components/article/RemoveArticleButton.js | 28 ++++++++++++++----- .../components/cds/slideout/Slideout.test.js | 1 + 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/localization/react-intl/src/app/components/article/RemoveArticleButton.json b/localization/react-intl/src/app/components/article/RemoveArticleButton.json index 45c18f921e..e8c8af7807 100644 --- a/localization/react-intl/src/app/components/article/RemoveArticleButton.json +++ b/localization/react-intl/src/app/components/article/RemoveArticleButton.json @@ -9,6 +9,11 @@ "description": "Banner displayed after an article is successfully removed from an item.", "defaultMessage": "Article successfully removed from item." }, + { + "id": "removeArticleButton.tooltip", + "description": "Tooltip message displayed on remove article button.", + "defaultMessage": "Remove article from media cluster" + }, { "id": "removeArticleButton.confirmationDialogTitle", "description": "Title displayed on a confirmation modal when a user tries to remove an article.", diff --git a/src/app/components/article/RemoveArticleButton.js b/src/app/components/article/RemoveArticleButton.js index 17e68d9fee..4225c9c64e 100644 --- a/src/app/components/article/RemoveArticleButton.js +++ b/src/app/components/article/RemoveArticleButton.js @@ -63,7 +63,6 @@ const RemoveArticleWrapperButton = ({ disabled, children }) => { return ( - } - onClick={() => setOpenDialog(true)} - /> + + } + arrow + > + + } + onClick={() => setOpenDialog(true)} + /> + + ', () => { const wrapper = mountWithIntl( {}} />); From 6aa4594b3139966cf1b414d64dce819d88e764b5 Mon Sep 17 00:00:00 2001 From: Brian Fleming Date: Wed, 17 Jul 2024 12:12:51 -0400 Subject: [PATCH 06/11] Change bulk actions language and limit count to the button so the user isn't confused with the pager --- .../src/app/components/media/BulkActionsMenu.json | 2 +- .../src/app/components/search/SearchResults.json | 5 ----- src/app/components/media/BulkActionsMenu.js | 5 ++++- src/app/components/search/SearchResults.js | 13 ------------- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/localization/react-intl/src/app/components/media/BulkActionsMenu.json b/localization/react-intl/src/app/components/media/BulkActionsMenu.json index 5b9c7be522..3e1a541724 100644 --- a/localization/react-intl/src/app/components/media/BulkActionsMenu.json +++ b/localization/react-intl/src/app/components/media/BulkActionsMenu.json @@ -82,6 +82,6 @@ { "id": "bulkActionsMenu.action", "description": "Button for popping the actions menu. User has to pick which action to perform upon currently selected items.", - "defaultMessage": "Action" + "defaultMessage": "Bulk Change [{count}]" } ] \ No newline at end of file diff --git a/localization/react-intl/src/app/components/search/SearchResults.json b/localization/react-intl/src/app/components/search/SearchResults.json index 8f5a9cce19..c97cdcf0ec 100644 --- a/localization/react-intl/src/app/components/search/SearchResults.json +++ b/localization/react-intl/src/app/components/search/SearchResults.json @@ -24,11 +24,6 @@ "description": "Pagination count of items returned", "defaultMessage": "{count, plural, one {1 / 1} other {{from} - {to} / #}}" }, - { - "id": "searchResults.withSelection", - "description": "Label for number of selected items", - "defaultMessage": "{selectedCount, plural, one {(# selected)} other {(# selected)}}" - }, { "id": "search.nextPage", "description": "Pagination button to go to next page", diff --git a/src/app/components/media/BulkActionsMenu.js b/src/app/components/media/BulkActionsMenu.js index 11c084c13b..005e97b86f 100644 --- a/src/app/components/media/BulkActionsMenu.js +++ b/src/app/components/media/BulkActionsMenu.js @@ -294,8 +294,11 @@ const BulkActionsMenu = ({ label={ } /> diff --git a/src/app/components/search/SearchResults.js b/src/app/components/search/SearchResults.js index b931d17342..8026de376c 100644 --- a/src/app/components/search/SearchResults.js +++ b/src/app/components/search/SearchResults.js @@ -595,19 +595,6 @@ function SearchResultsComponent({ count, }} /> - {filteredSelectedProjectMediaIds.length ? - - {txt => {txt}} - - : null - } From 21c755982ac6f07f11640aa79d072bca5f90c05f Mon Sep 17 00:00:00 2001 From: Brian Fleming Date: Wed, 17 Jul 2024 13:00:57 -0400 Subject: [PATCH 07/11] add cancel button to existing article slideout --- src/app/components/article/ChooseExistingArticleButton.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/components/article/ChooseExistingArticleButton.js b/src/app/components/article/ChooseExistingArticleButton.js index fbee8190ea..bef7d5cd8d 100644 --- a/src/app/components/article/ChooseExistingArticleButton.js +++ b/src/app/components/article/ChooseExistingArticleButton.js @@ -51,6 +51,8 @@ const ChooseExistingArticleButton = ({ teamSlug, onAdd }) => { { openSlideout && ( Date: Wed, 17 Jul 2024 13:50:33 -0400 Subject: [PATCH 08/11] add scroll indicator to articles list on media cluster page --- .../components/article/Articles.module.css | 42 ++++++++++++++++++- src/app/components/article/MediaArticles.js | 4 +- .../article/MediaArticlesDisplay.module.css | 18 +++++++- 3 files changed, 60 insertions(+), 4 deletions(-) diff --git a/src/app/components/article/Articles.module.css b/src/app/components/article/Articles.module.css index a57077a139..5717714ad4 100644 --- a/src/app/components/article/Articles.module.css +++ b/src/app/components/article/Articles.module.css @@ -1,13 +1,53 @@ .articlesSidebar { + display: flex; + flex: 1; + flex-direction: column; overflow-y: auto; - padding: 16px; + position: relative; width: 100%; + &::after { + background-color: var(--color-beige-86); + content: ''; + display: block; + height: 2px; + left: 0; + position: absolute; + right: 16px; + top: 62px; + z-index: 1; + } + .articlesSidebarTopBar { background: var(--color-white-100); display: flex; gap: 16px; + height: 62px; justify-content: flex-end; + padding: 16px; + } + + .articlesSidebarNoArticleWrapper { + display: flex; + flex: 1 1 auto; + flex-direction: column; + gap: 16px; + overflow-y: auto; + padding: 0 16px 16px; + width: 100%; + + &::before { + background-color: var(--color-white-100); + content: ''; + display: block; + flex-shrink: 0; + height: 2px; + left: 0; + margin: auto -16px 0; + position: relative; + right: 0; + z-index: 2; + } } .articlesSidebarNoArticle { diff --git a/src/app/components/article/MediaArticles.js b/src/app/components/article/MediaArticles.js index fde0f01627..7488b12fdb 100644 --- a/src/app/components/article/MediaArticles.js +++ b/src/app/components/article/MediaArticles.js @@ -133,7 +133,7 @@ const MediaArticlesComponent = ({ { hasArticle ? ( ) : ( - <> +
@@ -152,7 +152,7 @@ const MediaArticlesComponent = ({ />
- +
)} {/* Confirm dialog for replacing fact-check */} diff --git a/src/app/components/article/MediaArticlesDisplay.module.css b/src/app/components/article/MediaArticlesDisplay.module.css index df5a51a600..36aa833e7e 100644 --- a/src/app/components/article/MediaArticlesDisplay.module.css +++ b/src/app/components/article/MediaArticlesDisplay.module.css @@ -1,8 +1,24 @@ .mediaArticlesDisplay { display: flex; + flex: 1 1 auto; flex-direction: column; gap: 16px; - margin-top: 16px; + overflow-y: auto; + padding: 0 16px 16px; + width: 100%; + + &::before { + background-color: var(--color-white-100); + content: ''; + display: block; + flex-shrink: 0; + height: 2px; + left: 0; + margin: auto -16px 0; + position: relative; + right: 0; + z-index: 2; + } } .explainerCard:hover { From 6fc88308758191d8cc783b97b8a33c54c2beac8c Mon Sep 17 00:00:00 2001 From: Brian Fleming Date: Wed, 17 Jul 2024 13:57:19 -0400 Subject: [PATCH 09/11] no need to close drawer on media item pages now that we have 2 columns --- src/app/components/drawer/DrawerRail.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/components/drawer/DrawerRail.js b/src/app/components/drawer/DrawerRail.js index 20b206486a..e1976ab85a 100644 --- a/src/app/components/drawer/DrawerRail.js +++ b/src/app/components/drawer/DrawerRail.js @@ -61,7 +61,6 @@ const messages = defineMessages({ const DrawerRail = (props) => { const testPath = window.location.pathname; const isSettingsPage = /[^/]+\/settings?/.test(testPath); - const isMediaPage = /\/media\/[0-9]+/.test(testPath); const isArticlePage = /[^/]+\/articles?/.test(testPath); const isFeedPage = /^\/[^/]+\/feed(s)?($|\/)/.test(testPath); const teamRegex = window.location.pathname.match(/^\/([^/]+)/); @@ -95,7 +94,7 @@ const DrawerRail = (props) => { useEffect(() => { if (!!team && (currentUserIsMember || !team.private)) { - if (isMediaPage || !teamSlug) { + if (!teamSlug) { onDrawerOpenChange(false); window.storage.set('drawer.isOpen', false); } else if (window.storage.getValue('drawer.isOpen')) { From 8dd4f98c4a3f5a2afec2b421c1c342e0ab779aa1 Mon Sep 17 00:00:00 2001 From: Brian Fleming Date: Wed, 17 Jul 2024 14:13:50 -0400 Subject: [PATCH 10/11] All to all media in nav and header --- .../src/app/components/drawer/Projects/ProjectsComponent.json | 4 ++-- .../react-intl/src/app/components/search/AllItems.json | 4 ++-- src/app/components/drawer/Projects/ProjectsComponent.js | 2 +- src/app/components/search/AllItems.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/localization/react-intl/src/app/components/drawer/Projects/ProjectsComponent.json b/localization/react-intl/src/app/components/drawer/Projects/ProjectsComponent.json index b50cd110f9..61a9ce83cb 100644 --- a/localization/react-intl/src/app/components/drawer/Projects/ProjectsComponent.json +++ b/localization/react-intl/src/app/components/drawer/Projects/ProjectsComponent.json @@ -6,8 +6,8 @@ }, { "id": "projectsComponent.allItems", - "description": "Label for the 'All items' list displayed on the left sidebar", - "defaultMessage": "All" + "description": "Label for the 'All media' list displayed on the left sidebar", + "defaultMessage": "All Media" }, { "id": "projectsComponent.assignedToMe", diff --git a/localization/react-intl/src/app/components/search/AllItems.json b/localization/react-intl/src/app/components/search/AllItems.json index baf4bd3cb2..18aca6e5ea 100644 --- a/localization/react-intl/src/app/components/search/AllItems.json +++ b/localization/react-intl/src/app/components/search/AllItems.json @@ -1,7 +1,7 @@ [ { "id": "search.allClaimsTitle", - "description": "Page title for listing all items in check", - "defaultMessage": "All items" + "description": "Page title for listing all media items in check", + "defaultMessage": "All Media" } ] \ No newline at end of file diff --git a/src/app/components/drawer/Projects/ProjectsComponent.js b/src/app/components/drawer/Projects/ProjectsComponent.js index 92478b8cc2..961a2810cd 100644 --- a/src/app/components/drawer/Projects/ProjectsComponent.js +++ b/src/app/components/drawer/Projects/ProjectsComponent.js @@ -105,7 +105,7 @@ const ProjectsComponent = ({ >
- +
diff --git a/src/app/components/search/AllItems.js b/src/app/components/search/AllItems.js index cd3fcb83a1..cd986c33b4 100644 --- a/src/app/components/search/AllItems.js +++ b/src/app/components/search/AllItems.js @@ -15,7 +15,7 @@ export default function AllItems({ routeParams }) { } + title={} query={safelyParseJSON(routeParams.query, defaultQuery)} defaultQuery={defaultQuery} icon={} From 91da336502fb5dced4a6bc14f193d7ba787e7764 Mon Sep 17 00:00:00 2001 From: Brian Fleming Date: Wed, 17 Jul 2024 15:58:13 -0400 Subject: [PATCH 11/11] minor updates to new fact-check slideout to better match designs --- .../app/components/article/ArticleForm.json | 2 +- src/app/components/article/ArticleForm.js | 18 ++++----- .../components/article/ArticleForm.module.css | 38 ++++++++++++------- 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/localization/react-intl/src/app/components/article/ArticleForm.json b/localization/react-intl/src/app/components/article/ArticleForm.json index 74b3f363ad..6075b7ac45 100644 --- a/localization/react-intl/src/app/components/article/ArticleForm.json +++ b/localization/react-intl/src/app/components/article/ArticleForm.json @@ -67,7 +67,7 @@ { "id": "articleForm.noClaimDescript", "description": "Message overlay to tell the user they must complete additional fields to unlock this area", - "defaultMessage": "Start by adding Claim information for this Fact-Check" + "defaultMessage": "Start by adding Claim information
for this Fact-Check" }, { "id": "mediaFactCheck.factCheck", diff --git a/src/app/components/article/ArticleForm.js b/src/app/components/article/ArticleForm.js index c2edebb2d2..01583afd98 100644 --- a/src/app/components/article/ArticleForm.js +++ b/src/app/components/article/ArticleForm.js @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import { graphql, createFragmentContainer } from 'react-relay/compat'; import PropTypes from 'prop-types'; -import { FormattedMessage, FormattedDate } from 'react-intl'; +import { FormattedMessage, FormattedHTMLMessage, FormattedDate } from 'react-intl'; import Slideout from '../cds/slideout/Slideout'; import ButtonMain from '../cds/buttons-checkboxes-chips/ButtonMain'; import IconReport from '../../icons/fact_check.svg'; @@ -258,16 +258,12 @@ const ArticleForm = ({ }
{ claimDescriptionMissing && articleType === 'fact-check' ? -
-
-
- -
-
+
+
: null } diff --git a/src/app/components/article/ArticleForm.module.css b/src/app/components/article/ArticleForm.module.css index 674b52afd9..798cfc76f0 100644 --- a/src/app/components/article/ArticleForm.module.css +++ b/src/app/components/article/ArticleForm.module.css @@ -4,17 +4,6 @@ position: relative; } -.article-form-no-claim-overlay { - background: rgba(255 255 255 / .8); - bottom: 0; - left: 0; - position: absolute; - right: 0; - text-align: center; - top: 0; - z-index: 10; -} - .article-rating-wrapper { display: flex; gap: 4px; @@ -22,10 +11,33 @@ } .article-form-no-claim-container { + bottom: 0; color: var(--color-blue-32); - margin: 0 20px; + left: 0; position: absolute; - top: 30%; + right: 0; + text-align: center; + top: 0; + + span { + @mixin typography-subtitle2; + display: block; + margin: 80px 0 0; + position: relative; + z-index: 11; + } + + &::after { + background-color: rgba(255 255 255 / .85); + bottom: 0; + content: ''; + left: 0; + position: absolute; + right: 0; + text-align: center; + top: 0; + z-index: 10; + } } .article-form-info {