Skip to content

Commit 0cdd8ec

Browse files
alok1304alok1304
committed
Rename dependency attribute is_resolved to is_pinned
Renaming the dependency attribute is_resolved to is_pinned. Output changes when we use is_resolved. Reference: #634 Signed-off-by: Alok Kumar <[email protected]>
1 parent 0a8ee86 commit 0cdd8ec

File tree

10 files changed

+24
-23
lines changed

10 files changed

+24
-23
lines changed

‎CHANGELOG.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Docs
1212
~~~~~~~~~
1313

1414
- Update macOS installation steps by @OmkarPh in #631
15+
- Renamed the dependency attribute ``is_resolved`` to ``is_pinned``. See #634
1516

1617
[v4.0.3] - 2024-08-07
1718
--------------------------

‎src/components/PackagesEntityDetails/DependenciesTableCols.ts.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const DependenciesTableCols: DepsColDef[] = [
3333
},
3434
{
3535
headerName: "Resolved",
36-
field: "is_resolved",
36+
field: "is_pinned",
3737
cellRenderer: TickRenderer,
3838
maxWidth: 92,
3939
},

‎src/components/PackagesEntityDetails/DependencyEntity.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const DependencyEntity = (props: DependencyEntityProps) => {
3737
Optional
3838
</Badge>
3939
)}
40-
{dependency.is_resolved && (
40+
{dependency.is_pinned && (
4141
<Badge pill bg="success">
4242
<FontAwesomeIcon icon={faCheck} /> Resolved
4343
</Badge>
@@ -86,7 +86,7 @@ const DependencyEntity = (props: DependencyEntityProps) => {
8686
))}
8787
</div>
8888
<br />
89-
{dependency.is_resolved && dependency.resolved_package && (
89+
{dependency.is_pinned && dependency.resolved_package && (
9090
<div>
9191
Resolved package:
9292
<ReactJson

‎src/pages/DependencyInfoDash/DependencyInfoDash.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const DependencyInfoDash = () => {
8080

8181
packageTypeSummary.packageTypeDetails.total += deps.length;
8282
packageTypeSummary.resolved += deps.reduce((counter, curr) => {
83-
return counter + (curr.is_resolved ? 1 : 0);
83+
return counter + (curr.is_pinned ? 1 : 0);
8484
}, 0);
8585
packageTypeSummary.runtime += deps.reduce((counter, curr) => {
8686
return counter + (curr.is_runtime ? 1 : 0);
@@ -125,7 +125,7 @@ const DependencyInfoDash = () => {
125125
"id",
126126
"for_package_uid",
127127
"is_runtime",
128-
"is_resolved",
128+
"is_pinned",
129129
"is_optional",
130130
"datasource_id",
131131
"scope",
@@ -145,7 +145,7 @@ const DependencyInfoDash = () => {
145145

146146
// Prepare chart for resolved dependencies
147147
const resolvedDependencies = dependencies.map((dependency) =>
148-
dependency.getDataValue("is_resolved") ? "Resolved" : "Unresolved"
148+
dependency.getDataValue("is_pinned") ? "Resolved" : "Unresolved"
149149
);
150150
const { chartData: resolvedDependenciesChartData } =
151151
formatPieChartData(resolvedDependencies);

‎src/pages/Packages/Packages.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ const Packages = () => {
202202
scope: dependencyInfo.scope as DEPENDENCY_SCOPES,
203203
is_runtime: dependencyInfo.is_runtime,
204204
is_optional: dependencyInfo.is_optional,
205-
is_resolved: dependencyInfo.is_resolved,
205+
is_pinned: dependencyInfo.is_pinned,
206206
resolved_package: dependencyInfo.resolved_package || {},
207207
dependency_uid: dependencyInfo.dependency_uid,
208208
for_package_uid: dependencyInfo.for_package_uid,
@@ -572,7 +572,7 @@ const Packages = () => {
572572
Optional
573573
</Badge>
574574
)}
575-
{dependency.is_resolved && (
575+
{dependency.is_pinned && (
576576
<Badge
577577
pill
578578
bg="success"

‎src/pages/Packages/filters.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ export interface DatasourceFilter {
66
export interface DepFilterTag {
77
value: string;
88
label: string;
9-
flag: "is_runtime" | "is_resolved" | "is_optional";
9+
flag: "is_runtime" | "is_pinned" | "is_optional";
1010
}
1111

1212
export const DepFilterTags: Record<
1313
"RUNTIME" | "RESOLVED" | "OPTIONAL",
1414
DepFilterTag
1515
> = {
1616
RUNTIME: { value: "runtime", label: "Runtime", flag: "is_runtime" },
17-
RESOLVED: { value: "resolved", label: "Resolved", flag: "is_resolved" },
17+
RESOLVED: { value: "resolved", label: "Resolved", flag: "is_pinned" },
1818
OPTIONAL: { value: "optional", label: "Optional", flag: "is_optional" },
1919
};
2020
export const DepFilterTagsList = [

‎src/pages/Packages/packageDefinitions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export interface DependencyDetails {
66
scope: DEPENDENCY_SCOPES;
77
is_runtime: boolean;
88
is_optional: boolean;
9-
is_resolved: boolean;
9+
is_pinned: boolean;
1010
resolved_package: unknown;
1111
dependency_uid: string;
1212
for_package_uid: string | null;

‎src/services/importedJsonTypes.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ export interface Resource {
181181
scope: string | null;
182182
is_runtime: boolean;
183183
is_optional: boolean;
184-
is_resolved: boolean;
184+
is_pinned: boolean;
185185
resolved_package: unknown;
186186
extra_data: unknown;
187187
}[];

‎src/services/models/dependencies.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export interface DependenciesAttributes {
2424
scope: string;
2525
is_runtime: boolean;
2626
is_optional: boolean;
27-
is_resolved: boolean;
27+
is_pinned: boolean;
2828
resolved_package: unknown;
2929
dependency_uid: string;
3030
for_package_uid: string;
@@ -60,7 +60,7 @@ export default function dependenciesModel(sequelize: Sequelize) {
6060
scope: DataTypes.STRING,
6161
is_runtime: DataTypes.BOOLEAN,
6262
is_optional: DataTypes.BOOLEAN,
63-
is_resolved: DataTypes.BOOLEAN,
63+
is_pinned: DataTypes.BOOLEAN,
6464
resolved_package: jsonDataType("resolved_package", {}),
6565
dependency_uid: DataTypes.STRING,
6666
for_package_uid: {

‎tests/test-scans/packages_dependencies/expectedPackagesDeps.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export const PackageDepsSamples: {
150150
scope: DEPENDENCY_SCOPES.DEVELOPMENT,
151151
is_runtime: false,
152152
is_optional: true,
153-
is_resolved: true,
153+
is_pinned: true,
154154
resolved_package: {},
155155
extra_data: {
156156
is_editable: false,
@@ -171,7 +171,7 @@ export const PackageDepsSamples: {
171171
scope: DEPENDENCY_SCOPES.DEVELOPMENT,
172172
is_runtime: false,
173173
is_optional: true,
174-
is_resolved: true,
174+
is_pinned: true,
175175
resolved_package: {},
176176
extra_data: {
177177
is_editable: false,
@@ -192,7 +192,7 @@ export const PackageDepsSamples: {
192192
scope: DEPENDENCY_SCOPES.DEVELOPMENT,
193193
is_runtime: false,
194194
is_optional: true,
195-
is_resolved: true,
195+
is_pinned: true,
196196
resolved_package: {},
197197
extra_data: {
198198
is_editable: false,
@@ -332,7 +332,7 @@ export const PackageDepsSamples: {
332332
scope: DEPENDENCY_SCOPES.DEVELOPMENT,
333333
is_runtime: false,
334334
is_optional: true,
335-
is_resolved: true,
335+
is_pinned: true,
336336
resolved_package: {},
337337
dependency_uid:
338338
"pkg:pypi/[email protected]?uuid=faa3b45c-2e04-4891-b854-52ed459a6b0a",
@@ -347,7 +347,7 @@ export const PackageDepsSamples: {
347347
scope: DEPENDENCY_SCOPES.DEVELOPMENT,
348348
is_runtime: false,
349349
is_optional: true,
350-
is_resolved: true,
350+
is_pinned: true,
351351
resolved_package: {},
352352
dependency_uid:
353353
"pkg:pypi/[email protected]?uuid=b2cf6831-b0eb-4a30-98c3-3dac9202d639",
@@ -362,7 +362,7 @@ export const PackageDepsSamples: {
362362
scope: DEPENDENCY_SCOPES.DEVELOPMENT,
363363
is_runtime: false,
364364
is_optional: true,
365-
is_resolved: true,
365+
is_pinned: true,
366366
resolved_package: {},
367367
dependency_uid:
368368
"pkg:pypi/[email protected]?uuid=1c719652-292f-419c-a7a4-164c39296661",
@@ -442,7 +442,7 @@ export const PackageDepsSamples: {
442442
scope: DEPENDENCY_SCOPES.DEVELOPMENT,
443443
is_runtime: false,
444444
is_optional: true,
445-
is_resolved: true,
445+
is_pinned: true,
446446
resolved_package: {},
447447
extra_data: {
448448
is_editable: false,
@@ -463,7 +463,7 @@ export const PackageDepsSamples: {
463463
scope: DEPENDENCY_SCOPES.DEVELOPMENT,
464464
is_runtime: false,
465465
is_optional: true,
466-
is_resolved: true,
466+
is_pinned: true,
467467
resolved_package: {},
468468
extra_data: {
469469
is_editable: false,
@@ -484,7 +484,7 @@ export const PackageDepsSamples: {
484484
scope: DEPENDENCY_SCOPES.DEVELOPMENT,
485485
is_runtime: false,
486486
is_optional: true,
487-
is_resolved: true,
487+
is_pinned: true,
488488
resolved_package: {},
489489
extra_data: {
490490
is_editable: false,

0 commit comments

Comments
 (0)