Skip to content

W-16742559 fix(search): remove deprecated flags #1034

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

Merged
cristiand391 merged 16 commits into from
Sep 16, 2024
Merged

W-16742559 fix(search): remove deprecated flags #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
321a7f4
fix(search): remove deprecated flags
cristiand391 Aug 14, 2024
044a71e
fix(search): remove deprecated alias
cristiand391 Aug 14, 2024
555d715
chore: update workflows
cristiand391 Aug 21, 2024
cf0bbe7
chore(release): 3.6.1-dev.0 [skip ci]
svc-cli-bot Aug 21, 2024
da132e5
chore: update workflows
cristiand391 Aug 21, 2024
a9e9063
chore(release): 3.6.1-dev.1 [skip ci]
svc-cli-bot Aug 21, 2024
9043b8f
chore: ci re-run
cristiand391 Aug 26, 2024
7aa38ed
test(NUT): force to use sf
cristiand391 Aug 26, 2024
ce0ff75
chore: ci re-run
cristiand391 Aug 26, 2024
57f2076
chore: ci re-run
cristiand391 Aug 26, 2024
dcaa3e8
chore: update workflows
cristiand391 Aug 29, 2024
294254b
chore: update workflows
cristiand391 Aug 29, 2024
f309356
chore: update workflows
cristiand391 Aug 29, 2024
7a65678
chore: update workflows
cristiand391 Aug 29, 2024
5ac4e1e
Merge remote-tracking branch 'origin/main' into cd/org-flag
cristiand391 Sep 13, 2024
cd49f99
chore(ci): workflows point back to main
cristiand391 Sep 13, 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: 2 additions & 2 deletions command-snapshot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@
{
"alias": [],
"command": "data:search",
"flagAliases": ["apiversion", "resultformat", "targetusername", "u"],
"flagAliases": [],
"flagChars": ["f", "o", "q", "r"],
"flags": ["api-version", "file", "flags-dir", "json", "loglevel", "query", "result-format", "target-org"],
"flags": ["api-version", "file", "flags-dir", "json", "query", "result-format", "target-org"],
"plugin": "@salesforce/plugin-data"
},
{
Expand Down
12 changes: 8 additions & 4 deletions src/commands/data/search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import fs from 'node:fs';
import { Messages } from '@salesforce/core';
import type { SearchResult } from '@jsforce/jsforce-node';
import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
import { orgFlags, resultFormatFlag } from '../../flags.js';
import { displaySearchResults } from '../../searchUtils.js';
import { FormatTypes, formatTypes } from '../../reporters/query/reporters.js';

Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
const messages = Messages.loadMessages('@salesforce/plugin-data', 'data.search');
Expand All @@ -21,7 +21,8 @@ export class DataSearchCommand extends SfCommand<SearchResult> {
public static readonly examples = messages.getMessages('examples');

public static readonly flags = {
...orgFlags,
'target-org': Flags.requiredOrg(),
'api-version': Flags.orgApiVersion(),
query: Flags.string({
char: 'q',
summary: messages.getMessage('flags.query.summary'),
Expand All @@ -33,10 +34,13 @@ export class DataSearchCommand extends SfCommand<SearchResult> {
summary: messages.getMessage('flags.file.summary'),
exactlyOne: ['query', 'file'],
}),
'result-format': resultFormatFlag({
'result-format': Flags.custom<FormatTypes>({
char: 'r',
summary: messages.getMessage('flags.result-format.summary'),
options: formatTypes,
default: 'human',
exclusive: ['json'],
}),
})(),
Copy link
Copy Markdown
Member Author

@cristiand391 cristiand391 Aug 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was done to remove the deprecated resultformat alias, see the command snapshot diff

};

public async run(): Promise<SearchResult> {
Expand Down
1 change: 1 addition & 0 deletions test/commands/data/create/file.nut.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ describe('data create file NUTs', () => {
// create one record in the org that we'll use to attach stuff to
acctId = execCmd<SaveResult>('data:create:record -s Account -v "Name=TestAccount" --json', {
ensureExitCode: 0,
cli: 'sf'
}).jsonOutput?.result.id;
expect(acctId).to.be.a('string');
// make a file we can upload
Expand Down