Skip to content
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

fix(diff), show component files as deleted when a component was deleted #8796

Merged
merged 2 commits into from
Apr 17, 2024
Merged

fix(diff), show component files as deleted when a component was deleted #8796

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea8c1ab
fix(diff), show component files as deleted when a component was deleted
davidfirst Apr 17, 2024
ce90215
Merge branch 'master' into deleted-diff
davidfirst Apr 17, 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
13 changes: 10 additions & 3 deletions scopes/component/component-compare/component-compare.main.runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,19 +219,26 @@ export class ComponentCompareMain {
}

async function getComponentDiff(component: Component): Promise<DiffResults> {
const diffResult = { id: component.id, hasDiff: false };
const diffResult: DiffResults = { id: component.id, hasDiff: false };
const consumerComponent = component.state._consumer as ConsumerComponent;
if (!consumerComponent.componentFromModel) {
if (component.isDeleted()) {
// component exists in the model but not in the filesystem, show all files as deleted
// the reason it is loaded without componentFromModel is because it was loaded from the scope, not workspace.
// as a proof, consumerComponent.loadedFromFileSystem is false.
const modelFiles = consumerComponent.files;
diffResult.filesDiff = await getFilesDiff(modelFiles, [], component.id.version, component.id.version);
if (hasDiff(diffResult)) diffResult.hasDiff = true;
return diffResult;
}
// it's a new component. not modified. show all files as new.
const fsFiles = consumerComponent.files;
// @ts-ignore version must be defined as the component.componentFromModel do exist
diffResult.filesDiff = await getFilesDiff([], fsFiles, component.id.version, component.id.version);
if (hasDiff(diffResult)) diffResult.hasDiff = true;
return diffResult;
}
const modelFiles = consumerComponent.componentFromModel.files;
const fsFiles = consumerComponent.files;
// @ts-ignore version must be defined as the component.componentFromModel do exist
diffResult.filesDiff = await getFilesDiff(modelFiles, fsFiles, component.id.version, component.id.version);
await updateFieldsDiff(consumerComponent.componentFromModel, consumerComponent, diffResult, diffOpts);

Expand Down