Skip to content

Commit b6e2d45

Browse files
committed
fix: PR nits
1 parent 97fefb6 commit b6e2d45

File tree

5 files changed

+26
-13
lines changed

5 files changed

+26
-13
lines changed

src/common/types/metadata.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ type MetadataCascadingPolicyData = {
101101
id?: string,
102102
isEnabled: boolean,
103103
overwrite: boolean,
104-
cascadePolicyConfiguration?: MetadataCascadePolicyConfiguration | null,
104+
cascadePolicyConfiguration: MetadataCascadePolicyConfiguration | null,
105105
};
106106

107107
type MetadataInstance = {

src/features/metadata-instance-editor/CascadePolicy.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import Link from '../../components/link/Link';
1818
import IconAlertDefault from '../../icons/general/IconAlertDefault';
1919
import messages from './messages';
2020
import './CascadePolicy.scss';
21+
import { STANDARD_AGENT_ID, ENHANCED_AGENT_ID } from './constants';
2122

2223
const COMMUNITY_LINK = 'https://support.box.com/hc/en-us/articles/360044195873-Cascading-metadata-in-folders';
2324
const AI_LINK = 'https://www.box.com/ai';
@@ -64,12 +65,12 @@ const CascadePolicy = ({
6465
const agents = React.useMemo(
6566
() => [
6667
{
67-
id: '1',
68+
id: STANDARD_AGENT_ID,
6869
name: formatMessage(messages.standardAgentName),
6970
isEnterpriseDefault: true,
7071
},
7172
{
72-
id: '2',
73+
id: ENHANCED_AGENT_ID,
7374
name: formatMessage(messages.enhancedAgentName),
7475
isEnterpriseDefault: false,
7576
customIcon: BoxAiAdvancedColor,

src/features/metadata-instance-editor/Instance.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ import MetadataInstanceConfirmDialog from './MetadataInstanceConfirmDialog';
2525
import Footer from './Footer';
2626
import messages from './messages';
2727
import { FIELD_TYPE_FLOAT, FIELD_TYPE_INTEGER } from '../metadata-instance-fields/constants';
28-
import { CASCADE_POLICY_TYPE_AI_EXTRACT, TEMPLATE_CUSTOM_PROPERTIES, ENHANCED_AGENT_CONFIGURATION } from './constants';
28+
import {
29+
CASCADE_POLICY_TYPE_AI_EXTRACT,
30+
TEMPLATE_CUSTOM_PROPERTIES,
31+
ENHANCED_AGENT_CONFIGURATION,
32+
ENHANCED_AGENT_ID,
33+
} from './constants';
2934
import {
3035
JSON_PATCH_OP_REMOVE,
3136
JSON_PATCH_OP_ADD,
@@ -71,10 +76,10 @@ type Props = {
7176
};
7277

7378
type State = {
79+
cascadePolicyConfiguration: MetadataCascadePolicyConfiguration | null,
7480
data: Object,
7581
errors: { [string]: React.Node },
7682
isAIFolderExtractionEnabled: boolean,
77-
cascadePolicyConfiguration?: MetadataCascadePolicyConfiguration | null,
7883
isBusy: boolean,
7984
isCascadingEnabled: boolean,
8085
isCascadingOverwritten: boolean,
@@ -215,12 +220,12 @@ class Instance extends React.PureComponent<Props, State> {
215220
onSave,
216221
}: Props = this.props;
217222
const {
223+
cascadePolicyConfiguration,
218224
data: currentData,
219225
errors,
220226
isAIFolderExtractionEnabled,
221227
isCascadingEnabled,
222228
isCascadingOverwritten,
223-
cascadePolicyConfiguration,
224229
}: State = this.state;
225230

226231
if (!this.isEditing() || !isDirty || !onSave || Object.keys(errors).length) {
@@ -354,7 +359,7 @@ class Instance extends React.PureComponent<Props, State> {
354359
*/
355360
onAIAgentSelect = (agent: AgentType | null): void => {
356361
// '2' is the id for the enhanced agent
357-
if (agent && agent.id === '2') {
362+
if (agent && agent.id === ENHANCED_AGENT_ID) {
358363
this.setState({
359364
cascadePolicyConfiguration: {
360365
agent: ENHANCED_AGENT_CONFIGURATION,
@@ -374,10 +379,10 @@ class Instance extends React.PureComponent<Props, State> {
374379
const isCascadingEnabled = this.isCascadingEnabledThroughProps(props);
375380

376381
return {
382+
cascadePolicyConfiguration: null,
377383
data: cloneDeep(props.data),
378384
errors: {},
379385
isAIFolderExtractionEnabled: this.isAIFolderExtractionEnabledThroughProps(props),
380-
cascadePolicyConfiguration: null,
381386
isBusy: false,
382387
isCascadingEnabled,
383388
isCascadingOverwritten: false,
@@ -705,10 +710,10 @@ class Instance extends React.PureComponent<Props, State> {
705710
isCascadingOverwritten={isCascadingOverwritten}
706711
isCustomMetadata={isProperties}
707712
isExistingCascadePolicy={isExistingCascadePolicy}
713+
onAIAgentSelect={this.onAIAgentSelect}
708714
onAIFolderExtractionToggle={this.onAIFolderExtractionToggle}
709715
onCascadeModeChange={this.onCascadeModeChange}
710716
onCascadeToggle={this.onCascadeToggle}
711-
onAIAgentSelect={this.onAIAgentSelect}
712717
shouldShowCascadeOptions={shouldShowCascadeOptions}
713718
/>
714719
)}

src/features/metadata-instance-editor/__tests__/MetadataInstanceEditor.test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { render, screen } from '../../../test-utils/testing-library';
44

55
import MetadataInstanceEditor from '../MetadataInstanceEditor';
66
import Instances from '../Instances';
7-
import { CASCADE_POLICY_TYPE_AI_EXTRACT } from '../constants';
87

98
// Templates
109

@@ -541,7 +540,7 @@ describe('MetadataInstanceEditor - canUseAIFolderExtractionAgentSelector prop',
541540
canUseAIFolderExtraction: true,
542541
canUseAIFolderExtractionAgentSelector: true,
543542
});
544-
props.editors[0].instance.cascadePolicy.cascadePolicyType = CASCADE_POLICY_TYPE_AI_EXTRACT;
543+
props.editors[0].instance.cascadePolicy.cascadePolicyType = 'ai_extract';
545544
render(<MetadataInstanceEditor {...props} />);
546545

547546
const editButton = await screen.findByRole('button', { name: 'Edit Metadata' }, { timeout: 3000 });
@@ -587,7 +586,7 @@ describe('MetadataInstanceEditor - canUseAIFolderExtractionAgentSelector prop',
587586
canUseAIFolderExtraction: true,
588587
canUseAIFolderExtractionAgentSelector: true,
589588
});
590-
props.editors[0].instance.cascadePolicy.cascadePolicyType = CASCADE_POLICY_TYPE_AI_EXTRACT;
589+
props.editors[0].instance.cascadePolicy.cascadePolicyType = 'ai_extract';
591590
props.editors[0].instance.cascadePolicy.id = null;
592591

593592
render(<MetadataInstanceEditor {...props} />);

src/features/metadata-instance-editor/constants.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,13 @@
33
const CASCADE_POLICY_TYPE_AI_EXTRACT = 'ai_extract';
44
const TEMPLATE_CUSTOM_PROPERTIES: 'properties' = 'properties';
55
const ENHANCED_AGENT_CONFIGURATION = 'enhanced_extract_agent';
6+
const STANDARD_AGENT_ID = '1';
7+
const ENHANCED_AGENT_ID = '2';
68

7-
export { CASCADE_POLICY_TYPE_AI_EXTRACT, TEMPLATE_CUSTOM_PROPERTIES, ENHANCED_AGENT_CONFIGURATION };
9+
export {
10+
CASCADE_POLICY_TYPE_AI_EXTRACT,
11+
TEMPLATE_CUSTOM_PROPERTIES,
12+
ENHANCED_AGENT_CONFIGURATION,
13+
STANDARD_AGENT_ID,
14+
ENHANCED_AGENT_ID,
15+
};

0 commit comments

Comments
 (0)