From cbb68e719e0600d817a2c75a71d17ea7a770586c Mon Sep 17 00:00:00 2001 From: pavlovicnemanja Date: Thu, 1 Jun 2023 11:08:37 +0200 Subject: [PATCH 01/31] feat(framework): Updated version of UI framework --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4948f1c..78c2787 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "react": "16.9.0", "react-dom": "16.9.0", "react-virtualized": "^9.22.2", - "superdesk-ui-framework": "^2.3.8" + "superdesk-ui-framework": "^3.0.29" }, "devDependencies": { "@babel/plugin-proposal-class-properties": "^7.4.4", From 540d22a4458f16d2c48cb50dbf32b1bf3500a8a8 Mon Sep 17 00:00:00 2001 From: pavlovicnemanja Date: Fri, 2 Jun 2023 13:43:37 +0200 Subject: [PATCH 02/31] fix(publishing): Fixed issue with publishing page --- client/components/TargetedPublishing/MetaData.jsx | 1 + .../components/TargetedPublishing/RelatedArticlesStatus.jsx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/components/TargetedPublishing/MetaData.jsx b/client/components/TargetedPublishing/MetaData.jsx index f557fac..b42fbca 100644 --- a/client/components/TargetedPublishing/MetaData.jsx +++ b/client/components/TargetedPublishing/MetaData.jsx @@ -20,6 +20,7 @@ class MetaData extends Component { } componentDidMount() { + if (!this.props.item) return; this.getMetaData(); } diff --git a/client/components/TargetedPublishing/RelatedArticlesStatus.jsx b/client/components/TargetedPublishing/RelatedArticlesStatus.jsx index 50145a5..fbf71c5 100644 --- a/client/components/TargetedPublishing/RelatedArticlesStatus.jsx +++ b/client/components/TargetedPublishing/RelatedArticlesStatus.jsx @@ -16,7 +16,7 @@ class RelatedArticlesStatus extends React.Component { } componentDidMount() { - if (!this.props.item.associations) return; + if (!this.props.item?.associations) return; this.getRelatedArticles(); } @@ -37,7 +37,7 @@ class RelatedArticlesStatus extends React.Component { }; render() { - if (!this.props.item.associations) { + if (!this.props.item?.associations) { return null; } From ac89edd1dfc1c212943a9450bd323a91edef4694 Mon Sep 17 00:00:00 2001 From: pavlovicnemanja Date: Tue, 13 Jun 2023 12:44:17 +0200 Subject: [PATCH 03/31] fix(subnav): Fixed issue with subnav --- client/components/Output/Subnav.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/Output/Subnav.jsx b/client/components/Output/Subnav.jsx index 279adb7..b3e552a 100644 --- a/client/components/Output/Subnav.jsx +++ b/client/components/Output/Subnav.jsx @@ -4,7 +4,7 @@ import classNames from "classnames"; import Store from "./Store"; import { CheckButtonGroup, - RadioButton, + RadioButtonGroup, Badge, } from "superdesk-ui-framework/react"; import TenantSelect from "./TenantSelect"; @@ -19,7 +19,7 @@ const Subnav = (props) => {
- Date: Tue, 13 Jun 2023 13:03:34 +0200 Subject: [PATCH 04/31] fix(radio): Fixed issue with radio group --- client/components/Analytics/Analytics.jsx | 4 ++-- client/components/ContentLists/Listing.jsx | 4 ++-- client/components/Output/PublishPane/Publish.jsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/components/Analytics/Analytics.jsx b/client/components/Analytics/Analytics.jsx index c09c9fc..9f1ea80 100644 --- a/client/components/Analytics/Analytics.jsx +++ b/client/components/Analytics/Analytics.jsx @@ -3,7 +3,7 @@ import PropTypes from "prop-types"; import classNames from "classnames"; import _ from "lodash"; -import { CheckButtonGroup, RadioButton } from "superdesk-ui-framework/react"; +import { CheckButtonGroup, RadioButtonGroup } from "superdesk-ui-framework/react"; import SitesSideNav from "../generic/SitesSideNav"; import FiltersPanel from "./FiltersPanel"; @@ -254,7 +254,7 @@ class Analytics extends React.Component {
-
-
- Date: Thu, 22 Jun 2023 14:17:13 +0200 Subject: [PATCH 05/31] feat(fb): Removed FBIA from publisher --- client/components/Output/ArticleItem.jsx | 3 --- .../Output/PublishPane/Destination.jsx | 6 ------ .../components/Output/PublishPane/Publish.jsx | 2 -- .../Output/PublishPane/PublishPane.jsx | 1 - .../TargetedPublishing/Destination.jsx | 17 +---------------- .../generic/PreviewStatusLabels.jsx | 7 ------- .../generic/PublishingOptionSwitches.jsx | 19 +------------------ 7 files changed, 2 insertions(+), 53 deletions(-) diff --git a/client/components/Output/ArticleItem.jsx b/client/components/Output/ArticleItem.jsx index f04f934..e3cba37 100644 --- a/client/components/Output/ArticleItem.jsx +++ b/client/components/Output/ArticleItem.jsx @@ -57,11 +57,9 @@ const ArticleItem = ({ item, style, onRemove }) => { ); } - let isPublishedFbia = false; let isPublishedAppleNews = false; item.articles.forEach((article) => { - if (article.is_published_fbia) isPublishedFbia = true; if (article.is_published_to_apple_news) isPublishedAppleNews = true; }); @@ -169,7 +167,6 @@ const ArticleItem = ({ item, style, onRemove }) => { /> ))} - {isPublishedFbia ?
)} )} { - let isPublishedFbia = false; let isPublishedAppleNews = false; articles.forEach((article) => { - if (article.is_published_fbia) isPublishedFbia = true; if (article.is_published_to_apple_news) isPublishedAppleNews = true; }); @@ -46,11 +44,6 @@ const PreviewStatusLabels = ({ articles }) => { } /> ))} - {isPublishedFbia ? ( - - - ) : null} {isPublishedAppleNews ? (