+
Skip to content

Rename ProductDependency is_resolved to is_pinned #189 #190

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 1 commit into from
Oct 31, 2024
Merged

Rename ProductDependency is_resolved to is_pinned #189 #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ Release notes

### Version 5.3.0-dev

- Rename ProductDependency is_resolved to is_pinned.
https://github.com/aboutcode-org/dejacode/issues/189

### Version 5.2.1

- Fix the models documentation navigation.
Expand Down
4 changes: 2 additions & 2 deletions component_catalog/tests/test_importers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,7 +1259,7 @@ def test_package_import_prepare_package(self):
"scope": "compile",
"is_runtime": True,
"is_optional": False,
"is_resolved": False,
"is_pinned": False,
}
],
"contains_source_code": None,
Expand Down Expand Up @@ -1294,7 +1294,7 @@ def test_package_import_prepare_package(self):
"dependencies": '[\n {\n "purl": "pkg:maven/org.slf4j/slf4j-api",'
'\n "requirement": null,\n "scope": "compile",'
'\n "is_runtime": true,\n "is_optional": false,'
'\n "is_resolved": false\n }\n]',
'\n "is_pinned": false\n }\n]',
"repository_homepage_url": (
"https://repo1.maven.org/maven2/org/apache/activemq/activemq-camel/5.11.0/"
),
Expand Down
24 changes: 12 additions & 12 deletions component_catalog/tests/testfiles/import/package_from_scancode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,39 +154,39 @@
"scope": "runtime",
"is_runtime": true,
"is_optional": false,
"is_resolved": false
"is_pinned": false
},
{
"purl": "pkg:gem/appraisal",
"requirement": "~> 2.0",
"scope": "development",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
},
{
"purl": "pkg:gem/rspec",
"requirement": "~> 3.0",
"scope": "development",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
},
{
"purl": "pkg:gem/rake",
"requirement": "~> 12.0",
"scope": "development",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
},
{
"purl": "pkg:gem/gem-release",
"requirement": ">= 0.7",
"scope": "development",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
}
],
"contains_source_code": null,
Expand Down Expand Up @@ -246,7 +246,7 @@
"scope": "devDependencies",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
}
],
"contains_source_code": null,
Expand Down Expand Up @@ -388,39 +388,39 @@
"scope": "runtime",
"is_runtime": true,
"is_optional": false,
"is_resolved": false
"is_pinned": false
},
{
"purl": "pkg:gem/appraisal",
"requirement": "~> 2.0",
"scope": "development",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
},
{
"purl": "pkg:gem/rspec",
"requirement": "~> 3.0",
"scope": "development",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
},
{
"purl": "pkg:gem/rake",
"requirement": "~> 12.0",
"scope": "development",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
},
{
"purl": "pkg:gem/gem-release",
"requirement": ">= 0.7",
"scope": "development",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
}
],
"contains_source_code": null,
Expand Down Expand Up @@ -691,7 +691,7 @@
"scope": "devDependencies",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
}
],
"contains_source_code": null,
Expand Down
12 changes: 6 additions & 6 deletions component_catalog/tests/testfiles/import/package_from_scancode_no_summary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,39 +102,39 @@
"scope": "runtime",
"is_runtime": true,
"is_optional": false,
"is_resolved": false
"is_pinned": false
},
{
"purl": "pkg:gem/appraisal",
"requirement": "~> 2.0",
"scope": "development",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
},
{
"purl": "pkg:gem/rspec",
"requirement": "~> 3.0",
"scope": "development",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
},
{
"purl": "pkg:gem/rake",
"requirement": "~> 12.0",
"scope": "development",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
},
{
"purl": "pkg:gem/gem-release",
"requirement": ">= 0.7",
"scope": "development",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
}
],
"contains_source_code": null,
Expand Down Expand Up @@ -454,7 +454,7 @@
"scope": "devDependencies",
"is_runtime": false,
"is_optional": true,
"is_resolved": false
"is_pinned": false
}
],
"contains_source_code": null,
Expand Down
2 changes: 1 addition & 1 deletion dejacode/static/css/dejacode_bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ table.vulnerabilities-table .column-summary {
#tab_dependencies .column-column-is_optional {
width: 100px;
}
#tab_dependencies .column-column-is_resolved {
#tab_dependencies .column-column-is_pinned {
width: 88px;
}

Expand Down
4 changes: 2 additions & 2 deletions product_portfolio/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ class ProductDependencyAdmin(ProductRelatedAdminMixin):
"datasource_id",
"is_runtime",
"is_optional",
"is_resolved",
"is_pinned",
"is_direct",
"get_dataspace",
)
Expand All @@ -822,7 +822,7 @@ class ProductDependencyAdmin(ProductRelatedAdminMixin):
("product", RelatedLookupListFilter),
"is_runtime",
"is_optional",
"is_resolved",
"is_pinned",
"is_direct",
("for_package", RelatedLookupListFilter),
("resolved_to_package", RelatedLookupListFilter),
Expand Down
4 changes: 2 additions & 2 deletions product_portfolio/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ class Meta:
"datasource_id",
"is_runtime",
"is_optional",
"is_resolved",
"is_pinned",
"is_direct",
"last_modified_date",
)
Expand Down Expand Up @@ -841,7 +841,7 @@ class Meta:
"datasource_id",
"is_runtime",
"is_optional",
"is_resolved",
"is_pinned",
"is_direct",
"created_date",
"last_modified_date",
Expand Down
4 changes: 2 additions & 2 deletions product_portfolio/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ class DependencyFilterSet(DataspacedFilterSet):
is_optional = BooleanChoiceFilter(
widget=DropDownWidget(anchor="#dependencies"),
)
is_resolved = BooleanChoiceFilter(
is_pinned = BooleanChoiceFilter(
widget=DropDownWidget(anchor="#dependencies"),
)
is_direct = BooleanChoiceFilter(
Expand All @@ -417,6 +417,6 @@ class Meta:
"datasource_id",
"is_runtime",
"is_optional",
"is_resolved",
"is_pinned",
"is_direct",
]
30 changes: 30 additions & 0 deletions product_portfolio/migrations/0008_productdependency_is_resolved_to_is_pinned.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Generated by Django 5.0.9 on 2024-10-31 04:26

from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('component_catalog', '0009_componentaffectedbyvulnerability_and_more'),
('dje', '0004_dataspace_vulnerabilities_updated_at'),
('product_portfolio', '0007_alter_scancodeproject_type'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.RemoveIndex(
model_name='productdependency',
name='product_por_is_reso_368f34_idx',
),
migrations.RenameField(
model_name='productdependency',
old_name='is_resolved',
new_name='is_pinned',
),
migrations.AddIndex(
model_name='productdependency',
index=models.Index(fields=['is_pinned'], name='product_por_is_pinn_aa0755_idx'),
),
]
4 changes: 2 additions & 2 deletions product_portfolio/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,7 @@ class ProductDependency(HistoryFieldsMixin, DataspacedModel):
default=False,
help_text=_("True if this dependency is an optional dependency"),
)
is_resolved = models.BooleanField(
is_pinned = models.BooleanField(
default=False,
help_text=_(
"True if this dependency version requirement has been pinned "
Expand All @@ -1451,7 +1451,7 @@ class Meta:
models.Index(fields=["scope"]),
models.Index(fields=["is_runtime"]),
models.Index(fields=["is_optional"]),
models.Index(fields=["is_resolved"]),
models.Index(fields=["is_pinned"]),
models.Index(fields=["is_direct"]),
]

Expand Down
2 changes: 1 addition & 1 deletion product_portfolio/templates/product_portfolio/tabs/tab_dependencies.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
{{ dependency.is_optional|as_icon }}
</td>
<td>
{{ dependency.is_resolved|as_icon }}
{{ dependency.is_pinned|as_icon }}
</td>
</tr>
{% empty %}
Expand Down
4 changes: 2 additions & 2 deletions product_portfolio/tests/test_importers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,7 @@ def test_product_portfolio_import_packages_from_scancodeio_importer(
"scope": "install",
"is_runtime": True,
"is_optional": False,
"is_resolved": True,
"is_pinned": True,
"is_direct": True,
"dependency_uid": dependency_uid,
"for_package_uid": None,
Expand Down Expand Up @@ -999,7 +999,7 @@ def test_product_portfolio_import_packages_from_scancodeio_importer(
self.assertEqual("pypi_setup_cfg", created_dependency.datasource_id)
self.assertTrue(created_dependency.is_runtime)
self.assertFalse(created_dependency.is_optional)
self.assertTrue(created_dependency.is_resolved)
self.assertTrue(created_dependency.is_pinned)
self.assertTrue(created_dependency.is_direct)
self.assertIsNone(created_dependency.for_package_id)
self.assertIsNone(created_dependency.resolved_to_package_id)
Expand Down
2 changes: 1 addition & 1 deletion product_portfolio/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ class ProductTabDependenciesView(
Header("extracted_requirement", _("Extracted requirement")),
Header("is_runtime", _("Runtime"), filter="is_runtime"),
Header("is_optional", _("Optional"), filter="is_optional"),
Header("is_resolved", _("Resolved"), filter="is_resolved"),
Header("is_pinned", _("Pinned"), filter="is_pinned"),
)

def get_context_data(self, **kwargs):
Expand Down
2 changes: 1 addition & 1 deletion purldb/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"scope": "compile",
"is_runtime": true,
"is_optional": false,
"is_resolved": false
"is_pinned": false
}
],
"resources": "https://purldb/api/packages/2928d61d-b113-46ba-aa11/resources/"
Expand Down
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载