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

Uniformation of Edit Properties and detail card #5834

Merged
merged 5 commits into from
Sep 10, 2020
Merged

Uniformation of Edit Properties and detail card #5834

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
178e84e
Adopt general SaveModal to MapGrid
vlt1 Sep 3, 2020
f049832
added translations
vlt1 Sep 3, 2020
4496da1
post review rework
vlt1 Sep 8, 2020
d54d5fa
removed commented out code
vlt1 Sep 9, 2020
d9dc1de
added tests
vlt1 Sep 10, 2020
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
26 changes: 0 additions & 26 deletions web/client/actions/__tests__/currentMap-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
var expect = require('expect');
var {
EDIT_MAP, editMap,
UPDATE_CURRENT_MAP, updateCurrentMap,
ERROR_CURRENT_MAP, errorCurrentMap,
REMOVE_THUMBNAIL, removeThumbnail,
UPDATE_CURRENT_MAP_PERMISSIONS, updateCurrentMapPermissions,
UPDATE_CURRENT_MAP_GROUPS, updateCurrentMapGroups,
RESET_CURRENT_MAP, resetCurrentMap,
Expand All @@ -36,15 +33,6 @@ describe('Test correctness of the maps actions', () => {
expect(retval.map.canWrite).toBeTruthy();
});

it('updateCurrentMap', () => {
let thumbnailData = [];
let thumbnail = "myThumnbnailUrl";
var retval = updateCurrentMap(thumbnailData, thumbnail);
expect(retval).toExist();
expect(retval.type).toBe(UPDATE_CURRENT_MAP);
expect(retval.thumbnail).toBe(thumbnail);
expect(retval.thumbnailData).toBe(thumbnailData);
});
it('updateCurrentMapGroups', () => {
let groups = {
groups: {
Expand All @@ -61,13 +49,6 @@ describe('Test correctness of the maps actions', () => {
expect(retval.groups).toBe(groups);
});

it('errorCurrentMap', () => {
let errors = ["FORMAT"];
var retval = errorCurrentMap(errors);
expect(retval).toExist();
expect(retval.type).toBe(ERROR_CURRENT_MAP);
expect(retval.errors).toBe(errors);
});
it('updateCurrentMapPermissions', () => {
let permissions = {
SecurityRuleList: {
Expand All @@ -86,13 +67,6 @@ describe('Test correctness of the maps actions', () => {
expect(retval.type).toBe(UPDATE_CURRENT_MAP_PERMISSIONS);
expect(retval.permissions).toBe(permissions);
});
it('removeThumbnail', () => {
let resourceId = 1;
const retval = removeThumbnail(resourceId);
expect(retval).toExist();
expect(retval.type).toBe(REMOVE_THUMBNAIL);
expect(retval.resourceId).toBe(resourceId);
});
it('resetCurrentMap', () => {
const retval = resetCurrentMap();
expect(retval).toExist();
Expand Down
244 changes: 3 additions & 241 deletions web/client/actions/__tests__/maps-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,46 +11,27 @@ const assign = require('object-assign');
const axios = require("../../libs/ajax");
const MockAdapter = require("axios-mock-adapter");
const {
toggleDetailsSheet, TOGGLE_DETAILS_SHEET,
toggleGroupProperties, TOGGLE_GROUP_PROPERTIES,
toggleUnsavedChanges, TOGGLE_UNSAVED_CHANGES,
deleteMap, DELETE_MAP,
updateDetails, UPDATE_DETAILS,
saveDetails, SAVE_DETAILS,
deleteDetails, DELETE_DETAILS,
setDetailsChanged, SET_DETAILS_CHANGED,
saveResourceDetails, SAVE_RESOURCE_DETAILS,
backDetails, BACK_DETAILS,
undoDetails, UNDO_DETAILS,
doNothing, DO_NOTHING,
setUnsavedChanged, SET_UNSAVED_CHANGES,
openDetailsPanel, OPEN_DETAILS_PANEL,
closeDetailsPanel, CLOSE_DETAILS_PANEL,
MAP_UPDATING, mapUpdating,
DETAILS_LOADED, detailsLoaded,
PERMISSIONS_UPDATED, permissionsUpdated,
loadPermissions,
PERMISSIONS_LIST_LOADING, PERMISSIONS_LIST_LOADED,
ATTRIBUTE_UPDATED, attributeUpdated,
SAVE_MAP, saveMap,
DISPLAY_METADATA_EDIT, onDisplayMetadataEdit,
RESET_UPDATING, resetUpdating,
THUMBNAIL_ERROR, thumbnailError,
TOGGLE_DETAILS_EDITABILITY, toggleDetailsEditability,
MAPS_SEARCH_TEXT_CHANGED, mapsSearchTextChanged,
MAPS_LIST_LOAD_ERROR, loadError,
MAP_ERROR, mapError, updatePermissions,
MAP_METADATA_UPDATED, mapMetadataUpdated,
MAP_ERROR, mapError,
METADATA_CHANGED, metadataChanged,
setShowMapDetails, SHOW_DETAILS,
updateAttribute, saveAll,
SAVE_MAP_RESOURCE, saveMapResource,
FEATURED_MAPS_SET_LATEST_RESOURCE, setFeaturedMapsLatestResource,
updateMapMetadata, RESET_CURRENT_MAP
updateAttribute,
SAVE_MAP_RESOURCE, saveMapResource
} = require('../maps');

const { SHOW_NOTIFICATION } = require('../notifications');

let GeoStoreDAO = require('../../api/GeoStoreDAO');
let oldAddBaseUri = GeoStoreDAO.addBaseUrl;

Expand Down Expand Up @@ -110,93 +91,6 @@ describe('Test correctness of the maps actions', () => {
}
});
});
it('saveAll - with metadataMap, without thumbnail', (done) => {
const resourceId = 1;
// saveAll(map, metadataMap, nameThumbnail, dataThumbnail, categoryThumbnail, resourceIdMap, options)
const retFun = saveAll({}, {name: "name"}, null, null, null, resourceId, {});
expect(retFun).toExist();
let count = 0;
retFun((action) => {
switch (count) {
case 0: expect(action.type).toBe(MAP_UPDATING); break;
case 1: expect(action.type).toBe("NONE"); break;
default: done();
}
count++;
}, () => {});
});
it('saveAll - without metadataMap, without thumbnail', (done) => {
const resourceId = 1;
// saveAll(map, metadataMap, nameThumbnail, dataThumbnail, categoryThumbnail, resourceIdMap, options)
const retFun = saveAll({}, null, null, null, null, resourceId, {});
expect(retFun).toExist();
let count = 0;
retFun((action) => {
switch (count) {
case 0: expect(action.type).toBe(MAP_UPDATING); break;
case 1: expect(action.type).toBe("NONE"); break;
default: done();
}
count++;
}, () => {});
});
it('saveAll - without metadataMap, without thumbnail, detailsChanged', (done) => {
const resourceId = 1;
// saveAll(map, metadataMap, nameThumbnail, dataThumbnail, categoryThumbnail, resourceIdMap, options)
const retFun = saveAll({}, null, null, null, null, resourceId, {});
expect(retFun).toExist();
let count = 0;
retFun((action) => {
switch (count) {
case 0: expect(action.type).toBe(MAP_UPDATING); break;
case 1: expect(action.type).toBe("NONE"); break;
case 2: expect(action.type).toBe(SAVE_RESOURCE_DETAILS); done(); break;
default: done();
}
count++;
}, () => ({currentMap: {
detailsChanged: true
}}
));
});
it('updatePermissions with securityRules list & without', (done) => {
const securityRules = {
SecurityRuleList: {
RuleCount: 1,
SecurityRule: [{
canRead: true,
canWrite: true,
user: {
id: 1
}
}]
}
};
const resourceId = 1;
const retFun = updatePermissions(resourceId, securityRules);
expect(retFun).toExist();
let count = 0;
retFun((action) => {
switch (count) {
// TODO: this should return PERMISSIONS_UPDATED
case 0: expect(action.type).toBe(PERMISSIONS_UPDATED); break;
default: done();
}
count++;
done();
});
const retFun2 = updatePermissions(-1, securityRules);
expect(retFun).toExist();
let count2 = 0;
retFun2((action) => {
switch (count2) {
case 0: expect(action.type).toBe(THUMBNAIL_ERROR); break;
default: done();
}
count2++;
done();
});
});
it('mapUpdating', () => {
let resourceId = 13;
var retval = mapUpdating(resourceId);
Expand All @@ -205,14 +99,6 @@ describe('Test correctness of the maps actions', () => {
expect(retval.resourceId).toBe(resourceId);
});

it('permissionsUpdated', () => {
let resourceId = 13;
var retval = permissionsUpdated(resourceId, null);
expect(retval).toExist();
expect(retval.type).toBe(PERMISSIONS_UPDATED);
expect(retval.resourceId).toBe(resourceId);
});

it('attributeUpdated', () => {
let resourceId = 13;
let name = "thumbnail";
Expand All @@ -236,14 +122,6 @@ describe('Test correctness of the maps actions', () => {
expect(retval.error.status).toBe(error.status);
});

it('resetUpdating', () => {
let resourceId = 1;
let retval = resetUpdating(resourceId);
expect(retval).toExist();
expect(retval.type).toBe(RESET_UPDATING);
expect(retval.resourceId).toBe(resourceId);
});

it('onDisplayMetadataEdit', () => {
let dispMetadataValue = true;
let retval = onDisplayMetadataEdit(dispMetadataValue);
Expand All @@ -252,21 +130,6 @@ describe('Test correctness of the maps actions', () => {
expect(retval.displayMetadataEditValue).toBe(dispMetadataValue);
});

it('saveMap', () => {
let thumbnail = "myThumnbnailUrl";
let resourceId = 13;
let map = {
thumbnail: thumbnail,
id: 123,
canWrite: true
};
var retval = saveMap(map, resourceId);
expect(retval).toExist();
expect(retval.type).toBe(SAVE_MAP);
expect(retval.resourceId).toBe(resourceId);
expect(retval.map).toBe(map);
});

it('mapsSearchTextChanged', () => {
const a = mapsSearchTextChanged("TEXT");
expect(a.type).toBe(MAPS_SEARCH_TEXT_CHANGED);
Expand All @@ -288,15 +151,6 @@ describe('Test correctness of the maps actions', () => {
expect(a.error).toBe(error);
expect(a.resourceId).toBe(resourceId);
});
it('mapMetadataUpdated', () => {
const a = mapMetadataUpdated("resourceId", "newName", "newDescription", "result", "error");
expect(a.type).toBe(MAP_METADATA_UPDATED);
expect(a.resourceId).toBe("resourceId");
expect(a.newName).toBe("newName");
expect(a.newDescription).toBe("newDescription");
expect(a.result).toBe("result");
expect(a.error).toBe("error");
});
it('mapMetadatachanged', () => {
const prop = "name";
const value = "newName";
Expand All @@ -308,38 +162,13 @@ describe('Test correctness of the maps actions', () => {
expect(a.value).toBe(value);
});

it('toggleDetailsSheet', () => {
const detailsSheetReadOnly = true;
const a = toggleDetailsSheet(detailsSheetReadOnly);
expect(a.type).toBe(TOGGLE_DETAILS_SHEET);
expect(a.detailsSheetReadOnly).toBeTruthy();

});
it('setShowMapDetails', () => {
const showMapDetails = true;
const action = setShowMapDetails(showMapDetails);
expect(action.type).toBe(SHOW_DETAILS);
expect(action.showMapDetails).toBe(showMapDetails);

});
it('toggleGroupProperties', () => {
const a = toggleGroupProperties();
expect(a.type).toBe(TOGGLE_GROUP_PROPERTIES);
});
it('toggleUnsavedChanges', () => {
const a = toggleUnsavedChanges();
expect(a.type).toBe(TOGGLE_UNSAVED_CHANGES);
});
it('updateDetails', () => {
const detailsText = "<p>some value</p>";
const originalDetails = "<p>old value</p>";
const doBackup = true;
const a = updateDetails(detailsText, doBackup, originalDetails);
expect(a.doBackup).toBeTruthy();
expect(a.detailsText).toBe(detailsText);
expect(a.originalDetails).toBe(originalDetails);
expect(a.type).toBe(UPDATE_DETAILS);
});
it('deleteMap', () => {
const resourceId = 1;
const someOpt = {
Expand All @@ -353,32 +182,6 @@ describe('Test correctness of the maps actions', () => {
expect(a.type).toBe(DELETE_MAP);
expect(a.options).toBe(options);
});
it('saveDetails', () => {
const detailsText = "<p>some detailsText</p>";
const a = saveDetails(detailsText);
expect(a.type).toBe(SAVE_DETAILS);
expect(a.detailsText).toBe(detailsText);
});
it('deleteDetails', () => {
const a = deleteDetails();
expect(a.type).toBe(DELETE_DETAILS);
});
it('setDetailsChanged', () => {
const detailsChanged = true;
const a = setDetailsChanged(detailsChanged);
expect(a.type).toBe(SET_DETAILS_CHANGED);
expect(a.detailsChanged).toBe(detailsChanged);
});
it('backDetails', () => {
const backupDetails = true;
const a = backDetails(backupDetails);
expect(a.type).toBe(BACK_DETAILS);
expect(a.backupDetails).toBe(backupDetails);
});
it('undoDetails', () => {
const a = undoDetails();
expect(a.type).toBe(UNDO_DETAILS);
});
it('setUnsavedChanged', () => {
const value = true;
const a = setUnsavedChanged(value);
Expand Down Expand Up @@ -415,46 +218,5 @@ describe('Test correctness of the maps actions', () => {
expect(a.type).toBe(SAVE_MAP_RESOURCE);
expect(a.resource).toBe(resource);
});
it('updateMapMetadata', (done) => {
mockAxios.onPut().reply(200);
let actions = [];
const dispatch = a => {
actions.push(a);
// when finished, check and done
if (a.type === RESET_CURRENT_MAP) {
expect(actions[0].type).toBe(MAP_METADATA_UPDATED);
expect(actions[1].type).toBe(SHOW_NOTIFICATION);
done();

}
};
updateMapMetadata(2, "test", "desc", () => {}, {})(dispatch);
});
it('setFeaturedMapsLatestResource', () => {
const resource = {
id: 1
};
const a = setFeaturedMapsLatestResource(resource);
expect(a.type).toBe(FEATURED_MAPS_SET_LATEST_RESOURCE);
expect(a.resource).toBe(resource);
});
it('loadPermissions error', done => {
const NOT_EXISTING = "UNKNOWN_RESOURCE";
loadPermissions(NOT_EXISTING)(action => {
switch (action.type) {
case PERMISSIONS_LIST_LOADED:
expect(action.permissions).toBe(null);
expect(action.mapId).toBe(NOT_EXISTING);
done();
break;
case PERMISSIONS_LIST_LOADING:
expect(action.mapId).toBe(NOT_EXISTING);
break;
default:
done(`${action.type} action triggered, not expected`);
break;
}
});
});

});
2 changes: 1 addition & 1 deletion web/client/actions/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function loadMapInfo(mapId) {

const mapSaveError = error => ({type: MAP_SAVE_ERROR, error});

const mapSaved = () => ({type: MAP_SAVED});
const mapSaved = (resourceId) => ({type: MAP_SAVED, resourceId});

module.exports = {
LOAD_NEW_MAP,
Expand Down
Loading