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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Update/social move notices near connections #38789

Merged
merged 4 commits into from
Aug 9, 2024
Merged

Update/social move notices near connections #38789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1524a9
Moved the notice components just below the connection icons
gmjuhasz Aug 8, 2024
2f3ac8a
changelog
gmjuhasz Aug 8, 2024
cb23006
Merge branch 'trunk' into update/social-move-notices-near-connections
gmjuhasz Aug 9, 2024
b45abfb
Fixup versions
gmjuhasz Aug 9, 2024
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
4 changes: 4 additions & 0 deletions ...ts/js-packages/publicize-components/changelog/update-social-move-notices-near-connections
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Moved the connection notices in the editor
2 changes: 1 addition & 1 deletion projects/js-packages/publicize-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-publicize-components",
"version": "0.59.0",
"version": "0.60.0-alpha",
"description": "A library of JS components required by the Publicize editor plugin",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/publicize-components/#readme",
"bugs": {
Expand Down
6 changes: 6 additions & 0 deletions projects/js-packages/publicize-components/src/components/form/connections-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ import { useCallback } from 'react';
import usePublicizeConfig from '../../hooks/use-publicize-config';
import useSocialMediaConnections from '../../hooks/use-social-media-connections';
import PublicizeConnection from '../connection';
import { BrokenConnectionsNotice } from './broken-connections-notice';
import { EnabledConnectionsNotice } from './enabled-connections-notice';
import { MediaValidationNotices } from './media-validation-notices';
import { SettingsButton } from './settings-button';
import styles from './styles.module.scss';
import { UnsupportedConnectionsNotice } from './unsupported-connections-notice';
import { useConnectionState } from './use-connection-state';

export const ConnectionsList: React.FC = () => {
Expand Down Expand Up @@ -49,6 +52,9 @@ export const ConnectionsList: React.FC = () => {
);
} ) }
</ul>
<MediaValidationNotices />
<BrokenConnectionsNotice />
<UnsupportedConnectionsNotice />
<EnabledConnectionsNotice />
{ ! needsUserConnection ? <SettingsButton variant="secondary" /> : null }
</div>
Expand Down
6 changes: 0 additions & 6 deletions projects/js-packages/publicize-components/src/components/form/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,11 @@ import { store as socialStore } from '../../social-store';
import { ThemedConnectionsModal as ManageConnectionsModal } from '../manage-connections-modal';
import { SocialPostModal } from '../social-post-modal/modal';
import { AdvancedPlanNudge } from './advanced-plan-nudge';
import { BrokenConnectionsNotice } from './broken-connections-notice';
import { ConnectionsList } from './connections-list';
import { MediaValidationNotices } from './media-validation-notices';
import { SettingsButton } from './settings-button';
import { ShareCountInfo } from './share-count-info';
import { SharePostForm } from './share-post-form';
import styles from './styles.module.scss';
import { UnsupportedConnectionsNotice } from './unsupported-connections-notice';

/**
* The Publicize form component. It contains the connection list, and the message box.
Expand Down Expand Up @@ -62,9 +59,6 @@ export default function PublicizeForm() {
</PanelRow>
{ featureFlags.useEditorPreview ? <SocialPostModal /> : null }
<ShareCountInfo />
<BrokenConnectionsNotice />
<UnsupportedConnectionsNotice />
<MediaValidationNotices />
</>
) : null }
<PanelRow>
Expand Down
Loading