diff --git a/media/contentCreator/createAnsibleProjectPageStyle.css b/media/contentCreator/createAnsibleProjectPageStyle.css index 0eb4f8988..3599c1c05 100644 --- a/media/contentCreator/createAnsibleProjectPageStyle.css +++ b/media/contentCreator/createAnsibleProjectPageStyle.css @@ -19,14 +19,14 @@ vscode-text-area { margin-bottom: 6px; } -.scm-org-project-div { +.playbook-project-div { display: flex; flex-direction: row; justify-content: space-between; align-items: center; } -#scm-org-name, #scm-project-name { +#namespace-name, #collection-name { width:49%; display:inline-block; } diff --git a/src/features/contentCreator/createAnsibleCollectionPage.ts b/src/features/contentCreator/createAnsibleCollectionPage.ts index 6707f9557..bb0338eb1 100644 --- a/src/features/contentCreator/createAnsibleCollectionPage.ts +++ b/src/features/contentCreator/createAnsibleCollectionPage.ts @@ -353,7 +353,7 @@ export class CreateAnsibleCollection { ? initPath : `${os.homedir()}/.ansible/collections/ansible_collections`; - let ansibleCreatorInitCommand = `ansible-creator init ${namespaceName}.${collectionName} --init-path=${initPathUrl} --no-ansi`; + let ansibleCreatorInitCommand = `ansible-creator init collection ${namespaceName}.${collectionName} ${initPathUrl} --no-ansi`; // adjust collection url for using it in ade and opening it in workspace // NOTE: this is done in order to synchronize the behavior of ade and extension diff --git a/src/features/contentCreator/createAnsibleProjectPage.ts b/src/features/contentCreator/createAnsibleProjectPage.ts index da30164e9..483109086 100644 --- a/src/features/contentCreator/createAnsibleProjectPage.ts +++ b/src/features/contentCreator/createAnsibleProjectPage.ts @@ -128,9 +128,9 @@ export class CreateAnsibleProject { -
- SCM organization * - SCM project * +
+ Namespace* + Collection*
@@ -304,8 +304,8 @@ export class CreateAnsibleProject { ) { const { destinationPath, - scmOrgName, - scmProjectName, + namespaceName, + collectionName, logToFile, logFilePath, logFileAppend, @@ -316,9 +316,8 @@ export class CreateAnsibleProject { const destinationPathUrl = destinationPath ? destinationPath - : `${os.homedir()}/${scmOrgName}-${scmProjectName}`; - - let ansibleCreatorInitCommand = `ansible-creator init --project=ansible-project --init-path=${destinationPathUrl} --scm-org=${scmOrgName} --scm-project=${scmProjectName} --no-ansi`; + : `${os.homedir()}/${namespaceName}-${collectionName}`; + let ansibleCreatorInitCommand = `ansible-creator init playbook ${namespaceName}.${collectionName} ${destinationPathUrl} --no-ansi`; if (isForced) { ansibleCreatorInitCommand += " --force"; diff --git a/src/features/contentCreator/types.ts b/src/features/contentCreator/types.ts index 65f4f4fbb..c8b71a3c6 100644 --- a/src/features/contentCreator/types.ts +++ b/src/features/contentCreator/types.ts @@ -13,8 +13,8 @@ export type AnsibleCollectionFormInterface = { export type AnsibleProjectFormInterface = { destinationPath: string; - scmOrgName: string; - scmProjectName: string; + namespaceName: string; + collectionName: string; verbosity: string; logToFile: boolean; logFilePath: string; diff --git a/src/webview/apps/contentCreator/createAnsibleProjectPageApp.ts b/src/webview/apps/contentCreator/createAnsibleProjectPageApp.ts index 9b3c741df..c80544aa2 100644 --- a/src/webview/apps/contentCreator/createAnsibleProjectPageApp.ts +++ b/src/webview/apps/contentCreator/createAnsibleProjectPageApp.ts @@ -22,8 +22,8 @@ window.addEventListener("load", main); let destinationPathUrlTextField: TextField; let folderExplorerButton: Button; -let scmOrgNameTextField: TextField; -let scmProjectNameTextField: TextField; +let namespaceNameTextField: TextField; +let collectionNameTextField: TextField; let initCreateButton: Button; let initClearButton: Button; @@ -59,9 +59,11 @@ function main() { ) as TextField; folderExplorerButton = document.getElementById("folder-explorer") as Button; - scmOrgNameTextField = document.getElementById("scm-org-name") as TextField; - scmProjectNameTextField = document.getElementById( - "scm-project-name", + namespaceNameTextField = document.getElementById( + "namespace-name", + ) as TextField; + collectionNameTextField = document.getElementById( + "collection-name", ) as TextField; forceCheckbox = document.getElementById("force-checkbox") as Checkbox; @@ -96,8 +98,8 @@ function main() { // projectNameTextField?.addEventListener("input", toggleCreateButton); destinationPathUrlTextField.addEventListener("input", toggleCreateButton); - scmOrgNameTextField.addEventListener("input", toggleCreateButton); - scmProjectNameTextField.addEventListener("input", toggleCreateButton); + namespaceNameTextField.addEventListener("input", toggleCreateButton); + collectionNameTextField.addEventListener("input", toggleCreateButton); folderExplorerButton.addEventListener("click", openExplorer); fileExplorerButton.addEventListener("click", openExplorer); @@ -166,11 +168,11 @@ function toggleCreateButton() { if (!destinationPathUrlTextField.value.trim()) { initCollectionPathElement.innerHTML = `${ destinationPathUrlTextField.placeholder - }/${scmOrgNameTextField.value.trim()}-${scmProjectNameTextField.value.trim()}`; + }/${namespaceNameTextField.value.trim()}-${collectionNameTextField.value.trim()}`; if ( - !scmOrgNameTextField.value.trim() || - !scmProjectNameTextField.value.trim() + !namespaceNameTextField.value.trim() || + !collectionNameTextField.value.trim() ) { initCollectionPathElement.innerHTML = destinationPathUrlTextField.placeholder; @@ -181,8 +183,8 @@ function toggleCreateButton() { } if ( - scmOrgNameTextField.value.trim() && - scmProjectNameTextField.value.trim() + namespaceNameTextField.value.trim() && + collectionNameTextField.value.trim() ) { initCreateButton.disabled = false; } else { @@ -193,8 +195,8 @@ function toggleCreateButton() { function handleInitClearClick() { // projectNameTextField.value = ""; destinationPathUrlTextField.value = ""; - scmOrgNameTextField.value = ""; - scmProjectNameTextField.value = ""; + namespaceNameTextField.value = ""; + collectionNameTextField.value = ""; initCollectionPathElement.innerHTML = destinationPathUrlTextField.placeholder; @@ -232,8 +234,8 @@ function handleInitCreateClick() { payload: { // projectName: projectNameTextField.value.trim(), destinationPath: destinationPathUrlTextField.value.trim(), - scmOrgName: scmOrgNameTextField.value.trim(), - scmProjectName: scmProjectNameTextField.value.trim(), + namespaceName: namespaceNameTextField.value.trim(), + collectionName: collectionNameTextField.value.trim(), verbosity: verboseDropdown.currentValue.trim(), logToFile: logToFileCheckbox.checked, logFilePath: logFilePath.value.trim(),