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(adminPanel): RN-1396: Entity import wipes attributes if attributes are not specified in import file #5829

Merged
merged 8 commits into from
Sep 30, 2024
Merged

fix(adminPanel): RN-1396: Entity import wipes attributes if attributes are not specified in import file #5829

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
58553d5
attribute updates
hrazasalman Aug 6, 2024
3420e44
slight update
hrazasalman Aug 6, 2024
fb874c0
Update Entity.js
hrazasalman Aug 6, 2024
be44e29
Merge branch 'dev' into rn-1396-entity-import-wipes-attributes
hrazasalman Aug 19, 2024
72dcd47
exlude blank rows
hrazasalman Aug 20, 2024
5c4b87f
merge: dev -> rn-1396 (#5896)
alexd-bes Sep 12, 2024
4257271
Merge branch 'dev' into rn-1396-entity-import-wipes-attributes
tcaiger Sep 30, 2024
f6e7407
Update extractEntitiesByCountryName.js
tcaiger Sep 30, 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
2 changes: 1 addition & 1 deletion packages/central-server/src/apiV2/import/importEntities/updateCountryEntities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ export async function updateCountryEntities(
);

if (attributes !== undefined) {
await transactingModels.entity.updateEntityAttributes(code, attributes ? { attributes } : {});
await transactingModels.entity.updateEntityAttributes(code, attributes);
}
if (longitude && latitude) {
await transactingModels.entity.updatePointCoordinates(code, { longitude, latitude });
Expand Down
1 change: 1 addition & 0 deletions packages/database/src/modelClasses/Entity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,7 @@ export class EntityModel extends MaterializedViewLogDatabaseModel {
}

async updateEntityAttributes(code, attributes) {
hrazasalman marked this conversation as resolved.
Show resolved Hide resolved
attributes = attributes || {};
hrazasalman marked this conversation as resolved.
Show resolved Hide resolved
return this.database.executeSql(
`
UPDATE "entity"
Expand Down