Skip to content

Commit 68f9232

Browse files
Fix for Collection Plugin and Collection & Playbook Project Webviews (#1815)
* Fix for 'Path does not exist' error in Collection Plugin webview * Fix for Collection and Playbook project
1 parent 15856a6 commit 68f9232

File tree

3 files changed

+37
-61
lines changed

3 files changed

+37
-61
lines changed

src/webview/apps/contentCreator/addPluginPageApp.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@ function handleInitOpenScaffoldedFolderClick() {
221221
command: "init-open-scaffolded-folder",
222222
payload: {
223223
projectUrl: projectUrl,
224+
pluginName: pluginNameTextField.value.trim(),
225+
pluginType: pluginTypeDropdown.value.trim(),
224226
},
225227
});
226228
}

src/webview/apps/contentCreator/createAnsibleCollectionPageApp.ts

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -143,41 +143,30 @@ function main() {
143143

144144
function openExplorer(event: any) {
145145
const source = event.target.id;
146-
147-
let selectOption;
148-
149-
if (source === "folder-explorer") {
150-
selectOption = "folder";
151-
} else {
152-
selectOption = "file";
153-
}
146+
const selectOption = source === "folder-explorer" ? "folder" : "file";
154147

155148
vscode.postMessage({
156149
command: "open-explorer",
157-
payload: {
158-
selectOption: selectOption,
159-
},
150+
payload: { selectOption },
160151
});
161152

162-
window.addEventListener(
163-
"message",
164-
(event: MessageEvent<PostMessageEvent>) => {
165-
const message = event.data;
166-
167-
if (message.command === "file-uri") {
168-
const selectedUri = message.arguments.selectedUri;
169-
170-
if (selectedUri) {
171-
if (source === "folder-explorer") {
172-
initPathUrlTextField.value = selectedUri;
173-
initCollectionPathElement.innerHTML = selectedUri;
174-
} else {
175-
logFilePath.value = selectedUri;
176-
}
153+
const handleMessage = (event: MessageEvent) => {
154+
const message = event.data;
155+
if (message.command === "file-uri") {
156+
const selectedUri = message.arguments.selectedUri;
157+
if (selectedUri) {
158+
if (source === "folder-explorer") {
159+
initPathUrlTextField.value = selectedUri;
160+
initCollectionPathElement.innerHTML = selectedUri;
161+
} else if (source === "file-explorer") {
162+
logFilePath.value = selectedUri;
177163
}
178164
}
179-
},
180-
);
165+
window.removeEventListener("message", handleMessage);
166+
}
167+
};
168+
169+
window.addEventListener("message", handleMessage);
181170
}
182171

183172
function toggleCreateButton() {

src/webview/apps/contentCreator/createAnsibleProjectPageApp.ts

Lines changed: 18 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -131,44 +131,29 @@ function main() {
131131
initCollectionPathDiv?.appendChild(initCollectionPathElement);
132132
}
133133

134+
let Source = "";
134135
function openExplorer(event: any) {
135-
const source = event.target.id;
136-
137-
let selectOption;
138-
139-
if (source === "folder-explorer") {
140-
selectOption = "folder";
141-
} else {
142-
selectOption = "file";
143-
}
144-
136+
Source = event.target.id;
137+
const selectOption = Source === "folder-explorer" ? "folder" : "file";
145138
vscode.postMessage({
146139
command: "open-explorer",
147-
payload: {
148-
selectOption: selectOption,
149-
},
140+
payload: { selectOption },
150141
});
151-
152-
window.addEventListener(
153-
"message",
154-
(event: MessageEvent<PostMessageEvent>) => {
155-
const message = event.data;
156-
157-
if (message.command === "file-uri") {
158-
const selectedUri = message.arguments.selectedUri;
159-
160-
if (selectedUri) {
161-
if (source === "folder-explorer") {
162-
destinationPathUrlTextField.value = selectedUri;
163-
initCollectionPathElement.innerHTML = selectedUri;
164-
} else {
165-
logFilePath.value = selectedUri;
166-
}
167-
}
168-
}
169-
},
170-
);
171142
}
143+
window.addEventListener("message", (event: MessageEvent<PostMessageEvent>) => {
144+
const message = event.data;
145+
if (message.command === "file-uri") {
146+
const selectedUri = message.arguments.selectedUri;
147+
if (selectedUri) {
148+
if (Source === "folder-explorer") {
149+
destinationPathUrlTextField.value = selectedUri;
150+
initCollectionPathElement.innerHTML = selectedUri;
151+
} else if (Source === "file-explorer") {
152+
logFilePath.value = selectedUri;
153+
}
154+
}
155+
}
156+
});
172157

173158
function toggleCreateButton() {
174159
// update collection path <p> tag

0 commit comments

Comments
 (0)