Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/npm_and_yarn/develop/vscode/co…
Browse files Browse the repository at this point in the history
…dicons-0.0.36
  • Loading branch information
anasilva105 authored Aug 28, 2024
2 parents ebe8e7a + 6d371ee commit 7067186
Show file tree
Hide file tree
Showing 34 changed files with 2,506 additions and 2,542 deletions.
11 changes: 11 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"tabWidth": 4,
"semi": true,
"singleQuote": false,
"trailingComma": "none",
"printWidth": 120,
"useTabs": true,
"endOfLine":"auto",
"bracketSpacing": true,
"arrowParens": "avoid"
}
29 changes: 23 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,20 @@
}
],
"menus": {
"commandPalette": [
{
"command": "sfmc-devtools-vscext.devtoolsCMRetrieve",
"when": "sfmc-devtools-vscode.isDevToolsProject && editorIsOpen && resourcePath =~ /retrieve/"
},
{
"command": "sfmc-devtools-vscext.devtoolsCMDeploy",
"when": "sfmc-devtools-vscode.isDevToolsProject && editorIsOpen && (resourcePath =~ /deploy/ || (resourcePath =~ /retrieve/ && (resourceExtname == '.json' || resourceExtname == '.html' || resourceExtname == '.sql' || resourceExtname == '.ssjs' || resourceLangId == 'markdown' || resourceLangId == 'AMPscript' || resourceLangId == 'ampscript')))"
},
{
"command": "sfmc-devtools-vscext.devtoolsCMCopyToBU",
"when": "sfmc-devtools-vscode.isDevToolsProject && editorIsOpen && resourcePath =~ /\\\\retrieve\\\\.*\\\\.*/"
}
],
"explorer/context": [
{
"when": "sfmc-devtools-vscode.isDevToolsProject && resourcePath =~ /retrieve/",
Expand All @@ -71,23 +85,26 @@
"group": "devtools"
},
{
"when": "sfmc-devtools-vscode.isDevToolsProject && resourcePath =~ /retrieve/ && resourceFilename != 'retrieve' && resourceFilename != 'deploy'",
"when": "sfmc-devtools-vscode.isDevToolsProject && resourcePath =~ /\\\\retrieve\\\\.*\\\\.*/",
"command": "sfmc-devtools-vscext.devtoolsCMCopyToBU",
"group": "devtools"
}
],
"commandPalette": [
"editor/context": [
{
"when": "sfmc-devtools-vscode.isDevToolsProject && resourcePath =~ /retrieve/",
"command": "sfmc-devtools-vscext.devtoolsCMRetrieve",
"when": "false"
"group": "devtools"
},
{
"when": "sfmc-devtools-vscode.isDevToolsProject && (resourcePath =~ /deploy/ || (resourcePath =~ /retrieve/ && (resourceExtname == '.json' || resourceExtname == '.html' || resourceExtname == '.sql' || resourceExtname == '.ssjs' || resourceLangId == 'markdown' || resourceLangId == 'AMPscript' || resourceLangId == 'ampscript' || resourceDirname =~ /asset\\\\[a-zA-Z]*/)))",
"command": "sfmc-devtools-vscext.devtoolsCMDeploy",
"when": "false"
"group": "devtools"
},
{
"when": "sfmc-devtools-vscode.isDevToolsProject && resourcePath =~ /\\\\retrieve\\\\.*\\\\.*/",
"command": "sfmc-devtools-vscext.devtoolsCMCopyToBU",
"when": "false"
"group": "devtools"
}
],
"editor/title/context": [
Expand All @@ -102,7 +119,7 @@
"group": "devtools"
},
{
"when": "sfmc-devtools-vscode.isDevToolsProject && resourcePath =~ /retrieve/ && resourceFilename != 'retrieve' && resourceFilename != 'deploy'",
"when": "sfmc-devtools-vscode.isDevToolsProject && resourcePath =~ /\\\\retrieve\\\\.*\\\\.*/",
"command": "sfmc-devtools-vscext.devtoolsCMCopyToBU",
"group": "devtools"
}
Expand Down
62 changes: 31 additions & 31 deletions src/config/containers.config.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
export const containersConfig: {
statusBarDevToolsName: string,
statusBarDevToolsTitle: string,
statusBarDevToolsCommand: string,
statusBarDevToolsCredentialBUName: string,
statusBarDevToolsCredentialBUTitle: string,
statusBarDevToolsCredentialBUCommand: string,
statusBarDevToolsCommandName: string,
statusBarDevToolsCommandTitle: string,
statusBarDevToolsCommandCommand: string,
statusBarDevToolsInitializeName: string,
statusBarDevToolsInitializeTitle: string,
statusBarDevToolsInitializeCommand: string,
contextMenuRetrieveCommand: string,
contextMenuDeployCommand: string,
contextMenuCopyToBUCommand: string
statusBarDevToolsName: string;
statusBarDevToolsTitle: string;
statusBarDevToolsCommand: string;
statusBarDevToolsCredentialBUName: string;
statusBarDevToolsCredentialBUTitle: string;
statusBarDevToolsCredentialBUCommand: string;
statusBarDevToolsCommandName: string;
statusBarDevToolsCommandTitle: string;
statusBarDevToolsCommandCommand: string;
statusBarDevToolsInitializeName: string;
statusBarDevToolsInitializeTitle: string;
statusBarDevToolsInitializeCommand: string;
contextMenuRetrieveCommand: string;
contextMenuDeployCommand: string;
contextMenuCopyToBUCommand: string;
} = {
statusBarDevToolsName: "mcdev",
statusBarDevToolsTitle: "mcdev",
statusBarDevToolsCommand: "sfmc-devtools-vscext.devtoolsSBMcdev",
statusBarDevToolsCredentialBUName: "devtoolscredentialbu",
statusBarDevToolsCredentialBUTitle: "Credential/BU",
statusBarDevToolsCredentialBUCommand: "sfmc-devtools-vscext.devtoolsSBCredentialBU",
statusBarDevToolsCommandName: "devtoolscommand",
statusBarDevToolsCommandTitle: "Command",
statusBarDevToolsCommandCommand: "sfmc-devtools-vscext.devtoolsSBCommand",
statusBarDevToolsInitializeName: "devtoolsinitialize",
statusBarDevToolsInitializeTitle: "Initialize",
statusBarDevToolsInitializeCommand: "sfmc-devtools-vscext.devtoolsSBInitialize",
contextMenuRetrieveCommand: "sfmc-devtools-vscext.devtoolsCMRetrieve",
contextMenuDeployCommand: "sfmc-devtools-vscext.devtoolsCMDeploy",
contextMenuCopyToBUCommand: "sfmc-devtools-vscext.devtoolsCMCopyToBU"
};
statusBarDevToolsName: "mcdev",
statusBarDevToolsTitle: "mcdev",
statusBarDevToolsCommand: "sfmc-devtools-vscext.devtoolsSBMcdev",
statusBarDevToolsCredentialBUName: "devtoolscredentialbu",
statusBarDevToolsCredentialBUTitle: "Credential/BU",
statusBarDevToolsCredentialBUCommand: "sfmc-devtools-vscext.devtoolsSBCredentialBU",
statusBarDevToolsCommandName: "devtoolscommand",
statusBarDevToolsCommandTitle: "Command",
statusBarDevToolsCommandCommand: "sfmc-devtools-vscext.devtoolsSBCommand",
statusBarDevToolsInitializeName: "devtoolsinitialize",
statusBarDevToolsInitializeTitle: "Initialize",
statusBarDevToolsInitializeCommand: "sfmc-devtools-vscext.devtoolsSBInitialize",
contextMenuRetrieveCommand: "sfmc-devtools-vscext.devtoolsCMRetrieve",
contextMenuDeployCommand: "sfmc-devtools-vscext.devtoolsCMDeploy",
contextMenuCopyToBUCommand: "sfmc-devtools-vscext.devtoolsCMCopyToBU"
};
34 changes: 17 additions & 17 deletions src/config/installer.config.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
export enum InstallDevToolsResponseOptions {
"Yes" = 1,
"No" = 0
"Yes" = 1,
"No" = 0
}

export const installerConfig: {
package: { mcdev: { version: string, install: string } },
messages: {
noDevToolsInstalled: string,
askUserToInstallDevTools: string,
installingDevToolsProgress: string
}
package: { mcdev: { version: string; install: string } };
messages: {
noDevToolsInstalled: string;
askUserToInstallDevTools: string;
installingDevToolsProgress: string;
};
} = {
package: {
mcdev: { version: "mcdev --version", install: "npm install -g mcdev" }
},
messages: {
noDevToolsInstalled: "SFMC DevTools could not be located on your system.",
askUserToInstallDevTools: "Would you like to install SFMC DevTools?",
installingDevToolsProgress: "Please wait while SFMC DevTools is being installed..."
}
};
package: {
mcdev: { version: "mcdev --version", install: "npm install -g mcdev" }
},
messages: {
noDevToolsInstalled: "SFMC DevTools could not be located on your system.",
askUserToInstallDevTools: "Would you like to install SFMC DevTools?",
installingDevToolsProgress: "Please wait while SFMC DevTools is being installed..."
}
};
82 changes: 41 additions & 41 deletions src/config/main.config.ts
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
export const mainConfig: {
credentialsFilename: string,
requiredFiles: string[],
fileExtensions: string[],
noCopyFileExtensions: string[],
allPlaceholder: string,
extensionsDependencies: string[],
messages: {
selectedCredentialsBU: string,
selectCredential: string,
selectBusinessUnit: string,
selectCommandType: string,
selectCommand: string,
initDevTools: string,
initiatingDevTools: string,
copyToBUInput: string,
runningCommand: string,
successRunningCommand: string,
failureRunningCommand: string,
unsupportedMetadataType: string
}
credentialsFilename: string;
requiredFiles: string[];
fileExtensions: string[];
noCopyFileExtensions: string[];
allPlaceholder: string;
extensionsDependencies: string[];
messages: {
selectedCredentialsBU: string;
selectCredential: string;
selectBusinessUnit: string;
selectCommandType: string;
selectCommand: string;
initDevTools: string;
initiatingDevTools: string;
copyToBUInput: string;
runningCommand: string;
successRunningCommand: string;
failureRunningCommand: string;
unsupportedMetadataType: string;
};
} = {
credentialsFilename: ".mcdevrc.json",
requiredFiles: [".mcdevrc.json", ".mcdev-auth.json"],
fileExtensions: ["meta.json", "meta.sql", "meta.html", "meta.ssjs", "meta.amp", "doc.md"],
noCopyFileExtensions: ["doc.md"],
allPlaceholder: "*All*",
extensionsDependencies: ["IBM.output-colorizer"],
messages: {
selectedCredentialsBU: "Select a Credential/BU before running the command",
selectCredential: "Select one of the credentials below...",
selectBusinessUnit: "Select all or one of the business units below...",
selectCommandType: "Select one DevTools command type...",
selectCommand: "Select one DevTools Command...",
initDevTools: "Do you wish to initialize SFMC DevTools project in the current directory?",
initiatingDevTools: "Initiating SFMC DevTools project...",
copyToBUInput: "Select one of the actions below...",
runningCommand: "Running DevTools Command...",
successRunningCommand: "DevTools Command has run successfully.",
failureRunningCommand: "Oh no. Something went wrong while running DevTools Command.",
unsupportedMetadataType: "SFMC DevTools currently does not support one or more of the selected metadata types."
}
};
credentialsFilename: ".mcdevrc.json",
requiredFiles: [".mcdevrc.json", ".mcdev-auth.json"],
fileExtensions: ["meta.json", "meta.sql", "meta.html", "meta.ssjs", "meta.amp", "doc.md"],
noCopyFileExtensions: ["doc.md"],
allPlaceholder: "*All*",
extensionsDependencies: ["IBM.output-colorizer"],
messages: {
selectedCredentialsBU: "Select a Credential/BU before running the command",
selectCredential: "Select one of the credentials below...",
selectBusinessUnit: "Select all or one of the business units below...",
selectCommandType: "Select one DevTools command type...",
selectCommand: "Select one DevTools Command...",
initDevTools: "Do you wish to initialize SFMC DevTools project in the current directory?",
initiatingDevTools: "Initiating SFMC DevTools project...",
copyToBUInput: "Select one of the actions below...",
runningCommand: "Running DevTools Command...",
successRunningCommand: "DevTools Command has run successfully.",
failureRunningCommand: "Oh no. Something went wrong while running DevTools Command.",
unsupportedMetadataType: "SFMC DevTools currently does not support one or more of the selected metadata types."
}
};
Loading

0 comments on commit 7067186

Please sign in to comment.