Skip to content
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.

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

Release v2.1.1 #211

Merged
merged 60 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
ebe8e7a
Bump @vscode/codicons from 0.0.35 to 0.0.36
dependabot[bot] Jun 1, 2024
d1b8622
prettier added to project
anasilva105 Jun 4, 2024
1b9b05c
added command palette logic
anasilva105 Jun 5, 2024
e56c33e
Merge pull request #183 from Accenture/task/60-add-prettier
anasilva105 Jun 5, 2024
d905487
code improvement defining activeTab file URI
anasilva105 Jun 5, 2024
5cac153
Merge branch 'develop' into 163-feature-offer-active-file-ctrl+shift-…
anasilva105 Jun 5, 2024
d745d66
add configuration to display commands when right click on the file co…
anasilva105 Jun 5, 2024
5889ebf
added editorIsOpen variable to detect when a file is open in terminal
anasilva105 Jun 6, 2024
0bdc260
Merge pull request #185 from Accenture/feature/112-have-mcdev-command…
anasilva105 Jun 6, 2024
229c975
change command palette order in package.json
anasilva105 Jun 6, 2024
3fa236a
Merge branch 'develop' into 163-feature-offer-active-file-ctrl+shift-…
anasilva105 Jun 6, 2024
a8d6612
fixed double commandPalette configuration
anasilva105 Jun 6, 2024
0159c23
Merge pull request #184 from Accenture/163-feature-offer-active-file-…
anasilva105 Jun 7, 2024
7e35130
Bump @typescript-eslint/parser from 7.10.0 to 7.18.0
dependabot[bot] Aug 1, 2024
1b28aac
Bump ts-jest from 29.1.3 to 29.2.4
dependabot[bot] Aug 1, 2024
98bc33a
Disable compact folder feature removed
anasilva105 Aug 13, 2024
8d0cc61
Merge pull request #194 from Accenture/bug/188-urgent-disabling-compa…
anasilva105 Aug 14, 2024
fd6422d
removed logic of requesting user to select metadatatype for retrieve …
anasilva105 Aug 20, 2024
9c9e141
Merge pull request #195 from Accenture/feature/193-disable-type-selec…
anasilva105 Aug 21, 2024
7b3bf35
Asset types folders are fully copied with all the files inside
anasilva105 Aug 21, 2024
ceea50d
Merge pull request #197 from Accenture/bug/177-asset-template-not-cop…
anasilva105 Aug 22, 2024
b8aac4b
removed "mcdev: Copy to ..." option from menu for the Credential folder
anasilva105 Aug 27, 2024
00f98e4
Copy action is copying only valid mdtypes when selected on the BU fol…
anasilva105 Aug 28, 2024
8ee8c02
mcdev: Copy... allows to copy to same business unit
anasilva105 Aug 28, 2024
7e8e505
Updated package.json description
anasilva105 Aug 28, 2024
6f0a819
Removed ununecessary conditions for mcdev Copy in package.json
anasilva105 Aug 28, 2024
6d371ee
Merge pull request #200 from Accenture/bug/196-copy-to-bu-fails-when-…
anasilva105 Aug 28, 2024
e05154b
Merge branch 'develop' into task/161-add-ampscript-and-ssjs-into-desc…
anasilva105 Aug 28, 2024
7067186
Merge branch 'develop' into dependabot/npm_and_yarn/develop/vscode/co…
anasilva105 Aug 28, 2024
d7fc713
Merge pull request #179 from Accenture/dependabot/npm_and_yarn/develo…
anasilva105 Aug 28, 2024
f30aa27
Merge branch 'develop' into dependabot/npm_and_yarn/develop/typescrip…
anasilva105 Aug 28, 2024
e910d04
Merge pull request #190 from Accenture/dependabot/npm_and_yarn/develo…
anasilva105 Aug 28, 2024
06aa980
Bump @vscode/test-electron from 2.3.10 to 2.4.1
dependabot[bot] Aug 28, 2024
d948703
Merge branch 'develop' into dependabot/npm_and_yarn/develop/ts-jest-2…
anasilva105 Aug 28, 2024
75e7c5e
Merge pull request #191 from Accenture/dependabot/npm_and_yarn/develo…
anasilva105 Aug 28, 2024
a2966a2
Merge branch 'develop' into dependabot/npm_and_yarn/develop/vscode/te…
anasilva105 Aug 28, 2024
dffa40e
Merge pull request #189 from Accenture/dependabot/npm_and_yarn/develo…
anasilva105 Aug 28, 2024
3acc41b
Bump @salesforce-ux/design-system from 2.24.2 to 2.24.5
dependabot[bot] Sep 1, 2024
daf5fba
Bump @typescript-eslint/eslint-plugin from 7.10.0 to 8.3.0
dependabot[bot] Sep 1, 2024
a4ab77e
Bump webpack from 5.91.0 to 5.94.0
dependabot[bot] Sep 1, 2024
3703e4f
removed unecessary methods declaration
anasilva105 Sep 2, 2024
5e90d58
improved package json description
anasilva105 Sep 2, 2024
390cbc8
Merge branch 'develop' into task/161-add-ampscript-and-ssjs-into-desc…
anasilva105 Sep 2, 2024
bc8230d
Merge pull request #201 from Accenture/task/161-add-ampscript-and-ssj…
anasilva105 Sep 2, 2024
db284bb
Merge branch 'develop' into dependabot/npm_and_yarn/develop/webpack-5…
anasilva105 Sep 2, 2024
8776ad3
Merge pull request #208 from Accenture/dependabot/npm_and_yarn/develo…
anasilva105 Sep 2, 2024
bd319a8
Merge branch 'develop' into dependabot/npm_and_yarn/develop/typescrip…
anasilva105 Sep 2, 2024
ff2d32f
Bump typescript from 5.4.5 to 5.5.4
dependabot[bot] Sep 2, 2024
7f0c2f1
Merge pull request #207 from Accenture/dependabot/npm_and_yarn/develo…
anasilva105 Sep 2, 2024
ac67911
Merge branch 'develop' into dependabot/npm_and_yarn/develop/typescrip…
anasilva105 Sep 2, 2024
b13f6f6
Bump @types/vscode from 1.89.0 to 1.92.0
dependabot[bot] Sep 2, 2024
e2cbde6
Merge pull request #206 from Accenture/dependabot/npm_and_yarn/develo…
anasilva105 Sep 2, 2024
a964e7a
Merge branch 'develop' into dependabot/npm_and_yarn/develop/types/vsc…
anasilva105 Sep 2, 2024
c8bad02
Merge pull request #205 from Accenture/dependabot/npm_and_yarn/develo…
anasilva105 Sep 2, 2024
39ad4db
Merge branch 'develop' into dependabot/npm_and_yarn/develop/salesforc…
anasilva105 Sep 2, 2024
1d48a6f
Merge pull request #204 from Accenture/dependabot/npm_and_yarn/develo…
anasilva105 Sep 2, 2024
244f6d9
Merge branch 'develop' into feature/202-update-default-metadata-types…
anasilva105 Sep 2, 2024
0c92163
explainTypes called in a non blocking way
anasilva105 Sep 4, 2024
5669d32
Merge pull request #210 from Accenture/feature/202-update-default-met…
anasilva105 Sep 4, 2024
0e99345
Merge branch 'main' into develop
anasilva105 Sep 6, 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
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"
}
626 changes: 474 additions & 152 deletions package-lock.json

Large diffs are not rendered by default.

49 changes: 33 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sfmc-devtools-vscode",
"displayName": "SFMC DevTools",
"description": "Unofficial IDE for Salesforce Marketing Cloud",
"description": "Unofficial IDE for Salesforce Marketing Cloud - Handle and manipulate several SFMC assets (journeys, automations, queries, SSJS, AMPScript, etc..) between your local machine and Salesforce Marketing Cloud (SFMC).",
"version": "1.0.2",
"license": "MIT",
"publisher": "Accenture-oss",
Expand Down 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 Expand Up @@ -133,22 +150,22 @@
"@types/chai": "^4.3.16",
"@types/jest": "^29.5.11",
"@types/node": "^20.12.8",
"@types/vscode": "^1.81.1",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.7.0",
"@vscode/test-electron": "^2.3.9",
"@types/vscode": "^1.92.0",
"@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^7.18.0",
"@vscode/test-electron": "^2.4.1",
"chai": "^5.1.0",
"eslint": "^8.56.0",
"jest": "^29.7.0",
"ts-jest": "^29.1.2",
"ts-jest": "^29.2.4",
"ts-loader": "^9.5.1",
"typescript": "^5.3.3",
"webpack": "^5.91.0",
"typescript": "^5.5.4",
"webpack": "^5.94.0",
"webpack-cli": "^5.1.4"
},
"dependencies": {
"@salesforce-ux/design-system": "^2.23.2",
"@vscode/codicons": "^0.0.35",
"@salesforce-ux/design-system": "^2.24.5",
"@vscode/codicons": "^0.0.36",
"winston": "^3.13.0"
}
}
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