Skip to content

Commit 7dd0b16

Browse files
tdrueztdruez
authored
Rename ProductDependency is_resolved to is_pinned #189 (#190)
Signed-off-by: tdruez <[email protected]>
1 parent 08b4814 commit 7dd0b16

File tree

14 files changed

+67
-34
lines changed

14 files changed

+67
-34
lines changed

‎CHANGELOG.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ Release notes
33

44
### Version 5.3.0-dev
55

6+
- Rename ProductDependency is_resolved to is_pinned.
7+
https://github.com/aboutcode-org/dejacode/issues/189
8+
69
### Version 5.2.1
710

811
- Fix the models documentation navigation.

‎component_catalog/tests/test_importers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ def test_package_import_prepare_package(self):
12591259
"scope": "compile",
12601260
"is_runtime": True,
12611261
"is_optional": False,
1262-
"is_resolved": False,
1262+
"is_pinned": False,
12631263
}
12641264
],
12651265
"contains_source_code": None,
@@ -1294,7 +1294,7 @@ def test_package_import_prepare_package(self):
12941294
"dependencies": '[\n {\n "purl": "pkg:maven/org.slf4j/slf4j-api",'
12951295
'\n "requirement": null,\n "scope": "compile",'
12961296
'\n "is_runtime": true,\n "is_optional": false,'
1297-
'\n "is_resolved": false\n }\n]',
1297+
'\n "is_pinned": false\n }\n]',
12981298
"repository_homepage_url": (
12991299
"https://repo1.maven.org/maven2/org/apache/activemq/activemq-camel/5.11.0/"
13001300
),

‎component_catalog/tests/testfiles/import/package_from_scancode.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -154,39 +154,39 @@
154154
"scope": "runtime",
155155
"is_runtime": true,
156156
"is_optional": false,
157-
"is_resolved": false
157+
"is_pinned": false
158158
},
159159
{
160160
"purl": "pkg:gem/appraisal",
161161
"requirement": "~> 2.0",
162162
"scope": "development",
163163
"is_runtime": false,
164164
"is_optional": true,
165-
"is_resolved": false
165+
"is_pinned": false
166166
},
167167
{
168168
"purl": "pkg:gem/rspec",
169169
"requirement": "~> 3.0",
170170
"scope": "development",
171171
"is_runtime": false,
172172
"is_optional": true,
173-
"is_resolved": false
173+
"is_pinned": false
174174
},
175175
{
176176
"purl": "pkg:gem/rake",
177177
"requirement": "~> 12.0",
178178
"scope": "development",
179179
"is_runtime": false,
180180
"is_optional": true,
181-
"is_resolved": false
181+
"is_pinned": false
182182
},
183183
{
184184
"purl": "pkg:gem/gem-release",
185185
"requirement": ">= 0.7",
186186
"scope": "development",
187187
"is_runtime": false,
188188
"is_optional": true,
189-
"is_resolved": false
189+
"is_pinned": false
190190
}
191191
],
192192
"contains_source_code": null,
@@ -246,7 +246,7 @@
246246
"scope": "devDependencies",
247247
"is_runtime": false,
248248
"is_optional": true,
249-
"is_resolved": false
249+
"is_pinned": false
250250
}
251251
],
252252
"contains_source_code": null,
@@ -388,39 +388,39 @@
388388
"scope": "runtime",
389389
"is_runtime": true,
390390
"is_optional": false,
391-
"is_resolved": false
391+
"is_pinned": false
392392
},
393393
{
394394
"purl": "pkg:gem/appraisal",
395395
"requirement": "~> 2.0",
396396
"scope": "development",
397397
"is_runtime": false,
398398
"is_optional": true,
399-
"is_resolved": false
399+
"is_pinned": false
400400
},
401401
{
402402
"purl": "pkg:gem/rspec",
403403
"requirement": "~> 3.0",
404404
"scope": "development",
405405
"is_runtime": false,
406406
"is_optional": true,
407-
"is_resolved": false
407+
"is_pinned": false
408408
},
409409
{
410410
"purl": "pkg:gem/rake",
411411
"requirement": "~> 12.0",
412412
"scope": "development",
413413
"is_runtime": false,
414414
"is_optional": true,
415-
"is_resolved": false
415+
"is_pinned": false
416416
},
417417
{
418418
"purl": "pkg:gem/gem-release",
419419
"requirement": ">= 0.7",
420420
"scope": "development",
421421
"is_runtime": false,
422422
"is_optional": true,
423-
"is_resolved": false
423+
"is_pinned": false
424424
}
425425
],
426426
"contains_source_code": null,
@@ -691,7 +691,7 @@
691691
"scope": "devDependencies",
692692
"is_runtime": false,
693693
"is_optional": true,
694-
"is_resolved": false
694+
"is_pinned": false
695695
}
696696
],
697697
"contains_source_code": null,

‎component_catalog/tests/testfiles/import/package_from_scancode_no_summary.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,39 +102,39 @@
102102
"scope": "runtime",
103103
"is_runtime": true,
104104
"is_optional": false,
105-
"is_resolved": false
105+
"is_pinned": false
106106
},
107107
{
108108
"purl": "pkg:gem/appraisal",
109109
"requirement": "~> 2.0",
110110
"scope": "development",
111111
"is_runtime": false,
112112
"is_optional": true,
113-
"is_resolved": false
113+
"is_pinned": false
114114
},
115115
{
116116
"purl": "pkg:gem/rspec",
117117
"requirement": "~> 3.0",
118118
"scope": "development",
119119
"is_runtime": false,
120120
"is_optional": true,
121-
"is_resolved": false
121+
"is_pinned": false
122122
},
123123
{
124124
"purl": "pkg:gem/rake",
125125
"requirement": "~> 12.0",
126126
"scope": "development",
127127
"is_runtime": false,
128128
"is_optional": true,
129-
"is_resolved": false
129+
"is_pinned": false
130130
},
131131
{
132132
"purl": "pkg:gem/gem-release",
133133
"requirement": ">= 0.7",
134134
"scope": "development",
135135
"is_runtime": false,
136136
"is_optional": true,
137-
"is_resolved": false
137+
"is_pinned": false
138138
}
139139
],
140140
"contains_source_code": null,
@@ -454,7 +454,7 @@
454454
"scope": "devDependencies",
455455
"is_runtime": false,
456456
"is_optional": true,
457-
"is_resolved": false
457+
"is_pinned": false
458458
}
459459
],
460460
"contains_source_code": null,

‎dejacode/static/css/dejacode_bootstrap.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ table.vulnerabilities-table .column-summary {
403403
#tab_dependencies .column-column-is_optional {
404404
width: 100px;
405405
}
406-
#tab_dependencies .column-column-is_resolved {
406+
#tab_dependencies .column-column-is_pinned {
407407
width: 88px;
408408
}
409409

‎product_portfolio/admin.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ class ProductDependencyAdmin(ProductRelatedAdminMixin):
807807
"datasource_id",
808808
"is_runtime",
809809
"is_optional",
810-
"is_resolved",
810+
"is_pinned",
811811
"is_direct",
812812
"get_dataspace",
813813
)
@@ -822,7 +822,7 @@ class ProductDependencyAdmin(ProductRelatedAdminMixin):
822822
("product", RelatedLookupListFilter),
823823
"is_runtime",
824824
"is_optional",
825-
"is_resolved",
825+
"is_pinned",
826826
"is_direct",
827827
("for_package", RelatedLookupListFilter),
828828
("resolved_to_package", RelatedLookupListFilter),

‎product_portfolio/api.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ class Meta:
801801
"datasource_id",
802802
"is_runtime",
803803
"is_optional",
804-
"is_resolved",
804+
"is_pinned",
805805
"is_direct",
806806
"last_modified_date",
807807
)
@@ -841,7 +841,7 @@ class Meta:
841841
"datasource_id",
842842
"is_runtime",
843843
"is_optional",
844-
"is_resolved",
844+
"is_pinned",
845845
"is_direct",
846846
"created_date",
847847
"last_modified_date",

‎product_portfolio/filters.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ class DependencyFilterSet(DataspacedFilterSet):
399399
is_optional = BooleanChoiceFilter(
400400
widget=DropDownWidget(anchor="#dependencies"),
401401
)
402-
is_resolved = BooleanChoiceFilter(
402+
is_pinned = BooleanChoiceFilter(
403403
widget=DropDownWidget(anchor="#dependencies"),
404404
)
405405
is_direct = BooleanChoiceFilter(
@@ -417,6 +417,6 @@ class Meta:
417417
"datasource_id",
418418
"is_runtime",
419419
"is_optional",
420-
"is_resolved",
420+
"is_pinned",
421421
"is_direct",
422422
]

‎product_portfolio/migrations/0008_productdependency_is_resolved_to_is_pinned.py‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Generated by Django 5.0.9 on 2024-10-31 04:26
2+
3+
from django.conf import settings
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('component_catalog', '0009_componentaffectedbyvulnerability_and_more'),
11+
('dje', '0004_dataspace_vulnerabilities_updated_at'),
12+
('product_portfolio', '0007_alter_scancodeproject_type'),
13+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
14+
]
15+
16+
operations = [
17+
migrations.RemoveIndex(
18+
model_name='productdependency',
19+
name='product_por_is_reso_368f34_idx',
20+
),
21+
migrations.RenameField(
22+
model_name='productdependency',
23+
old_name='is_resolved',
24+
new_name='is_pinned',
25+
),
26+
migrations.AddIndex(
27+
model_name='productdependency',
28+
index=models.Index(fields=['is_pinned'], name='product_por_is_pinn_aa0755_idx'),
29+
),
30+
]

‎product_portfolio/models.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,7 @@ class ProductDependency(HistoryFieldsMixin, DataspacedModel):
14281428
default=False,
14291429
help_text=_("True if this dependency is an optional dependency"),
14301430
)
1431-
is_resolved = models.BooleanField(
1431+
is_pinned = models.BooleanField(
14321432
default=False,
14331433
help_text=_(
14341434
"True if this dependency version requirement has been pinned "
@@ -1451,7 +1451,7 @@ class Meta:
14511451
models.Index(fields=["scope"]),
14521452
models.Index(fields=["is_runtime"]),
14531453
models.Index(fields=["is_optional"]),
1454-
models.Index(fields=["is_resolved"]),
1454+
models.Index(fields=["is_pinned"]),
14551455
models.Index(fields=["is_direct"]),
14561456
]
14571457

0 commit comments

Comments
 (0)