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.

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

Redesign change user experience modal #3077

Merged
merged 72 commits into from
Sep 13, 2018
Merged
Show file tree
Hide file tree
Changes from 62 commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
03cd1e1
created copy of current experience changing modal; still needs to be …
MichaelBuessemeyer Aug 14, 2018
8b07f8f
changed modal's title
MichaelBuessemeyer Aug 14, 2018
64425fa
just started editing the layout
MichaelBuessemeyer Aug 14, 2018
692c036
added modal used only to modify the experience of a single user
MichaelBuessemeyer Aug 16, 2018
c337aaf
removed custom input component
MichaelBuessemeyer Aug 17, 2018
f12fc45
fixed rerender/update issues; added update method; moved main style i…
MichaelBuessemeyer Aug 17, 2018
50a801a
added new less sheet used by experience changing modals
MichaelBuessemeyer Aug 17, 2018
d631856
resolved merge conflicts; moved more style related stuff into the les…
MichaelBuessemeyer Aug 18, 2018
c3d927b
added compontent to select a experience domain
MichaelBuessemeyer Aug 18, 2018
cc5ab71
fixed linter setStatus errors; added entering new experiences functio…
MichaelBuessemeyer Aug 18, 2018
d30e85a
moved onClick methods out of the render method
MichaelBuessemeyer Aug 18, 2018
18f9a33
now a domain cant be entered more than once; the input for new domain…
MichaelBuessemeyer Aug 18, 2018
83aa11f
fixed flow errors; removed pagination and made table scrollable
MichaelBuessemeyer Aug 18, 2018
7ab66db
added check to not enter a domain with less than 3 chars; entries are…
MichaelBuessemeyer Aug 18, 2018
b5e3ebb
Added a new modal to modify experiences of multiple users; update fun…
MichaelBuessemeyer Aug 19, 2018
f2a283f
at reopening the entered changes will be cleared
MichaelBuessemeyer Aug 19, 2018
fa7702e
select_experience_domain now adapts to changes of alreadyUsedDomains;
MichaelBuessemeyer Aug 20, 2018
0eccdba
fixed flow errors
MichaelBuessemeyer Aug 20, 2018
350d9f1
completely replaced the old experience_modal_view
MichaelBuessemeyer Aug 20, 2018
243ca21
updated snapshots
MichaelBuessemeyer Aug 20, 2018
eb82add
added message displayed when selecting a not shared domain while edit…
MichaelBuessemeyer Aug 20, 2018
999d9c3
removed manually puls and minus buttons
MichaelBuessemeyer Aug 20, 2018
88a91b8
made the table in which the changes are entered a stateless functiona…
MichaelBuessemeyer Aug 20, 2018
f73a3e6
reworked update functionallity of multiple users modal
MichaelBuessemeyer Aug 20, 2018
46fff64
after updating the user_list_view does not fetch again, instead it us…
MichaelBuessemeyer Aug 20, 2018
09f1cd8
added renamed files
MichaelBuessemeyer Aug 20, 2018
a18f478
now using localeCompare to sort and case-insensitiv sort; removed scr…
MichaelBuessemeyer Aug 21, 2018
ee3c699
fixed flow errors
MichaelBuessemeyer Aug 21, 2018
ec25d9b
clicking on the experiences of a single user in the table also opens …
MichaelBuessemeyer Aug 21, 2018
7ef1622
updated snapshots
MichaelBuessemeyer Aug 21, 2018
d9353a9
changed height of tables in the modals
MichaelBuessemeyer Aug 22, 2018
7a803f0
Merge branch 'master' into redesign-change-user-experience-modal
MichaelBuessemeyer Aug 22, 2018
79179a8
updated changelog
MichaelBuessemeyer Aug 22, 2018
3242a78
added nl in changelog
MichaelBuessemeyer Aug 22, 2018
83e42f1
merged single_user_modal and experience_modal into the experience_modal
MichaelBuessemeyer Aug 24, 2018
615b48d
deleted single_user_modal
MichaelBuessemeyer Aug 24, 2018
636e30f
fixed flow errors
MichaelBuessemeyer Aug 24, 2018
7f0d5e7
tweak some styles, indicate icon clickability, hide scrollbars if the…
daniel-wer Sep 3, 2018
825e500
moved ExperienceEditingTable into ExperienceModal
MichaelBuessemeyer Sep 6, 2018
9df292a
integrated the ExperienceEditingTable -> still got errors
MichaelBuessemeyer Sep 6, 2018
559ffca
small fixes, sending users works, adding does not
MichaelBuessemeyer Sep 6, 2018
94cd9af
renaming of state variables and fixed adding error when one users is …
MichaelBuessemeyer Sep 6, 2018
3dd3258
modal now works for mulitples selected users
MichaelBuessemeyer Sep 6, 2018
de3f10f
deleted ExperienceEditingTable
MichaelBuessemeyer Sep 6, 2018
e1d404a
fixed flow errors
MichaelBuessemeyer Sep 7, 2018
aa52b25
merged master into this branch; removed unused less/css rules
MichaelBuessemeyer Sep 7, 2018
5dc0bef
fixed lint errors
MichaelBuessemeyer Sep 7, 2018
03a20ba
fixed visual errors
MichaelBuessemeyer Sep 7, 2018
922d828
fixed visual bug
MichaelBuessemeyer Sep 7, 2018
7057b9d
auto changes in yarn.lock made by server
MichaelBuessemeyer Sep 7, 2018
18830ed
updated snapshots
MichaelBuessemeyer Sep 7, 2018
b522cc1
selecting 'only shared' changes just the shared entries
MichaelBuessemeyer Sep 9, 2018
100d1bc
fixed flow error
MichaelBuessemeyer Sep 9, 2018
b9ce590
refactored + requested changes; now saves deleted domains to really d…
MichaelBuessemeyer Sep 10, 2018
346090d
fixed typo
MichaelBuessemeyer Sep 10, 2018
252c8a8
sorting domains before sending to backend
MichaelBuessemeyer Sep 10, 2018
b47a55b
fixed revert changes issue
MichaelBuessemeyer Sep 10, 2018
6b5102c
fixed flow error
MichaelBuessemeyer Sep 10, 2018
05e9ec7
enabled 0 as possible exp value; added row to display if domain is sh…
MichaelBuessemeyer Sep 11, 2018
055366b
made sort before sending changes case-insensitive
MichaelBuessemeyer Sep 11, 2018
1280245
renaming
MichaelBuessemeyer Sep 11, 2018
e6778ee
merged master; resolved conflicts
MichaelBuessemeyer Sep 11, 2018
1899606
slight refectoring
MichaelBuessemeyer Sep 12, 2018
6534fdf
added comments for clarification
MichaelBuessemeyer Sep 12, 2018
2e69c4a
reworked comments and simplified expression
MichaelBuessemeyer Sep 12, 2018
ed31988
replaced isShared with a number that represents the number of users t…
MichaelBuessemeyer Sep 12, 2018
8d53032
column renaming and width adjustment
MichaelBuessemeyer Sep 12, 2018
bcaf8de
removed option to only show shared domains and resolved a bug by doin…
MichaelBuessemeyer Sep 12, 2018
c041f30
resolved flow and linter errors
MichaelBuessemeyer Sep 12, 2018
8c873af
rename shared column to user-count and render counts as colorful tags…
philippotto Sep 13, 2018
0e7917d
fix typo
philippotto Sep 13, 2018
29f20e2
mergede master into this branch and resolved conflicts
MichaelBuessemeyer Sep 13, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).

### Changed

- The modal used to change the experience of users by admins got a rework. [#3077](https://github.com/scalableminds/webknossos/pull/3077)
- The fallback segmentation layer attribute of volume tracings is now persisted to NML/ZIP files. Upon re-upload, only volume tracings with this attribute will show a fallback layer. Use `tools/volumeAddFallbackLayer.py` to add this attribute to existing volume tracings. [#3088](https://github.com/scalableminds/webknossos/pull/3088)
- When splitting a tree, the split part that contains the initial node will now keep the original tree name and id. [#3145](https://github.com/scalableminds/webknossos/pull/3145)
- The welcome header will now also show on the default page if there are no existing organisations. [#3133](https://github.com/scalableminds/webknossos/pull/3133)
Expand Down
6 changes: 6 additions & 0 deletions app/assets/javascripts/admin/admin_rest_api.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import type {
ServerSkeletonTracingType,
ServerVolumeTracingType,
APIAnnotationTypeCompact,
ExperienceDomainListType,
} from "admin/api_flow_types";
import { APITracingTypeEnum } from "admin/api_flow_types";
import type { QueryObjectType } from "admin/task/task_search_form";
Expand Down Expand Up @@ -814,3 +815,8 @@ export function getFeatureToggles(): Promise<APIFeatureToggles> {
export function getOperatorData(): Promise<string> {
return Request.receiveJSON("/api/operatorData");
}

// ## Experience Domains
export function getExistingExperienceDomains(): Promise<ExperienceDomainListType> {
return Request.receiveJSON("/api/tasks/experienceDomains");
}
2 changes: 2 additions & 0 deletions app/assets/javascripts/admin/api_flow_types.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ export type APITeamMembershipType = {

export type ExperienceMapType = { +[string]: number };

export type ExperienceDomainListType = Array<string>;

export type APIUserBaseType = {
+email: string,
+firstName: string,
Expand Down