Skip to content

Issue 3349 #3351

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
merged 4 commits into from
Sep 2, 2024
Merged

Issue 3349 #3351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b73cdc2
Show correct code snippet for products type of plugin
supersonicbyte Aug 31, 2024
acfa65c
Use rawValue instead of stringValue
supersonicbyte Sep 1, 2024
f06f19e
Update snapshots
finestructure Sep 2, 2024
a63a26c
Fix JS linting issue
finestructure Sep 2, 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: 3 additions & 1 deletion FrontEnd/scripts/controllers/use_this_package_panel_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export class UseThisPackagePanelController extends Controller {
const optionElement = selectElement.options[selectElement.selectedIndex]
const packageName = optionElement.dataset.package
const productName = optionElement.dataset.product
this.snippetTarget.value = `.product(name: "${productName}", package: "${packageName}")`
const type = optionElement.dataset.type
const prefix = type == 'plugin' ? '.plugin' : '.product'
this.snippetTarget.value = `${prefix}(name: "${productName}", package: "${packageName}")`
}
}
2 changes: 1 addition & 1 deletion Sources/App/Controllers/API/API+PackageController+GetRoute+Model.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ extension API.PackageController.GetRoute.Model {
self.type = type
}

enum ProductType: Codable, Equatable {
enum ProductType: String, Codable, Equatable {
case library
case executable
case plugin
Expand Down
4 changes: 3 additions & 1 deletion Sources/App/Views/PackageController/GetRoute.Model+ext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,12 @@ extension API.PackageController.GetRoute.Model {
.data(named: "action", value: "input->use-this-package-panel#updateProductSnippet"),
.attribute(named: "name", value: "products"),
.id("products"),
.forEach(products, { product in
// Filter out products of type `executable` until we add support for them.
.forEach(products.filter({ $0.type != .executable }), { product in
.option(
.data(named: "package", value: package),
.data(named: "product", value: product.name),
.data(named: "type", value: product.type.rawValue),
.value(product.name),
.label(product.name)
)
Expand Down
7 changes: 3 additions & 4 deletions Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_PackageShowView.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions ...apshots__/WebpageSnapshotTests/test_PackageShowView_app_store_incompatible_license.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_PackageShowView_binary_targets.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions ...napshots__/WebpageSnapshotTests/test_PackageShowView_canonicalURL_noImageSnapshots.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_PackageShowView_emoji_summary.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_PackageShowView_few_keywords.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_PackageShowView_many_keywords.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions ...pTests/__Snapshots__/WebpageSnapshotTests/test_PackageShowView_no_authors_activity.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_PackageShowView_no_builds.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_PackageShowView_no_license.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions ...pTests/__Snapshots__/WebpageSnapshotTests/test_PackageShowView_open_source_license.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_PackageShowView_other_license.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions ...AppTests/__Snapshots__/WebpageSnapshotTests/test_PackageShowView_single_row_tables.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
7 changes: 3 additions & 4 deletions ...ts/__Snapshots__/WebpageSnapshotTests/test_PackageShowView_withPackageFundingLinks.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,9 @@ <h4>When working with a Swift Package Manager manifest:</h4>
<p>
<label for="products">Select a product:</label>
<select data-use-this-package-panel-target="select" data-action="input->use-this-package-panel#updateProductSnippet" name="products" id="products">
<option data-package="swift-alamofire" data-product="lib1" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="exe" value="exe" label="exe"/>
<option data-package="swift-alamofire" data-product="lib3" value="lib3" label="lib3"/>
<option data-package="swift-alamofire" data-product="lib1" data-type="library" value="lib1" label="lib1"/>
<option data-package="swift-alamofire" data-product="lib2" data-type="library" value="lib2" label="lib2"/>
<option data-package="swift-alamofire" data-product="lib3" data-type="library" value="lib3" label="lib3"/>
</select>
</p>
<form class="copyable-input">
Expand Down
Loading
Loading