Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 32d3e82
Author: Richard Ortiz <[email protected]>
Date:   Fri Nov 8 12:16:03 2024 +0100

    Global Styles on Personal: Added FEATURE_STYLE_CUSTOMIZATION to Personal Plan (#96159)

    * Added FEATURE_STYLE_CUSTOMIZATION to Personal plan when the feature flag is enabled

    * Fixed code style issue. Added the feature to the upgrade comparison table

commit b4ddf2f
Author: Tony Arcangelini <[email protected]>
Date:   Fri Nov 8 04:15:22 2024 -0600

    Help Center: use support interactions (#96049)

    * Help Center: use support interactions

    * useChat hook added - account for ZD

    * Yeah... I know this is a lot

    * Fix update source to event_source

    * Interactions loading consistently

    * Fix bug when switching interaction

    * Fix types

    * minor fixup

    * Fix types

    * Fix a few bugs

    * Fixed get conversation function return type

    * Fix useEffect dependency

    * Working History

    * Working History 2

    * Add stability to data fetching

    * Fix handoff

    * Fix types

    * Fix first reply to ZD

    * Fix bug in old version

    * Improved recent conversations

    * Fix tracking

    * Help Center: use support interactions

    * useChat hook added - account for ZD

    * Yeah... I know this is a lot

    * Fix update source to event_source

    * Interactions loading consistently

    * Fix bug when switching interaction

    * Fix types

    * minor fixup

    * Fix types

    * Fixed get conversation function return type

    * Fix a few bugs

    * Fix useEffect dependency

    * Working History

    * Working History 2

    * Add stability to data fetching

    * Fix handoff

    * Fix types

    * Fix first reply to ZD

    * Fix bug in old version

    * Improved recent conversations

    * Fix tracking

    * Fix regex to convert text url

    ---------

    Co-authored-by: heavyweight <[email protected]>
    Co-authored-by: Renan <[email protected]>
    Co-authored-by: escapemanuele <[email protected]>

commit 904fe23
Author: Madhu Dollu <[email protected]>
Date:   Fri Nov 8 12:52:45 2024 +0530

    remove email upsell from checkout/thank-you page (#96138)

commit f7c8207
Author: okmttdhr, tada <[email protected]>
Date:   Fri Nov 8 15:45:54 2024 +0900

    Remove unnecessary style overrides regarding fly-out panel (#96097)

commit 23a4db8
Author: Yashwin Poojary <[email protected]>
Date:   Fri Nov 8 09:53:50 2024 +0530

    A4A > E2E tests: Creating a new E2E test user (#96132)

commit 536b9b8
Author: Candy Tsai <[email protected]>
Date:   Fri Nov 8 11:16:19 2024 +0800

    Fix the flickering of upsell banners in /hosting-config (#96141)

    * Fix the flickering of upsell banners in /hosting-config

    * Show banner for ecommerce trial

commit cdd3d6b
Author: Candy Tsai <[email protected]>
Date:   Fri Nov 8 11:15:57 2024 +0800

    Update /hosting-config layout (#96136)

    * Move PHP version right after WordPress version

    * Remove period from Learn more

    * Remove period for Review privacy settings

commit 479fd79
Author: Paulo Marcos Trentin <[email protected]>
Date:   Thu Nov 7 18:54:58 2024 -0300

    Fixed plugin count on the old interface (#96168)

commit c3ed7e2
Author: Paulo Marcos Trentin <[email protected]>
Date:   Thu Nov 7 17:52:00 2024 -0300

    Updated auto-update copy (#96165)

commit 06e5b5a
Author: Paulo Marcos Trentin <[email protected]>
Date:   Thu Nov 7 17:16:16 2024 -0300

    Jetpack cloud visual improvements for DataViews integration (#96156)

    * Jetpack cloud improvements:
    - Fixed title, edge of the table, search box, filters aligments
    - Fixed accent color and hover state colors
    - Fixed "Button style" on DataViews filters

    * Improved loading style

commit 6aa6b9e
Author: Paulo Marcos Trentin <[email protected]>
Date:   Thu Nov 7 17:06:05 2024 -0300

    Optimized how we load plugins and improved load state (#96150)

    * Improved screen loading state and plugin processing speed

    * Test updated

commit 9648a04
Author: Chris Holder <[email protected]>
Date:   Thu Nov 7 14:04:25 2024 -0600

    Reader Recent Overhaul: Add styling for sidebar section (#96122)

commit efefa75
Author: Allison Levine <[email protected]>
Date:   Thu Nov 7 14:23:35 2024 -0500

    Reader Recent Feed Overhaul: Fix site icon (#96152)

    * Fix site icon for recent feed overhaul.

    * Use avatar as backup icon.

    * Fix type.

commit a7444c9
Author: Allison Levine <[email protected]>
Date:   Thu Nov 7 13:43:14 2024 -0500

    Reader Recent Feed Overhaul: Add mobile view (#96127)

    * Add mobile view to Recent Feed Overhaul.

    * Use CSS to show hide the post.

    * Fix featured image getting squished.

    * Revert type changes.

commit 925549f
Author: Calypso Bot <[email protected]>
Date:   Thu Nov 7 19:35:41 2024 +0100

    chore(deps): update webpack packages (#91492)

    * chore(deps): update webpack packages

    * Update snapshots

    ---------

    Co-authored-by: Renovate Bot <[email protected]>
    Co-authored-by: Chris Holder <[email protected]>

commit 19b5be3
Author: Anthony Grullon <[email protected]>
Date:   Thu Nov 7 13:30:10 2024 -0500

    Help Center: Update odie header text based on pathname condition (#96153)

commit f7cd961
Author: Anthony Grullon <[email protected]>
Date:   Thu Nov 7 12:28:21 2024 -0500

    Help Center Chat: Enhance file upload button styles for better accessibility (#96148)

    * Help Center Chat: Enhance file upload button styles for better accessibility

    * change outline color

commit c68e28c
Author: Roberto Aranda <[email protected]>
Date:   Thu Nov 7 18:14:53 2024 +0100

    Performance Profiler: Remove Generated with AI badge as it confuses users (#96147)

commit 9ff488f
Author: Emanuele Buccelli <[email protected]>
Date:   Thu Nov 7 17:45:45 2024 +0100

    Help Center: Fix styling padding (#96146)

    * Fix padding

    * Fix styles

commit c8e6928
Author: Dusty Reagan <[email protected]>
Date:   Thu Nov 7 09:57:50 2024 -0600

    Recent Feed Overhaul: Add FullPostView layout prop (#96072)

    * Add FullPostView layout prop

    * Styling in progress

    * Call translate directly

    * Name and follow count working

    * Disable showRelatedPosts if not isDefaultLayout

    * Added site icon

    * Completed header formating

    * Works and updated style

    * Remove type update

    * Update comment

    * Set a default site icon if no src exists and check for default layout

commit b7e65ef
Author: Gabriel Caires <[email protected]>
Date:   Thu Nov 7 15:41:35 2024 +0000

    Post-purchase: Automatically cancel migration when user exits migration (#96123)

    * Refactor migration status update hook

    * Set migration as pending when the credentials are required

    * Set migration as pending when is DIY

    * Fix wrong type keyword

    * Cancel migration when user click on back button

    * Cancel a migration when the user select Import instead of migrate

    * Add tests

    * Rename hook

    * When the feature flag is off we should continue setting started

commit d537efc
Author: Damien Alleyne <[email protected]>
Date:   Thu Nov 7 11:28:49 2024 -0400

    Refactor: Move global staticFilters constant to class method (#96116)

    * Refactor: Move global staticFilters constant to class method

    Follow-up to #95995 (review)

    * Implement code review suggestions

commit fd0906b
Author: Aurorum <[email protected]>
Date:   Thu Nov 7 15:19:13 2024 +0000

    Site Address Changer: Fix Bleeding Dialog Styles (#96142)

    * Start new branch

    * Add showCloseIcon

    * Remove unneeded styles

commit 1f1ece8
Author: Gabriel Caires <[email protected]>
Date:   Thu Nov 7 14:55:04 2024 +0000

    Post- Purchase: Set a migration as `pending-DIFM/DIF` when user arrives on the credential/instructions step (#96103)

commit 5f34350
Author: Paulo Cruz <[email protected]>
Date:   Thu Nov 7 10:26:02 2024 -0300

    Fix duplicated email verified notice (#96125)

commit 9e3be02
Author: Renan Carvalho <[email protected]>
Date:   Thu Nov 7 13:49:52 2024 +0100

    Help Center: Add temp flag for showing simplified chat history (#96139)

    * Add temporary flag for displaying simplified chat history

    * Improve border

commit 172dc36
Author: Yuliyan Slavchev <[email protected]>
Date:   Thu Nov 7 14:18:57 2024 +0200

    localizeUrl: Update wp-login rule to support Romanian and Vietnamese (#95943)

commit 6658443
Author: Ashar Fuadi <[email protected]>
Date:   Thu Nov 7 18:57:31 2024 +0700

    Untangling: Add Marketing -> Connections (#96135)

commit 7575c0f
Author: Roberto Aranda <[email protected]>
Date:   Thu Nov 7 12:40:11 2024 +0100

    Performance Profiler: Consolidate all time metrics to seconds (#96140)

commit fe086b8
Author: Mikael Korpela <[email protected]>
Date:   Thu Nov 7 13:03:50 2024 +0200

    Importer: use "import" term for CTA rather than "Start import" (#96111)

commit e782f60
Author: Kosta <[email protected]>
Date:   Thu Nov 7 11:29:31 2024 +0100

    Help Center: add image upload for chats (#96105)

    * HelpCenter: add upload (wip)

    * Minor fixes and refactoring

    * Changed icon

    * Use correct constants

    * Improve isAttachingFile state

    * Store global clientId as fallback

    * Fix attach button style

    * Move up the flag check

    * Improved function

    ---------

    Co-authored-by: escapemanuele <[email protected]>
    Co-authored-by: Anthony Grullon <[email protected]>
    Co-authored-by: Renan <[email protected]>

commit 9f3d633
Author: Anna McPhee <[email protected]>
Date:   Thu Nov 7 04:08:25 2024 -0600

    Stats: Chart refresh- CSS styling (#95980)

    * create new chart instance behind feature flag

    * adds a className prop to the chart

    * Add ChartHeader component for better composition

    * update show/hide legend prop for legacy vs new chart

    * Adds dedicated header component with title and controls props

    * Reorganise header layout

    * Adds activeTab to the chart title

    * remove control section for a future PR

    * add a showChartHeader prop

    * small fix to header title display

    * add in accidentally removed comment

    * add date filtering enabled CSS classname

    * add chart styling

    * remove !importants, increase title font size

    * adjust font weight

    * update axis marger border color

    * fix the code styling

commit c787874
Author: Emanuele Buccelli <[email protected]>
Date:   Thu Nov 7 10:42:11 2024 +0100

    Help Center: Update copy (#96076)

    * Update copy

    * Update help center copies with flag

    * Change the right component

    * Fix Odie initial message

    * Help is on the way

    * Change header text

    * Minimized History

    * Less Odie in HC

    ---------

    Co-authored-by: Anthony Grullon <[email protected]>
  • Loading branch information
@annacmc
annacmc committed Nov 8, 2024
1 parent d976d7c commit 0105657
Show file tree
Hide file tree
Showing 232 changed files with 2,808 additions and 2,019 deletions.
6 changes: 3 additions & 3 deletions apps/blaze-dashboard/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@
"@automattic/webpack-extensive-lodash-replacement-plugin": "workspace:^",
"@automattic/webpack-inline-constant-exports-plugin": "workspace:^",
"@automattic/wp-babel-makepot": "workspace:^",
"@wordpress/dependency-extraction-webpack-plugin": "^5.9.0",
"@wordpress/dependency-extraction-webpack-plugin": "^6.11.0",
"autoprefixer": "^10.2.5",
"gettext-parser": "^6.0.0",
"html-webpack-plugin": "^5.6.0",
"html-webpack-plugin": "^5.6.3",
"lodash": "^4.17.21",
"mkdirp": "^1.0.4",
"node-fetch": "^2.6.6",
"path-browserify": "^1.0.1",
"postcss": "^8.3.11",
"webpack": "^5.94.0",
"webpack": "^5.95.0",
"webpack-bundle-analyzer": "^4.10.2"
}
}
4 changes: 2 additions & 2 deletions apps/command-palette-wp-admin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
"@automattic/calypso-eslint-overrides": "workspace:^",
"@automattic/languages": "workspace:^",
"@automattic/wp-babel-makepot": "workspace:^",
"@wordpress/dependency-extraction-webpack-plugin": "^5.9.0",
"@wordpress/dependency-extraction-webpack-plugin": "^6.11.0",
"gettext-parser": "^6.0.0",
"lodash": "^4.17.21",
"mkdirp": "^1.0.4",
"node-fetch": "^2.6.6",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.5",
"webpack": "^5.94.0",
"webpack": "^5.95.0",
"webpack-bundle-analyzer": "^4.10.2"
}
}
4 changes: 2 additions & 2 deletions apps/happy-blocks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
"@automattic/calypso-apps-builder": "workspace:^",
"@emotion/react": "^11.11.1",
"@testing-library/react": "^15.0.7",
"@wordpress/readable-js-assets-webpack-plugin": "^3.0.0",
"@wordpress/readable-js-assets-webpack-plugin": "^3.11.0",
"copy-webpack-plugin": "^10.2.4",
"glob": "^7.1.6",
"postcss": "^8.4.5",
"webpack": "^5.94.0"
"webpack": "^5.95.0"
}
}
6 changes: 3 additions & 3 deletions apps/help-center/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
"@automattic/calypso-build": "workspace:^",
"@automattic/calypso-typescript-config": "workspace:^",
"@automattic/wp-babel-makepot": "workspace:^",
"@wordpress/dependency-extraction-webpack-plugin": "5.9.0",
"@wordpress/readable-js-assets-webpack-plugin": "3.0.0",
"@wordpress/dependency-extraction-webpack-plugin": "6.11.0",
"@wordpress/readable-js-assets-webpack-plugin": "3.11.0",
"copy-webpack-plugin": "^10.2.4",
"typescript": "^5.3.3",
"webpack": "^5.94.0"
"webpack": "^5.95.0"
},
"peerDependencies": {
"@automattic/calypso-router": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions apps/notifications/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
"@automattic/calypso-eslint-overrides": "workspace:^",
"@automattic/languages": "workspace:^",
"@automattic/wp-babel-makepot": "workspace:^",
"html-webpack-plugin": "^5.6.0",
"html-webpack-plugin": "^5.6.3",
"postcss": "^8.4.5",
"postcss-custom-properties": "^11.0.0",
"webpack": "^5.94.0"
"webpack": "^5.95.0"
}
}
4 changes: 2 additions & 2 deletions apps/o2-blocks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"devDependencies": {
"@automattic/calypso-apps-builder": "workspace:^",
"@automattic/calypso-eslint-overrides": "workspace:^",
"@wordpress/readable-js-assets-webpack-plugin": "^3.0.0",
"@wordpress/readable-js-assets-webpack-plugin": "^3.11.0",
"postcss": "^8.4.5",
"webpack": "^5.94.0"
"webpack": "^5.95.0"
}
}
6 changes: 3 additions & 3 deletions apps/odyssey-stats/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,19 @@
"@automattic/wp-babel-makepot": "workspace:^",
"@babel/core": "^7.25.8",
"@size-limit/file": "^8.2.6",
"@wordpress/dependency-extraction-webpack-plugin": "^5.9.0",
"@wordpress/dependency-extraction-webpack-plugin": "^6.11.0",
"autoprefixer": "^10.2.5",
"babel-jest": "^29.6.1",
"gettext-parser": "^6.0.0",
"html-webpack-plugin": "^5.6.0",
"html-webpack-plugin": "^5.6.3",
"jest": "^29.7.0",
"lodash": "^4.17.21",
"mkdirp": "^1.0.4",
"node-fetch": "^2.6.6",
"path-browserify": "^1.0.1",
"postcss": "^8.3.11",
"size-limit": "^8.2.6",
"webpack": "^5.94.0",
"webpack": "^5.95.0",
"webpack-bundle-analyzer": "^4.10.2"
}
}
4 changes: 2 additions & 2 deletions apps/whats-new/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@
"@automattic/calypso-eslint-overrides": "workspace:^",
"@automattic/languages": "workspace:^",
"@automattic/wp-babel-makepot": "workspace:^",
"@wordpress/dependency-extraction-webpack-plugin": "^5.9.0",
"@wordpress/dependency-extraction-webpack-plugin": "^6.11.0",
"gettext-parser": "^6.0.0",
"lodash": "^4.17.21",
"mkdirp": "^1.0.4",
"node-fetch": "^2.6.6",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.5",
"webpack": "^5.94.0",
"webpack": "^5.95.0",
"webpack-bundle-analyzer": "^4.10.2"
}
}
4 changes: 2 additions & 2 deletions apps/wpcom-block-editor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
"@automattic/calypso-apps-builder": "workspace:^",
"@automattic/calypso-build": "workspace:^",
"@automattic/calypso-eslint-overrides": "workspace:^",
"@wordpress/dependency-extraction-webpack-plugin": "^5.9.0",
"@wordpress/dependency-extraction-webpack-plugin": "^6.11.0",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.5",
"webpack": "^5.94.0",
"webpack": "^5.95.0",
"webpack-bundle-analyzer": "^4.10.2"
}
}
4 changes: 0 additions & 4 deletions client/a8c-for-agencies/sections/sites/sites-dashboard/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,6 @@
align-items: stretch;
overflow: hidden;
}

.components-button:focus:not(:disabled) {
box-shadow: 0 0 0 2px var(--color-primary-light);
}
}

.a4a-layout__top-wrapper,
Expand Down
Binary file removed client/assets/images/thank-you-upsell/email.jpg
View file
Binary file not shown.
72 changes: 68 additions & 4 deletions client/blocks/reader-full-post/header.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import { Gridicon } from '@automattic/components';
import formatNumber from '@automattic/components/src/number-formatters/lib/format-number';
import clsx from 'clsx';
import { translate, getLocaleSlug } from 'i18n-calypso';
import PropTypes from 'prop-types';
import TagsList from 'calypso/blocks/reader-post-card/tags-list';
import ReaderSiteStreamLink from 'calypso/blocks/reader-site-stream-link';
import AutoDirection from 'calypso/components/auto-direction';
import ExternalLink from 'calypso/components/external-link';
import TimeSince from 'calypso/components/time-since';
import { recordPermalinkClick } from 'calypso/reader/stats';
import ReaderFullPostHeaderPlaceholder from './placeholders/header';

const ReaderFullPostHeader = ( { post, authorProfile } ) => {
const ReaderFullPostHeader = ( { post, authorProfile, layout } ) => {
const handlePermalinkClick = () => {
recordPermalinkClick( 'full_post_title', post );
};
Expand All @@ -16,7 +20,10 @@ const ReaderFullPostHeader = ( { post, authorProfile } ) => {
recordPermalinkClick( 'timestamp_full_post', post );
};

const classes = { 'reader-full-post__header': true };
const classes = {
'reader-full-post__header': true,
'reader-full-post__header--recent': layout === 'recent',
};
if ( ! post.title || post.title.trim().length < 1 ) {
classes[ 'is-missing-title' ] = true;
}
Expand All @@ -25,9 +32,35 @@ const ReaderFullPostHeader = ( { post, authorProfile } ) => {
return <ReaderFullPostHeaderPlaceholder />;
}

// Rather than pass in additional props for the `recent` layout, we extract the props we need from authorProfile.
const { props: { author, siteIcon, feedIcon, siteName, followCount } = {} } = authorProfile || {};

const isDefaultLayout = layout === 'default';
const iconSrc = author?.avatar_URL || siteIcon || feedIcon;

/* eslint-disable react/jsx-no-target-blank */
return (
<div className={ clsx( classes ) }>
{ layout === 'recent' && (
<div className="reader-full-post__header-site-icon">
<ReaderSiteStreamLink
className="reader-full-post__header-site-icon-link"
feedId={ post.feed_ID }
siteId={ post.blog_ID }
post={ post }
>
{ iconSrc ? (
<img src={ iconSrc } alt={ siteName } className="reader-full-post__site-icon" />
) : (
<Gridicon
icon="globe"
size={ 24 }
className="reader-full-post__site-icon is-missing-icon"
/>
) }
</ReaderSiteStreamLink>
</div>
) }
{ post.title ? (
<AutoDirection>
<h1 className="reader-full-post__header-title">
Expand All @@ -43,8 +76,34 @@ const ReaderFullPostHeader = ( { post, authorProfile } ) => {
</h1>
</AutoDirection>
) : null }
<div className="reader-full-post__author-block">{ authorProfile }</div>
{ isDefaultLayout && <div className="reader-full-post__author-block">{ authorProfile }</div> }
<div className="reader-full-post__header-meta">
{ layout === 'recent' && (
<>
{ siteName && (
<span className="reader-full-post__header-site-name">
<ReaderSiteStreamLink
className="reader-full-post__header-site-name-link"
feedId={ post.feed_ID }
siteId={ post.blog_ID }
post={ post }
>
{ siteName }
</ReaderSiteStreamLink>
</span>
) }
{ followCount && (
<span className="reader-full-post__header-follow-count">
{ translate( '%(followCount)s subscriber', '%(followCount)s subscribers', {
count: followCount,
args: {
followCount: formatNumber( followCount, getLocaleSlug() ),
},
} ) }
</span>
) }
</>
) }
{ post.date ? (
<span className="reader-full-post__header-date">
<a
Expand All @@ -59,7 +118,7 @@ const ReaderFullPostHeader = ( { post, authorProfile } ) => {
</span>
) : null }
</div>
<TagsList post={ post } tagsToShow={ 5 } />
{ isDefaultLayout && <TagsList post={ post } tagsToShow={ 5 } /> }
</div>
);
/* eslint-enable react/jsx-no-target-blank */
Expand All @@ -68,6 +127,11 @@ const ReaderFullPostHeader = ( { post, authorProfile } ) => {
ReaderFullPostHeader.propTypes = {
post: PropTypes.object.isRequired,
children: PropTypes.node,
layout: PropTypes.oneOf( [ 'default', 'recent' ] ),
};

ReaderFullPostHeader.defaultProps = {
layout: 'default',
};

export default ReaderFullPostHeader;
Loading

0 comments on commit 0105657

Please sign in to comment.