Skip to content

merge queue: embarking master (f5887d7) and #4288 together #4294

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

Closed
mergify wants to merge 3 commits into from
Closed

merge queue: embarking master (f5887d7) and #4288 together #4294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0d628b
feat(metadata-view): update blueprint web version
tjiang-box Sep 26, 2025
dd59e79
feat(metadata-view): upgrade blueprint web assets
tjiang-box Sep 26, 2025
8391ec4
Merge of #4288
mergify[bot] Sep 26, 2025
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: 2 additions & 2 deletions flow-typed/npm/@box/blueprint-web-assets_vx.x.x.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ declare module '@box/blueprint-web-assets/icons/Medium' {
declare export var AlertCircle: React$ComponentType<any>;
declare export var AlertTriangle: React$ComponentType<any>;
declare export var XMark: React$ComponentType<any>;
declare export var BoxAiAdvancedColor: React$ComponentType<any>;
declare export var BoxAiColor: React$ComponentType<any>;
declare export var BoxAiAdvancedLogo24: React$ComponentType<any>;
declare export var BoxAiLogo24: React$ComponentType<any>;
}

declare module '@box/blueprint-web-assets/icons/Content' {
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@
"@babel/preset-typescript": "^7.24.7",
"@babel/template": "^7.24.7",
"@babel/types": "^7.24.7",
"@box/blueprint-web": "^12.64.2",
"@box/blueprint-web-assets": "^4.65.0",
"@box/blueprint-web": "^12.76.2",
"@box/blueprint-web-assets": "^4.68.6",
"@box/box-ai-agent-selector": "^0.53.0",
"@box/box-ai-content-answers": "^0.139.0",
"@box/box-item-type-selector": "^0.73.1",
Expand Down Expand Up @@ -296,8 +296,8 @@
"webpack-dev-server": "^5.2.1"
},
"peerDependencies": {
"@box/blueprint-web": "^12.64.2",
"@box/blueprint-web-assets": "^4.65.0",
"@box/blueprint-web": "^12.76.2",
"@box/blueprint-web-assets": "^4.68.6",
"@box/box-ai-agent-selector": "^0.53.0",
"@box/box-ai-content-answers": "^0.139.0",
"@box/box-item-type-selector": "^0.73.1",
Expand Down
6 changes: 3 additions & 3 deletions src/features/metadata-instance-editor/CascadePolicy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useCallback } from 'react';
import { FormattedMessage, useIntl } from 'react-intl';

// $FlowFixMe
import { BoxAiAdvancedColor, BoxAiColor } from '@box/blueprint-web-assets/icons/Medium';
import { BoxAiAdvancedLogo24, BoxAiLogo24 } from '@box/blueprint-web-assets/icons/Logo';
import { type AgentType } from '@box/box-ai-agent-selector';

// $FlowFixMe
Expand Down Expand Up @@ -76,7 +76,7 @@ const CascadePolicy = ({
id: ENHANCED_AGENT_ID,
name: formatMessage(messages.enhancedAgentName),
isEnterpriseDefault: false,
customIcon: BoxAiAdvancedColor,
customIcon: BoxAiAdvancedLogo24,
isSelected: isEnhancedAgentSelected,
},
],
Expand Down Expand Up @@ -174,7 +174,7 @@ const CascadePolicy = ({
<div className="metadata-cascade-editor" data-testid="ai-folder-extraction">
<div className="metadata-cascade-enable">
<div>
<BoxAiColor className="metadata-cascade-ai-logo" width={16} height={16} />
<BoxAiLogo24 className="metadata-cascade-ai-logo" width={16} height={16} />
<FormattedMessage tagName="strong" {...messages.enableAIAutofill} />
<Toggle
aria-label={formatMessage(messages.enableAIAutofill)}
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,19 +1419,19 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

"@box/blueprint-web-assets@^4.65.0":
version "4.65.1"
resolved "https://registry.yarnpkg.com/@box/blueprint-web-assets/-/blueprint-web-assets-4.65.1.tgz#1b04a960667ff633bec51aab47a22d40834cc37c"
integrity sha512-7SrAXmp76TgVAryIgekEhGkToWf6ALD24RxeJWS+NO11fGT0OdLfSM7rs1QvUPQ2IXMe3QRfrK+Mc9kFUEMuOg==
"@box/blueprint-web-assets@^4.68.6":
version "4.68.6"
resolved "https://registry.yarnpkg.com/@box/blueprint-web-assets/-/blueprint-web-assets-4.68.6.tgz#81c27616687794032e9dc7ece6857797188e5130"
integrity sha512-2UrvvlCzE/PkgQ3yQldqlZxCF6pUXp+UKOuvFGAmAm2B1hWw0v3BfiPDTTJSRfGAnukNnpnItjdMkaq/qXKOpA==

"@box/blueprint-web@^12.64.2":
version "12.64.2"
resolved "https://registry.yarnpkg.com/@box/blueprint-web/-/blueprint-web-12.64.2.tgz#e0081dc0840e2ffab35a70e3c2d2a86b75574416"
integrity sha512-IaYstuyDvcm/FbW6ltyVzQkQJjasjQWUJOH9+wWlvaI+gUO71jLNtgEVwJtPIykXuk53XP3KG/Vii7Am5I17lw==
"@box/blueprint-web@^12.76.2":
version "12.76.2"
resolved "https://registry.yarnpkg.com/@box/blueprint-web/-/blueprint-web-12.76.2.tgz#fd9e0866fde079d8346ee457f9d259f0b4c71a24"
integrity sha512-kP08DX0Ba/yaDRbAZC1DQgdZoIRNIAjFjHdusfx2G095h9p8/b4YayrV6GCTsZrVB04rlRO5Qc6YNJnrPpWYvQ==
dependencies:
"@ariakit/react" "0.4.15"
"@ariakit/react-core" "0.4.15"
"@box/blueprint-web-assets" "^4.65.0"
"@box/blueprint-web-assets" "^4.68.0"
"@internationalized/date" "^3.7.0"
"@radix-ui/react-accordion" "1.1.2"
"@radix-ui/react-checkbox" "1.0.4"
Expand Down
Loading