Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix constent list view #345

Closed
wants to merge 35 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
cbb68e7
feat(framework): Updated version of UI framework
pavlovicnemanja Jun 1, 2023
540d22a
fix(publishing): Fixed issue with publishing page
pavlovicnemanja Jun 2, 2023
ac89edd
fix(subnav): Fixed issue with subnav
pavlovicnemanja Jun 13, 2023
461cf96
fix(radio): Fixed issue with radio group
pavlovicnemanja Jun 13, 2023
f27b827
feat(fb): Removed FBIA from publisher
pavlovicnemanja Jun 22, 2023
b878cdd
feat(seo): Changed seo value to envolvedFrom
pavlovicnemanja Jun 22, 2023
af8866d
feat(fba): Remove FBA from multiple places
pavlovicnemanja Jun 22, 2023
870aed6
feat(fba): Remove fba for one more space
pavlovicnemanja Jun 22, 2023
f01b52c
feat(seo): Changed saveMetadata url
pavlovicnemanja Jun 22, 2023
f445881
saveMetaData to guid
IvanJelicSF Jun 22, 2023
f94320d
Layout and Dark theme fixes
fritzSF Jul 4, 2023
91bd266
framework version bump
fritzSF Jul 4, 2023
9f210ec
Merge pull request #339 from fritzSF/develop
pavlovicnemanja Jul 5, 2023
b949425
fix(theme): Fixed dark theme
pavlovicnemanja Aug 1, 2023
f1fe2e3
Merge pull request #340 from pavlovicnemanja/develop
pavlovicnemanja Aug 1, 2023
654c5b3
fix(lists): Fixed content lists ordering
pavlovicnemanja Aug 5, 2023
a09fc4c
feat(UI): Applied UI Fixes
pavlovicnemanja Aug 5, 2023
c3a1779
feat(logo, spinner): Fixed issue with spinner and added dark logo
pavlovicnemanja Aug 5, 2023
4f28980
fix(package): Fixed issue with version of ui framework
pavlovicnemanja Aug 5, 2023
3b66fec
feat(ui-framework): Updated version of ui framework
pavlovicnemanja Aug 6, 2023
642621d
feat(dropdowns): Improvements on dropdown components
pavlovicnemanja Aug 14, 2023
7bc827f
fix(list): Fixed automatic/manual lists
pavlovicnemanja Aug 15, 2023
42edf51
fix(MultiSelect): Fixed metadata multiselect
pavlovicnemanja Aug 15, 2023
fa8182a
feat(list): Updated lists UI
pavlovicnemanja Aug 15, 2023
a0bb939
feat(spacing): Fixed spacing in filter panel
pavlovicnemanja Aug 15, 2023
3e303d8
fix(multiselect): Fixed issue with multiselect
pavlovicnemanja Sep 15, 2023
8ea4c0d
fix(automatic): Fixed filer panel on automatic lists
pavlovicnemanja Sep 15, 2023
9091b87
fix(dropdown): Fixed issue with background on dropdown
pavlovicnemanja Sep 22, 2023
32b01fe
feat(website): Added improved UI website
pavlovicnemanja Sep 22, 2023
04a83e6
fix(state): Removed unused state items
pavlovicnemanja Sep 22, 2023
12a05bf
Fix authoring react publisher fixes
thecalcc Oct 31, 2023
5b1e582
Merge pull request #342 from thecalcc/authoring-react
thecalcc Oct 31, 2023
6dfab1d
Fix v2. Remove absolute elements
thecalcc Nov 1, 2023
c6a8b47
Merge pull request #344 from thecalcc/fix-v2
thecalcc Nov 2, 2023
e9aadf6
Fix cotnent list view
thecalcc Nov 3, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(fb): Removed FBIA from publisher
pavlovicnemanja committed Jun 22, 2023
commit f27b827d8c87a86defe08c7eeda42c4461593d02
3 changes: 0 additions & 3 deletions client/components/Output/ArticleItem.jsx
Original file line number Diff line number Diff line change
@@ -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 }) => {
/>
))}
</span>
{isPublishedFbia ? <Label text="facebook" type="primary" /> : null}
{isPublishedAppleNews ? (
<Label text="Apple News" color="pink--400" />
) : null}
6 changes: 0 additions & 6 deletions client/components/Output/PublishPane/Destination.jsx
Original file line number Diff line number Diff line change
@@ -133,11 +133,6 @@ class Destination extends React.Component {
? destination.route.name
: null}
</span>
{!!destination.is_published_fbia && (
<span className="sd-list-item__inline-text sd-list-item--element-grow no-line-height">
<i className="icon-facebook icon--blue icon--full-opacity"></i>
</span>
)}
{!!destination.paywall_secured && (
<span className="sd-list-item__inline-text no-line-height">
<i className="icon-paywall icon--full-opacity icon--orange"></i>
@@ -238,7 +233,6 @@ class Destination extends React.Component {
</div>
)}
<PublishingOptionSwitches
fbiaEnabled={tenant.fbia_enabled}
paywallEnabled={tenant.paywall_enabled}
appleNewsEnabled={
tenant.apple_news_config && tenant.apple_news_config.channel_id
2 changes: 0 additions & 2 deletions client/components/Output/PublishPane/Publish.jsx
Original file line number Diff line number Diff line change
@@ -101,7 +101,6 @@ class Publish extends React.Component {
let destination = {
tenant: tenant,
route: {},
is_published_fbia: false,
paywall_secured: false,
is_published_to_apple_news: false,
status: "new",
@@ -116,7 +115,6 @@ class Publish extends React.Component {
let destination = {
tenant: item.tenant.code,
route: item.route && item.route.id ? item.route.id : null,
is_published_fbia: item.is_published_fbia,
published: item.route && item.route.id ? true : false,
paywall_secured: item.paywall_secured,
is_published_to_apple_news: item.is_published_to_apple_news,
1 change: 0 additions & 1 deletion client/components/Output/PublishPane/PublishPane.jsx
Original file line number Diff line number Diff line change
@@ -87,7 +87,6 @@ class PublishPane extends React.Component {
destinations.push({
tenant: tenant,
route: item.route,
is_published_fbia: item.is_published_fbia,
status: item.status,
updated_at: item.updated_at,
paywall_secured: item.paywall_secured,
17 changes: 1 addition & 16 deletions client/components/TargetedPublishing/Destination.jsx
Original file line number Diff line number Diff line change
@@ -21,13 +21,11 @@ class Destination extends Component {
let pwaUrl = null;
let siteName = null;
let hasOutputChannel = false;
let hasFbiaEnabled = false;
let hasPaywallEnabled = false;
let hasAppleNewsEnabled = false;

if (props.rule || props.site) {
destination = {
is_published_fbia: false,
published: true,
paywall_secured: false,
package_guid: props.item.evolvedfrom
@@ -39,7 +37,6 @@ class Destination extends Component {
if (props.site) {
destination.tenant = props.site.code;

hasFbiaEnabled = props.site.fbia_enabled;
hasPaywallEnabled = props.site.paywall_enabled;
hasAppleNewsEnabled =
props.site.apple_news_config &&
@@ -57,7 +54,6 @@ class Destination extends Component {
} else if (props.rule) {
destination.tenant = props.rule.tenant.code;
destination.route = props.rule.route ? props.rule.route.id : null;
destination.is_published_fbia = props.rule.is_published_fbia;
destination.is_published_to_apple_news =
props.rule.is_published_to_apple_news;
destination.published = props.rule.published;
@@ -66,7 +62,6 @@ class Destination extends Component {
? props.rule.content_lists
: [];

hasFbiaEnabled = props.rule.tenant.fbia_enabled;
hasPaywallEnabled = props.rule.tenant.paywall_enabled;
hasAppleNewsEnabled =
props.rule.tenant.apple_news_config &&
@@ -102,7 +97,6 @@ class Destination extends Component {
hasOutputChannel: hasOutputChannel ? hasOutputChannel : false,
hasPaywallEnabled: hasPaywallEnabled ? hasPaywallEnabled : false,
hasAppleNewsEnabled: hasAppleNewsEnabled ? true : false,
hasFbiaEnabled: hasFbiaEnabled ? hasFbiaEnabled : false,
isOpen: props.isOpen,
deleted: false,
};
@@ -120,7 +114,6 @@ class Destination extends Component {
(props.site && !_.isEqual(props.site, prevProps.site))
) {
let destination = {
is_published_fbia: false,
published: true,
paywall_secured: false,
package_guid: props.item.evolvedfrom
@@ -136,14 +129,12 @@ class Destination extends Component {
let pwaUrl = null;
let siteName = null;
let hasOutputChannel = false;
let hasFbiaEnabled = false;
let hasPaywallEnabled = false;
let hasAppleNewsEnabled = false;

if (props.site) {
destination.tenant = props.site.code;

hasFbiaEnabled = props.site.fbia_enabled;
hasPaywallEnabled = props.site.paywall_enabled;
hasAppleNewsEnabled =
props.site.apple_news_config &&
@@ -159,7 +150,6 @@ class Destination extends Component {
} else if (props.rule) {
destination.tenant = props.rule.tenant.code;
destination.route = props.rule.route ? props.rule.route.id : null;
destination.is_published_fbia = props.rule.is_published_fbia;
destination.is_published_to_apple_news =
props.rule.is_published_to_apple_news;
destination.published = props.rule.published;
@@ -168,7 +158,6 @@ class Destination extends Component {
? props.rule.content_lists
: [];

hasFbiaEnabled = props.rule.tenant.fbia_enabled;
hasPaywallEnabled = props.rule.tenant.paywall_enabled;
hasAppleNewsEnabled =
props.rule.tenant.apple_news_config &&
@@ -200,7 +189,6 @@ class Destination extends Component {
hasOutputChannel: hasOutputChannel,
hasPaywallEnabled: hasPaywallEnabled,
hasAppleNewsEnabled: hasAppleNewsEnabled,
hasFbiaEnabled: hasFbiaEnabled,
isOpen: props.isOpen,
},
this.getContentLists
@@ -371,9 +359,7 @@ class Destination extends Component {
if (this.props.rule.tenant.output_channel) {
publishRoute = this.props.rule.tenant.output_channel.type;
} else {
publishRoute = this.state.destination.is_published_fbia
? this.props.rule.route.name + ", Facebook"
: this.props.rule.route.name;
publishRoute = this.props.rule.route.name;
}
}

@@ -478,7 +464,6 @@ class Destination extends Component {
</div>
)}
<PublishingOptionSwitches
fbiaEnabled={this.state.hasFbiaEnabled}
paywallEnabled={this.state.hasPaywallEnabled}
appleNewsEnabled={this.state.hasAppleNewsEnabled}
destination={this.state.destination}
7 changes: 0 additions & 7 deletions client/components/generic/PreviewStatusLabels.jsx
Original file line number Diff line number Diff line change
@@ -5,11 +5,9 @@ import ArticleStatusLabel from "../UI/ArticleStatusLabel";
import { Label } from "superdesk-ui-framework/react";

const PreviewStatusLabels = ({ articles }) => {
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 ? (
<span style={{ marginRight: ".6em" }}>
<Label text="facebook" type="primary" />
</span>
) : null}
{isPublishedAppleNews ? (
<span style={{ marginRight: ".6em" }}>
<Label text="Apple News" color="pink--400" />
19 changes: 1 addition & 18 deletions client/components/generic/PublishingOptionSwitches.jsx
Original file line number Diff line number Diff line change
@@ -4,33 +4,17 @@ import PropTypes from "prop-types";
import { Checkbox } from "superdesk-ui-framework/react";

const PublishingOptionSwitches = ({
fbiaEnabled,
paywallEnabled,
appleNewsEnabled,
destination,
onChange,
}) => {
if (paywallEnabled || fbiaEnabled || appleNewsEnabled) {
if (paywallEnabled || appleNewsEnabled) {
return (
<div
className="flex-grid flex-grid--wrap-items flex-grid--small-1 flex-grid--medium-2"
style={{ overflow: "visible" }}
>
{fbiaEnabled && (
<div
className="flex-grid__item"
style={{ marginBottom: "1em" }}
sd-tooltip="Publish to facebook"
>
<span>
<Checkbox
label={{ text: "FBIA" }}
checked={destination.is_published_fbia}
onChange={(value) => onChange(value, "is_published_fbia")}
/>
</span>
</div>
)}

{appleNewsEnabled && (
<div
@@ -73,7 +57,6 @@ const PublishingOptionSwitches = ({
};

PublishingOptionSwitches.propTypes = {
fbiaEnabled: PropTypes.bool.isRequired,
paywallEnabled: PropTypes.bool.isRequired,
appleNewsEnabled: PropTypes.bool.isRequired,
destination: PropTypes.object.isRequired,