Count last phase always as end phase #187
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gkalomalos
approved these changes
Jul 25, 2023
Alexa-Laf
added a commit
that referenced
this pull request
Jul 31, 2023
* UI changes (#182) * Updated breadcrumbs My Initiatives to Initiatives link to inventory list (#183) * Bugfix/130138/admin export users fails (#184) * added background export action for auth users table * patching the export_resource_classes to the User model * added comment * chore/Remove unnecessary commands from startup_actions * chore/Silence opentelemetry logs in dev * chore/Remove unnecessary log statements * Feature/160750/make end phases config (#186) * add_checkbox_end_phase_update_current_stage * dynamically get end phases and hide them in phases board * remove cache structire --------- Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> * Count last phase always as end phase (#187) * Bugfix/increase dev test coverage (#190) * feat/Add new attribute completion_marks_an_initiative_as_inactive to test files * chore/Add custom migration files * chore/Add print statements to add_taxonomies * chore/Refactor code - Move add_taxonomies functionality to a new migration file - Revert add taxonomies to the previous state * fix/Minor fix to add_taxonomies.py - Add check to return first if it finds more than one * increase coverage version 2 * remove return from def fill_named_model -initial form --------- Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com> * Revert "Count last phase always as end phase" This reverts commit 9d7e5a4. * Revert "dynamically get end phases and hide them in phases board" This reverts commit d5671db. * remove tests for discontinued and remove duplicate class (#193) --------- Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> Co-authored-by: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com> Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com>
gkalomalos
deleted the
feature/166273/count-last-phase-always-as-end-phase
branch
ladeniva2
added a commit
that referenced
this pull request
Aug 7, 2023
* UI changes (#182) * Updated breadcrumbs My Initiatives to Initiatives link to inventory list (#183) * Bugfix/130138/admin export users fails (#184) * added background export action for auth users table * patching the export_resource_classes to the User model * added comment * chore/Remove unnecessary commands from startup_actions * chore/Silence opentelemetry logs in dev * chore/Remove unnecessary log statements * Feature/160750/make end phases config (#186) * add_checkbox_end_phase_update_current_stage * dynamically get end phases and hide them in phases board * remove cache structire --------- Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> * Count last phase always as end phase (#187) * Bugfix/increase dev test coverage (#190) * feat/Add new attribute completion_marks_an_initiative_as_inactive to test files * chore/Add custom migration files * chore/Add print statements to add_taxonomies * chore/Refactor code - Move add_taxonomies functionality to a new migration file - Revert add taxonomies to the previous state * fix/Minor fix to add_taxonomies.py - Add check to return first if it finds more than one * increase coverage version 2 * remove return from def fill_named_model -initial form --------- Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com> * Revert "Count last phase always as end phase" This reverts commit 9d7e5a4. * Revert "dynamically get end phases and hide them in phases board" This reverts commit d5671db. * remove tests for discontinued and remove duplicate class (#193) * added link to country in initiatives published view * updated data test id, added link to inventory countries column * hide initiatives that have completed an end phase (#196) * Feature/168436/add links from country to co pages (#195) * added link to country in initiatives published view * updated data test id, added link to inventory countries column * remove last phase, hide some comments * remove last phase, hide some comments (#197) * updated column count when sectors filtered --------- Co-authored-by: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com> Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com> Co-authored-by: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com>
ladeniva2
added a commit
that referenced
this pull request
Aug 10, 2023
* Revert adding azure-monitor-opentelemetry==1.0.0b13 to resolve No module named azure.monitor issue * updated empty value type (#141) * Feature/160752/stages phases (#142) * add new column - feature key phases_stages * create a mapping between phases and stages * updated styles to work on all browsers (#143) * feat/Add azure-monitor-opentelemetry to requirements * feat/Add configure_azure_monitor to settings.py * chore/Remove configure_azure_monitor and implement older approach to identify compatibility * chore/Remove opentelemetry from settings.py * chore/Code cleanup * Dev 157615 160826 162116 163295 163762 164563 (#144) * Adding env.var applicationsightsConnectionSrting for BE * Feature/163742/enable ootb monitoring capabilities (#135) * feat/Add azure-monitor-opentelemetry to requirements * feat/Add opentelemetry to application settings * chore/Change env from dev to tst * chore/Rollback env from tst to dev * Feature/157615/allow retrieval of all initiatives published and unpublished from api revision (#136) * feat/Add published query parameter to the get_queryset - if we do not provide an additional query parameter, then the default behavior will remain the same and the endpoint will return only the published ones. - If we provide the additional query parameter published=0, then the endpoint will return only the unpublished ones. - If we provide the additional query parameter published=1, then the endpoint will return both the unpublished and published ones. * feat/Change published-unpublished to match new criteria - Change get_queryset method to its original status, but removing the unpublished. - Add logic to support published/unpublished parameters. * chore/Refactor publised-unpublished cases in a more pythonic way * Feature/163295/add swimlanes at phase board (#137) * table with new story features * code refactoring * removed overflow-x from el-select-tags (#138) * hide square logo and change menu height (#139) * Feature/160826/group innovation portfolio solution details section (#140) * solutions edit/create new Innovation Portfolios group, portfolios table key bug fix * updated solution view with new Innovation portfolios card section * Revert adding azure-monitor-opentelemetry==1.0.0b13 to resolve No module named azure.monitor issue * updated empty value type (#141) * Feature/160752/stages phases (#142) * add new column - feature key phases_stages * create a mapping between phases and stages * updated styles to work on all browsers (#143) * feat/Add azure-monitor-opentelemetry to requirements * feat/Add configure_azure_monitor to settings.py * chore/Remove configure_azure_monitor and implement older approach to identify compatibility * chore/Remove opentelemetry from settings.py * chore/Code cleanup * chore/Rollback phases stages - Rollback dbd9139 add new column - feature key phases_stages - Rollback d665c3f create a mapping between phases and stages Remove additions for item 160752 to move selected items to tst environment --------- Co-authored-by: Diogenis Petropoulos <diogenis,petropoulos@sword-group.com> Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> Co-authored-by: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com> * Feature/163742/enable ootb monitoring capabilities (#146) * feat/Add azure-monitor-opentelemetry to requirements * feat/Add opentelemetry to application settings * chore/Change env from dev to tst * chore/Rollback env from tst to dev * feat/Add internal_ips to fetch the pod internal ip * chore/Rename azure folder to azure_services * chore/Remove reduntant import from settings * chore/Change configure_azure_monitor signature to include named argument * feat/Change userprofile list to autocomplete field (#145) - Add list with autocomplete search bar in the edit technology platform admin page. - Add name as the search bar option. * rename stage_name and phase_name to stage_label and phase_label (#147) * feature/161336/initiatives-by-stage-board added stage table and table switch (#148) * feat/Switch nextLink to deltaLink mechanism * feat/Add get and save last delta link mechanism * chore/Refactor delta link generation and store method - Add new DeltaLink model to let Django handle the table creation/update mechanism. - Change get_last_delta_link and save_delta_link to follow the same pattern. * Feature/refactor aad user fetch and update mechanism (#149) * feat/Switch nextLink to deltaLink mechanism * feat/Add get and save last delta link mechanism * chore/Refactor delta link generation and store method - Add new DeltaLink model to let Django handle the table creation/update mechanism. - Change get_last_delta_link and save_delta_link to follow the same pattern. * chore/Add migration file for deltalink * chore/Add log statements to debug deltalink response * chore/Remove redundant log statements * chore/Refactor deltalinks and logger - Refactor delta links to accept more than one page. - Change azure logger from info to warning level to unclutter the django logs * Revert commits 2ed8b75 to 46a5dcf * Bugfix/163402/dashboarding system error (#150) * problem_statements and portfolios are now lists containing only unique ids * created a django management command to update the problematic solution logs (may and june 2023) * fixed error in comment * custom management command will now be run on deployment * updated to fix problematic entries in all solution log rows * Merge dev to tst (#152) * Adding env.var applicationsightsConnectionSrting for BE * Feature/163742/enable ootb monitoring capabilities (#135) * feat/Add azure-monitor-opentelemetry to requirements * feat/Add opentelemetry to application settings * chore/Change env from dev to tst * chore/Rollback env from tst to dev * Feature/157615/allow retrieval of all initiatives published and unpublished from api revision (#136) * feat/Add published query parameter to the get_queryset - if we do not provide an additional query parameter, then the default behavior will remain the same and the endpoint will return only the published ones. - If we provide the additional query parameter published=0, then the endpoint will return only the unpublished ones. - If we provide the additional query parameter published=1, then the endpoint will return both the unpublished and published ones. * feat/Change published-unpublished to match new criteria - Change get_queryset method to its original status, but removing the unpublished. - Add logic to support published/unpublished parameters. * chore/Refactor publised-unpublished cases in a more pythonic way * Feature/163295/add swimlanes at phase board (#137) * table with new story features * code refactoring * removed overflow-x from el-select-tags (#138) * hide square logo and change menu height (#139) * Feature/160826/group innovation portfolio solution details section (#140) * solutions edit/create new Innovation Portfolios group, portfolios table key bug fix * updated solution view with new Innovation portfolios card section * Revert adding azure-monitor-opentelemetry==1.0.0b13 to resolve No module named azure.monitor issue * updated empty value type (#141) * Feature/160752/stages phases (#142) * add new column - feature key phases_stages * create a mapping between phases and stages * updated styles to work on all browsers (#143) * feat/Add azure-monitor-opentelemetry to requirements * feat/Add configure_azure_monitor to settings.py * chore/Remove configure_azure_monitor and implement older approach to identify compatibility * chore/Remove opentelemetry from settings.py * chore/Code cleanup * Feature/163742/enable ootb monitoring capabilities (#146) * feat/Add azure-monitor-opentelemetry to requirements * feat/Add opentelemetry to application settings * chore/Change env from dev to tst * chore/Rollback env from tst to dev * feat/Add internal_ips to fetch the pod internal ip * chore/Rename azure folder to azure_services * chore/Remove reduntant import from settings * chore/Change configure_azure_monitor signature to include named argument * feat/Change userprofile list to autocomplete field (#145) - Add list with autocomplete search bar in the edit technology platform admin page. - Add name as the search bar option. * rename stage_name and phase_name to stage_label and phase_label (#147) * feature/161336/initiatives-by-stage-board added stage table and table switch (#148) * feat/Switch nextLink to deltaLink mechanism * feat/Add get and save last delta link mechanism * chore/Refactor delta link generation and store method - Add new DeltaLink model to let Django handle the table creation/update mechanism. - Change get_last_delta_link and save_delta_link to follow the same pattern. * Feature/refactor aad user fetch and update mechanism (#149) * feat/Switch nextLink to deltaLink mechanism * feat/Add get and save last delta link mechanism * chore/Refactor delta link generation and store method - Add new DeltaLink model to let Django handle the table creation/update mechanism. - Change get_last_delta_link and save_delta_link to follow the same pattern. * chore/Add migration file for deltalink * chore/Add log statements to debug deltalink response * chore/Remove redundant log statements * chore/Refactor deltalinks and logger - Refactor delta links to accept more than one page. - Change azure logger from info to warning level to unclutter the django logs * Revert commits 2ed8b75 to 46a5dcf --------- Co-authored-by: Diogenis Petropoulos <diogenis,petropoulos@sword-group.com> Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> Co-authored-by: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com> * feat/Add delta to graph url * chore/Remove redundant logging statements * Rollback to pre-deltaLink mechanism * chore/Remove redundant files * Merge dev to tst (#154) * Adding env.var applicationsightsConnectionSrting for BE * Feature/163742/enable ootb monitoring capabilities (#135) * feat/Add azure-monitor-opentelemetry to requirements * feat/Add opentelemetry to application settings * chore/Change env from dev to tst * chore/Rollback env from tst to dev * Feature/157615/allow retrieval of all initiatives published and unpublished from api revision (#136) * feat/Add published query parameter to the get_queryset - if we do not provide an additional query parameter, then the default behavior will remain the same and the endpoint will return only the published ones. - If we provide the additional query parameter published=0, then the endpoint will return only the unpublished ones. - If we provide the additional query parameter published=1, then the endpoint will return both the unpublished and published ones. * feat/Change published-unpublished to match new criteria - Change get_queryset method to its original status, but removing the unpublished. - Add logic to support published/unpublished parameters. * chore/Refactor publised-unpublished cases in a more pythonic way * Feature/163295/add swimlanes at phase board (#137) * table with new story features * code refactoring * removed overflow-x from el-select-tags (#138) * hide square logo and change menu height (#139) * Feature/160826/group innovation portfolio solution details section (#140) * solutions edit/create new Innovation Portfolios group, portfolios table key bug fix * updated solution view with new Innovation portfolios card section * Revert adding azure-monitor-opentelemetry==1.0.0b13 to resolve No module named azure.monitor issue * updated empty value type (#141) * Feature/160752/stages phases (#142) * add new column - feature key phases_stages * create a mapping between phases and stages * updated styles to work on all browsers (#143) * feat/Add azure-monitor-opentelemetry to requirements * feat/Add configure_azure_monitor to settings.py * chore/Remove configure_azure_monitor and implement older approach to identify compatibility * chore/Remove opentelemetry from settings.py * chore/Code cleanup * Feature/163742/enable ootb monitoring capabilities (#146) * feat/Add azure-monitor-opentelemetry to requirements * feat/Add opentelemetry to application settings * chore/Change env from dev to tst * chore/Rollback env from tst to dev * feat/Add internal_ips to fetch the pod internal ip * chore/Rename azure folder to azure_services * chore/Remove reduntant import from settings * chore/Change configure_azure_monitor signature to include named argument * feat/Change userprofile list to autocomplete field (#145) - Add list with autocomplete search bar in the edit technology platform admin page. - Add name as the search bar option. * rename stage_name and phase_name to stage_label and phase_label (#147) * feature/161336/initiatives-by-stage-board added stage table and table switch (#148) * feat/Switch nextLink to deltaLink mechanism * feat/Add get and save last delta link mechanism * chore/Refactor delta link generation and store method - Add new DeltaLink model to let Django handle the table creation/update mechanism. - Change get_last_delta_link and save_delta_link to follow the same pattern. * Feature/refactor aad user fetch and update mechanism (#149) * feat/Switch nextLink to deltaLink mechanism * feat/Add get and save last delta link mechanism * chore/Refactor delta link generation and store method - Add new DeltaLink model to let Django handle the table creation/update mechanism. - Change get_last_delta_link and save_delta_link to follow the same pattern. * chore/Add migration file for deltalink * chore/Add log statements to debug deltalink response * chore/Remove redundant log statements * chore/Refactor deltalinks and logger - Refactor delta links to accept more than one page. - Change azure logger from info to warning level to unclutter the django logs * Revert commits 2ed8b75 to 46a5dcf * Bugfix/163402/dashboarding system error (#150) * problem_statements and portfolios are now lists containing only unique ids * created a django management command to update the problematic solution logs (may and june 2023) * fixed error in comment * custom management command will now be run on deployment * updated to fix problematic entries in all solution log rows * feat/Add delta to graph url * chore/Remove redundant logging statements * Rollback to pre-deltaLink mechanism * chore/Remove redundant files --------- Co-authored-by: Diogenis Petropoulos <diogenis,petropoulos@sword-group.com> Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> Co-authored-by: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com> Co-authored-by: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com> * Performance optimization (#156) * load users optimization * performance improvements for inventory list page * inventory load fix * performance improvement by reordering api calls and asyncronicity * removed sentry lib, removed unused unicef logo * update node 12 to 14 in containers and fron 10 to 14 as compilation in babel * lazy loading images --------- Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> * Merge dev to tst (#157) * Revert adding azure-monitor-opentelemetry==1.0.0b13 to resolve No module named azure.monitor issue * updated empty value type (#141) * Feature/160752/stages phases (#142) * add new column - feature key phases_stages * create a mapping between phases and stages * updated styles to work on all browsers (#143) * feat/Add azure-monitor-opentelemetry to requirements * feat/Add configure_azure_monitor to settings.py * chore/Remove configure_azure_monitor and implement older approach to identify compatibility * chore/Remove opentelemetry from settings.py * chore/Code cleanup * Feature/163742/enable ootb monitoring capabilities (#146) * feat/Add azure-monitor-opentelemetry to requirements * feat/Add opentelemetry to application settings * chore/Change env from dev to tst * chore/Rollback env from tst to dev * feat/Add internal_ips to fetch the pod internal ip * chore/Rename azure folder to azure_services * chore/Remove reduntant import from settings * chore/Change configure_azure_monitor signature to include named argument * feat/Change userprofile list to autocomplete field (#145) - Add list with autocomplete search bar in the edit technology platform admin page. - Add name as the search bar option. * rename stage_name and phase_name to stage_label and phase_label (#147) * feature/161336/initiatives-by-stage-board added stage table and table switch (#148) * feat/Switch nextLink to deltaLink mechanism * feat/Add get and save last delta link mechanism * chore/Refactor delta link generation and store method - Add new DeltaLink model to let Django handle the table creation/update mechanism. - Change get_last_delta_link and save_delta_link to follow the same pattern. * Feature/refactor aad user fetch and update mechanism (#149) * feat/Switch nextLink to deltaLink mechanism * feat/Add get and save last delta link mechanism * chore/Refactor delta link generation and store method - Add new DeltaLink model to let Django handle the table creation/update mechanism. - Change get_last_delta_link and save_delta_link to follow the same pattern. * chore/Add migration file for deltalink * chore/Add log statements to debug deltalink response * chore/Remove redundant log statements * chore/Refactor deltalinks and logger - Refactor delta links to accept more than one page. - Change azure logger from info to warning level to unclutter the django logs * Revert commits 2ed8b75 to 46a5dcf * Bugfix/163402/dashboarding system error (#150) * problem_statements and portfolios are now lists containing only unique ids * created a django management command to update the problematic solution logs (may and june 2023) * fixed error in comment * custom management command will now be run on deployment * updated to fix problematic entries in all solution log rows * feat/Add delta to graph url * chore/Remove redundant logging statements * Rollback to pre-deltaLink mechanism * chore/Remove redundant files * Performance optimization (#156) * load users optimization * performance improvements for inventory list page * inventory load fix * performance improvement by reordering api calls and asyncronicity * removed sentry lib, removed unused unicef logo * update node 12 to 14 in containers and fron 10 to 14 as compilation in babel * lazy loading images --------- Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> --------- Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> Co-authored-by: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com> Co-authored-by: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com> * add autocomplete field managers (#159) * add autocomplete field managers (#159) (#160) * chore/Remove DeltaLink model * Merge dev to tst (#163) * add autocomplete field managers (#159) * chore/Remove DeltaLink model --------- Co-authored-by: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com> * Added country inventory link button on homepage (#164) * added height select switch, made table height expandable (#165) * add job title and section to export files (#162) * Bugfix/163755/country link inventory (#166) * added dynamic country id to link, added data-test id * removed 's country ending as it may be not appropriate for some countries * Feature/165200/select sectors appear phase stage board (#167) * added selection dropdown for sectors * dropdown count fix * replace section name to department (#168) * link changed from button to link (#169) * changed project data fallback for projectBar and breadcrumps (#170) * id correction (#171) * users list timing loading fix and data refresh for initiatives (#172) * users list timing loading fix and data refresh for initiatives * added data reset on loadProject if no data exist * updated button ui and added text to link (#177) * Merge dev to tst (#179) * add autocomplete field managers (#159) * chore/Remove DeltaLink model * Added country inventory link button on homepage (#164) * added height select switch, made table height expandable (#165) * add job title and section to export files (#162) * Bugfix/163755/country link inventory (#166) * added dynamic country id to link, added data-test id * removed 's country ending as it may be not appropriate for some countries * Feature/165200/select sectors appear phase stage board (#167) * added selection dropdown for sectors * dropdown count fix * replace section name to department (#168) * link changed from button to link (#169) * changed project data fallback for projectBar and breadcrumps (#170) * id correction (#171) * users list timing loading fix and data refresh for initiatives (#172) * users list timing loading fix and data refresh for initiatives * added data reset on loadProject if no data exist * updated button ui and added text to link (#177) --------- Co-authored-by: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com> Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> * UI changes * UI changes (#182) * Updated breadcrumbs My Initiatives to Initiatives link to inventory list (#183) * Bugfix/130138/admin export users fails (#184) * added background export action for auth users table * patching the export_resource_classes to the User model * added comment * chore/Remove unnecessary commands from startup_actions * chore/Silence opentelemetry logs in dev * chore/Remove unnecessary log statements * Feature/160750/make end phases config (#186) * add_checkbox_end_phase_update_current_stage * dynamically get end phases and hide them in phases board * remove cache structire --------- Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> * Count last phase always as end phase (#187) * Bugfix/increase dev test coverage (#190) * feat/Add new attribute completion_marks_an_initiative_as_inactive to test files * chore/Add custom migration files * chore/Add print statements to add_taxonomies * chore/Refactor code - Move add_taxonomies functionality to a new migration file - Revert add taxonomies to the previous state * fix/Minor fix to add_taxonomies.py - Add check to return first if it finds more than one * increase coverage version 2 * remove return from def fill_named_model -initial form --------- Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com> * Revert "Count last phase always as end phase" This reverts commit 9d7e5a4. * Revert "dynamically get end phases and hide them in phases board" This reverts commit d5671db. * remove tests for discontinued and remove duplicate class (#193) * Deployment to test environment (#194) * UI changes (#182) * Updated breadcrumbs My Initiatives to Initiatives link to inventory list (#183) * Bugfix/130138/admin export users fails (#184) * added background export action for auth users table * patching the export_resource_classes to the User model * added comment * chore/Remove unnecessary commands from startup_actions * chore/Silence opentelemetry logs in dev * chore/Remove unnecessary log statements * Feature/160750/make end phases config (#186) * add_checkbox_end_phase_update_current_stage * dynamically get end phases and hide them in phases board * remove cache structire --------- Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> * Count last phase always as end phase (#187) * Bugfix/increase dev test coverage (#190) * feat/Add new attribute completion_marks_an_initiative_as_inactive to test files * chore/Add custom migration files * chore/Add print statements to add_taxonomies * chore/Refactor code - Move add_taxonomies functionality to a new migration file - Revert add taxonomies to the previous state * fix/Minor fix to add_taxonomies.py - Add check to return first if it finds more than one * increase coverage version 2 * remove return from def fill_named_model -initial form --------- Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com> * Revert "Count last phase always as end phase" This reverts commit 9d7e5a4. * Revert "dynamically get end phases and hide them in phases board" This reverts commit d5671db. * remove tests for discontinued and remove duplicate class (#193) --------- Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> Co-authored-by: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com> Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com> * added link to country in initiatives published view * updated data test id, added link to inventory countries column * hide initiatives that have completed an end phase (#196) * Feature/168436/add links from country to co pages (#195) * added link to country in initiatives published view * updated data test id, added link to inventory countries column * remove last phase, hide some comments * remove last phase, hide some comments (#197) * updated column count when sectors filtered --------- Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com> Co-authored-by: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com> Co-authored-by: gkalomalos <123368636+gkalomalos@users.noreply.github.com> Co-authored-by: Diogenis Petropoulos <diogenis,petropoulos@sword-group.com> Co-authored-by: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
gkalomalos
added a commit
that referenced
this pull request
Sep 10, 2023
* chore/Update django to v2.2 * feat/Add upgrade pip to Dockerfile.django * chore/Update Django to v3.2 * chore/Update django-admin-sortable2 to v 1.0.4 * chore/Update django-cors-headers==2.3.0 to django-cors-headers==4.1.0 * refactor/Change simple-feedback to simple_feedback - Add apps.py to mask simple-feedback to simple_feedback to avoid import issue. - Remove redundant internal_ips.py. - Change INSTALLED_APPS and urls.py to use the new settings. This issue was caused by upgrading Dhango 2.x to 3.x since explicit validation for app labels was introduced. * Merge dev into feature branch * chore/Remove django-rest-auth==0.9.5 from requirements * chore/Refactor authentication process - Remove rest_auth and rest_auth.registration and switch to dj_rest_auth. - Import SocialLoginView from dj_rest_auth instead of rest_auth. - Import LoginSerializer instead of JWTSerializer (needs testing). - Switch urls from rest-auth to dj-rest-auth. * chore/Refactor NullBooleanField to BooleanField with allow_null=True * chore/Refactor base_name to basename to conform with django upgrade * chore/Remove custom mplementation for simple-feedback - Remove app.py and custom umplementation for simple_feedback package. - Upgrade django-redis==4.9.0 to django-redis==5.3.0. - Upgrade redis==2.10.6 to redis==4.6.0. * chore/Update packages to resolve dependency issues - Update drf-yasg==1.17.1 to drf-yasg==1.21.6 - Update pytz==2018.5 to pytz==2023.3 - Update PyYAML==3.13 to PyYAML==6.0 * chore/Update JSONField import - Change from django.contrib.postgres.fields import JSONField to from django.db.models import JSONField * fix/Address error with CountryCustomQuestion and DonorCustomQuestion models * Add DEFAULT_AUTO_FIELD to settings to suppress warnings * chore/Update python docker image from python:3.7-stretch to python:3.8-slim-buster * chore/Change python docker image from python:3.8-slim-buster to python:3.8-buster * chore/Add installation of libpq-dev gcc in the dockerfile * chore/Major changes in requirements.txt - Add comments on updated packages - Update celery to latest version 5.3.1 - Update billiard, kombu and vine to latest versions to support latest celery update * chore/Update dockerfile to include upgrading of setuptools and wheel * chore/Add dependencies to support upgrading ipython from 0.12.1 to 8.12.2 * chore/Update parso from 0.3.0 to 0.8.3 to resolve jedi dependency issues * chore/Add openpyxl to requirements.txt to resolve issue with missing dependencies * chore/Remove not used libraries - Remove simplegeneric. This package is discontinued and incompatible with python 3.8 - Remove six. This package is incompatible with django>3 - Remove dj-anonymizer and dj-anonymizer[bulk] - Remove anonymizer/user.py * chore/(STABLE) Upgrade django-appconf==1.0.2 to django-appconf==1.0.5 - Upgrading django-appconf==1.0.2 to django-appconf==1.0.5 resolved the import six issue. This is the first stable edition with the upgraded Django 3.2 version of the requirements. * chore/Update all django related libraries - Update django-extensions - Update django-import-export - Update django-modeltranslation - Update django-rosetta * chore/Refactor requirements.txt file * chore/Update pytest and secondary packages in latest versions * chore/Remove deprecated and not directly relevant libraries - Remove appnope - Update argh==0.26.2 to argh==0.28.1 - Remove atomicwrites - Remove backcall - Remove bcrypt - Remove behave - Remove docopt - Remove Fabric3 - Remove itypes - Remove Jinja2 - Remove watchdog * chore/Update packages to resolve inconsistencies - Update attrs==18.1.0 to attrs==23.1.0 - Reinstated coreapi. Required by rest_framework to resolve AssertionError: `coreapi` must be installed for schema support - Update dj-inmemorystorage==1.4.1 to dj-inmemorystorage==2.1.0 - Update flake8==3.8.2 to flake8==6.0.0 - Update mccabe==0.6.1 to mccabe==0.7.0 - Update pycodestyle==2.6.0 to pycodestyle==2.10.0 - Update pyflakes==2.2.0 to pyflakes==3.0.1 Remove commented out code. * chore/Update remaining packages * revert packages to explore admin panel issue * chore/Remove unnecessary startup scripts * [MAJOR]Update Django==3.2 to Django==4.2.3 - Try to update Django 3.2 to the latest version 4.2.3 - Update django-admin-sortable2==1.0.4 to django-admin-sortable2==2.1.8 to see if this resolves the issue with the broken admin panel page * fix/Change ugettext_lazy to gettext_lazy - Change from django.utils.translation import ugettext_lazy as _ to from django.utils.translation import gettext_lazy as _ to resolve issue ImportError: cannot import name 'ugettext_lazy' from 'django.utils.translation' * fix/Change import for KeyTextTransform - Change from django.contrib.postgres.fields.jsonb import KeyTextTransform to from django.db.models.fields.json import KeyTextTransform. In Django 3.1 and later versions, KeyTextTransform has been moved to django.db.models.fields.json * fix/Change ugettext to gettext - Replace from django.utils.translation import override, ugettext to from django.utils.translation import override, gettext as _ * fix/Remove import url from django.conf.urls - Change from django.conf.urls import url to from django.urls import path. The url() function was deprecated in Django 3.1 and removed in Django 4.0. Needs to replaced with path() or re_path(). * fix/Check issue with django-import-export-celery module - django-import-export-celery is currently used from a forked version of the original library and causes some inconsistencies. Check if we can use the original django-import-export-celery module - Update django-allauth==0.41.0 to current latest django-allauth==0.54.0. * chore/Change djangorestframework-jwt into djangorestframework-simplejwt * chore/Update PostgreSQL from 10.4 to 15.2 in docker-compose and Tiltfile * chore/Fix warnings on translation on building process * feat/Add new authorization process - djangorestframework-jwt does not support Django 4.2.3 and was replaced with djangorestframework-simplejwt==5.2.2. For this a new custom authorization process CustomTokenObtainPairView needed to be defined. - To retain the specific response we need to override the token serializer and create a custom reponse. * chore/Add comments and minor refactor to CustomTokenObtainPairSerializer * UI changes * chore/Add comments to requirements.txt * feat/Create custom admin site * feat/Add custom AdminSite to remove certain features - Remove nav_sidebar * Deployment to test environment (#194) * UI changes (#182) * Updated breadcrumbs My Initiatives to Initiatives link to inventory list (#183) * Bugfix/130138/admin export users fails (#184) * added background export action for auth users table * patching the export_resource_classes to the User model * added comment * chore/Remove unnecessary commands from startup_actions * chore/Silence opentelemetry logs in dev * chore/Remove unnecessary log statements * Feature/160750/make end phases config (#186) * add_checkbox_end_phase_update_current_stage * dynamically get end phases and hide them in phases board * remove cache structire --------- Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> * Count last phase always as end phase (#187) * Bugfix/increase dev test coverage (#190) * feat/Add new attribute completion_marks_an_initiative_as_inactive to test files * chore/Add custom migration files * chore/Add print statements to add_taxonomies * chore/Refactor code - Move add_taxonomies functionality to a new migration file - Revert add taxonomies to the previous state * fix/Minor fix to add_taxonomies.py - Add check to return first if it finds more than one * increase coverage version 2 * remove return from def fill_named_model -initial form --------- Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com> * Revert "Count last phase always as end phase" This reverts commit 9d7e5a4. * Revert "dynamically get end phases and hide them in phases board" This reverts commit d5671db. * remove tests for discontinued and remove duplicate class (#193) --------- Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> Co-authored-by: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com> Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com> * chore/Update requirements.txt - Upgrade azure-monitor-opentelemetry==1.0.0b13 to azure-monitor-opentelemetry==1.0.0b15 - Add opentelemetry-instrumentation-django==0.40b0 to get additional database transaction information in application insights - Freeze opentelemetry-semantic-conventions==0.40b0 and opentelemetry-sdk==1.19.0 to avoid package conflicts. * feat/Upgrade the css on admin panel to resolve issues - Remove skip link, logout form and theme toggle - Add Log out link - Fix theme toggle on login form * fix/Change JSONWebTokenAuthentication to JWTAuthentication to avoid import error * fix/Change get_token implementation to avoid null user_profile id * feat/Update deploy version to 4.0.0 * feat/Add custom submit_line.html to avoid css issues in django input css * fix/Various improvements to the css of the admin panel - Add "Save and add another" button where missing - Fix css on delete button - Fix comment section location on platform sections * chore/Add migration files * fix/Change staticfiles to static in master-inline.html to comply with django4 requirements * fix/Change formatting to avoid ormat string with unnamed arguments cannot be properly localized warning * chore/Apply formatting * chore/Refactor admin register process to comply with the custom_admin_site * fix/Remove default comment section from the platform sections * feat/Register NewsItem to the custom_admin_site * fix/Remove autocomplete field for UserProfile in ApprovalStateAdmin --------- Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com> Co-authored-by: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com> Co-authored-by: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
gkalomalos
added a commit
that referenced
this pull request
Sep 19, 2023
commit 714cc52c2707645a2cd4a57927550cc56f91cda7
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Sep 19 16:29:43 2023 +0300
Revert "chore/Remove redundant tests"
This reverts commit 85172c5365b6c9b1335ffb7f881e94418fdc27a8.
commit 85172c5365b6c9b1335ffb7f881e94418fdc27a8
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Sep 19 13:58:54 2023 +0300
chore/Remove redundant tests
commit 4262bd092cbdab7d3064c98b25aa58d4aa9122e3
Merge: d80a0430 c2ac6272
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Sep 19 12:46:31 2023 +0300
Merge branch 'dev' into tst
commit c2ac627266b3ff72cb17c22c2a746b0246c1f53b
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Sep 19 11:46:42 2023 +0300
fix/collectstatic --noinput and application insights envs
commit 684ad1e99337a42f4f832b32e71c44b002951896
Author: panagiotis.vlontzos <panagiotis.vlontzos@sword-group.com>
Date: Tue Sep 19 11:40:35 2023 +0300
Fixed the nginx static files being overwritten
commit 70258a255469e2f56710878cd41e7beafd98e00e
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Sep 18 17:00:05 2023 +0300
feat/Add collecstatic on startup actions
commit ed863fcca4a9a60037f04b238ba7ee4e50f13ef1
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Sep 18 16:59:40 2023 +0300
chore/Remove custom admin behavior code
commit 477c8a8524c0c913f8603242225b1003628ed598
Author: panagiotis.vlontzos <panagiotis.vlontzos@sword-group.com>
Date: Mon Sep 18 16:31:16 2023 +0300
Added the nginx trigger for the frontend pipelines
commit f490874bf12c36d94d6fee175a6fbe74226fec2f
Author: panagiotis.vlontzos <panagiotis.vlontzos@sword-group.com>
Date: Mon Sep 18 16:13:14 2023 +0300
Added pvc for static files
commit e605817674f1a4a2cf93180336456c32f757c846
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Sep 18 09:17:39 2023 +0300
feat/Add dynamic url on delete action on admin panel
commit 3de3e2c760ec60c536f5bb460dbdb88f1d794595
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Sep 18 09:17:19 2023 +0300
chore/Clean up requirements.txt
commit b81f364a53b97aedb17e2a8bcd5f437789a8f6fa
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sun Sep 17 21:07:43 2023 +0300
feat/Add autocomplete platform field
commit 859c6b46defbc9626a2caa07a104951971dfadfe
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sun Sep 17 16:23:58 2023 +0300
feat/Split login logic for username/password and azure login
commit 886dd7d265fb6ab9aec30192bf774f3745a3c157
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sun Sep 17 14:50:08 2023 +0300
convert jwt to access
commit 23725ce8d1c4f08ae42e02ed5b08f0f3d4e7782a
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sun Sep 17 14:31:17 2023 +0300
change ProfileJWTSerializer to CustomTokenObtainPairSerializer
commit 540d60ed3167b430e05adccf628ceb1fc9fe2566
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sun Sep 17 12:31:16 2023 +0300
change JWTSerializer to TokenObtainPairSerializer to have access to get_token
commit fd09311c45d92746233e6e453db6bd6d52ea694b
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sun Sep 17 12:12:51 2023 +0300
include custom get_response
commit bc558c696cbdac0e1d1d186963d3f54ee4e88d6a
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sat Sep 16 23:48:02 2023 +0300
chore/Simplify custom jwt generation
commit db9ce7fff578f9d17626c18110c92bc5596c84df
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sat Sep 16 19:56:49 2023 +0300
fix/Add SPT to avoid invalid token
commit 743884347ee647c070b8b581ab49460b2057a5bf
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sat Sep 16 19:14:28 2023 +0300
fix/Change token type from refresh to access
commit facfaa0f4a9784e0bd911cf11944b6d16d93812e
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sat Sep 16 18:46:03 2023 +0300
feat/Refactor native and azure login process
commit d32d981627c5b280dcfa7e7c4830853bd4ec0c7a
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sat Sep 16 11:36:10 2023 +0300
Revert "fix/Remove AccessToken"
This reverts commit 89d5f493ae78c50eb6cb0ac3d23f4efa0f525a7b.
commit 89d5f493ae78c50eb6cb0ac3d23f4efa0f525a7b
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sat Sep 16 11:24:24 2023 +0300
fix/Remove AccessToken
commit 5678ec0c88042d48e1febeace4564d349b774462
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sat Sep 16 10:29:30 2023 +0300
[STABLE] remove log statements
commit 9d5432335db3dfda51839afa84b92ed28996a7be
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 20:53:38 2023 +0300
fix/Replace refresh with access token
commit 5b5e62612f09776870453b350ead5c46054fefd4
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 20:37:35 2023 +0300
Revert "fix/Replace refresh with access token"
This reverts commit 1e1f8c4003ff78b67a21034fe07c9e3f9175a430.
commit 1e1f8c4003ff78b67a21034fe07c9e3f9175a430
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 18:06:53 2023 +0300
fix/Replace refresh with access token
commit e7c6bfbeb30677a76adc758ed5472e79aaf523ee
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 17:50:37 2023 +0300
feat/Enrich AzureLogin with login response methods
commit 0d279f0d541e2390387c5d75bb83aa748f2468ed
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 17:22:36 2023 +0300
feat/Reinstate CustomTokenObtainPairView at rest-auth/azure
commit b7c7004449910739f94c39156897e4f8b3f48abb
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 16:22:44 2023 +0300
chore/Add log statements
commit f3aa3ab47ec134a3700b3071732f9660decef2fd
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 16:02:03 2023 +0300
modify TOKEN_OBTAIN_SERIALIZER to use ProfileJWTSerializer
commit e58bdbcaafa7b050647de8d31668aa6ab1404531
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 15:43:29 2023 +0300
rollback to AzureLogin
commit 6fe968b3d44d9ca5ccf6d920d1cb436b20aad3fa
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 15:29:09 2023 +0300
change TOKEN_OBTAIN_SERIALIZER
commit ce53a8798db5b04435a6368fecae30ea19fd9583
Merge: a20b56df 33f1561f
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 14:58:04 2023 +0300
Merge branch 'dev' of https://github.com/unicef/invent into dev
commit a20b56dfa3656acf70e9e0e208e8def77e1da87d
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 14:57:52 2023 +0300
feat/Add CustomTokenObtainPairView to rest-auth/azure/
commit 33f1561f20788499fbcdc6e8d2880634aac52197
Author: SWORDGROUP\alafazanidi <alexandra.lafazanidi@sword-group.com>
Date: Fri Sep 15 13:34:23 2023 +0300
fix ther error for publishing a draft initiative
commit 5cb2bcf89521aa8d6826db193c55a566fb95a22e
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 13:20:04 2023 +0300
chore/Add log statements
commit fbaca46fa6bf51a1ea1c827b0899ab2c2c34ec0c
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 11:20:03 2023 +0300
feat/Add CustomTokenObtainPairView to azure
commit 8bfe40bb1515a5410c43af991dbf37b6b3854fe3
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 10:54:35 2023 +0300
chore/Rollback custom jwt token generation
commit 8b8a81ae5406b8be347bd042ef70b213a65122d1
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 10:05:11 2023 +0300
chore/Add log statements
commit 42478bd3627122e72bc1c7b7d155d24f8b3ebfdd
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 09:39:14 2023 +0300
chore/Restore TokenObtainPairView
commit 19f6fb423d5d359165cd8a41c160d73d9b71d05a
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 08:49:38 2023 +0300
chore/Add log statements
commit 01cd4dc322c55a1725ef5e8b0da30085464ea711
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 08:15:25 2023 +0300
chore/Add TOKEN_OBTAIN_SERIALIZER
commit a8f9890bce706ce8d3869478b4c084a5b829e9c3
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 07:00:56 2023 +0300
chore/Rollback custom azure login process
commit 02ced53e213177665ebf806e71cc02e6ead6f028
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 06:28:25 2023 +0300
chore/Rollback jwt generation process
commit fb65bb2fb6f7517f1a0d4cfbb146e46de9acf2fa
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 01:37:43 2023 +0300
chore/Add log statements
commit 3318b223ba5089baf0e7d2f307e34329b724c0cb
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 01:20:30 2023 +0300
feat/Add custom post method to AzureLogin
commit ea82327f822c14584674e2c306b95620cf2d4569
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 00:57:52 2023 +0300
chore/Change rest_framework_jwt to rest_framework_simplejwt
commit cf144deadac95e275b3cd71021441e41fccd942f
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 00:30:01 2023 +0300
chore/Change rest_framework_jwt to rest_framework_simplejwt
commit a6544fe792190d67ac5c5243cd7c08491ac0cbb5
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 15 00:00:48 2023 +0300
chore/Rollback jwt generation process
commit ae2b8bd28c98245d2d4001ebd4948bbc74b96dbf
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Sep 14 23:34:28 2023 +0300
feat/Add custom jwt response handler
commit 127eb876984a9d1aa0a9c3aae0cf42675c089905
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Sep 14 20:14:37 2023 +0300
chore/Rollback jwt generation process
commit de2fd35354ac120836843a99c0441c39c4fafb09
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Sep 14 19:16:13 2023 +0300
chore/Fix typo
commit d8c5e115432621160f10919872c5fc2bdda676ac
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Sep 14 19:07:17 2023 +0300
chore/Fix typo
commit d3328bdd9e94c05c70a17b7969ea206f340052e9
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Sep 14 18:54:52 2023 +0300
chore/Add debug log statements
commit 49572ef313c51a2794ddaeaeb91ba88c85417b51
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Sep 14 16:49:39 2023 +0300
feat/Add custom azure login method
commit 5a73324325e8ab8544081c7a983bf7b3cd0c8594
Merge: a8218b01 5de79165
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Sep 14 16:36:30 2023 +0300
Merge branch 'dev' of https://github.com/unicef/invent into dev
commit a8218b016153901b49b6863295af638b2309dacb
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Sep 14 16:36:25 2023 +0300
chore/Remove custom admin panel
commit 5de7916534a3e8e759c38466f3667b34ba2b5902
Author: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
Date: Thu Sep 14 14:02:27 2023 +0300
deactivate validation for donorCustom
commit 76708bf113a9a5935d5827a71fc97e3c03eb9a83
Author: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
Date: Thu Sep 14 13:38:06 2023 +0300
hide donor custom field for initiatives
commit 3e3d9f45d6e8f63b4c76ad292359b8a7f64e82e8
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Sep 14 12:37:57 2023 +0300
fix/Modify the path for azure login to urls.py
commit 6773ef5204586b046c6a4fc97e9472cefe9830c2
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Sep 14 12:02:16 2023 +0300
fix/Adjust the azure login to use dj-rest-auth
commit ca74a9a0e6e28ab13a49ded794ebe615bf1a0d43
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Sep 13 20:20:20 2023 +0300
fix/Remove hardcoded username from admin panel
commit e7d38f9555fb3b9d9dcc078c3ece7be65505fa60
Author: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
Date: Wed Sep 13 17:38:59 2023 +0300
hide investor fields
commit 790c0703a60d44e691cf9d02b16f062a220f15dd
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Sep 13 16:48:45 2023 +0300
fix/Add comma to REST_FRAMEWORK tuple to avoid TypeError
commit b1f4b536c9a8676efb47cbb330701112a80aaa47
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Sep 13 16:42:23 2023 +0300
chore/Update all .env files with the appropriate POSTGRES_USER and DATABASE_HOST values
commit db54c6b5c3fd68a80b1da3675000d58c671e8fb8
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Sep 13 15:35:12 2023 +0300
chore/Modify POSTGRES_USER
commit d80a0430bb30f873bcc9340fa2954b6bf8f5e320
Merge: c2808e38 0df4098b
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Sep 13 12:29:35 2023 +0300
Merge branch 'uat' into tst
commit c2873c33e6b4df4ac74a6bac41db6fdcd882753e
Author: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
Date: Tue Sep 12 14:01:32 2023 +0300
undefined tolerant
commit 80c5a93055a4938d03971ce4feb61624ded0a1a8
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Sep 11 11:58:48 2023 +0300
chore/Update CSRF_TRUSTED_ORIGINS from wildcard to trusted urls
commit edba20b6f9650fa6b2a66c6315797e1328f65f72
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Sep 11 11:35:38 2023 +0300
chore/Update POSTGRES_USER and DATABASE_HOST to .env files
commit b3d74a761cfd3ed88cfef4aee35a5fe851a00e91
Author: gkalomalos <123368636+gkalomalos@users.noreply.github.com>
Date: Sun Sep 10 18:22:12 2023 +0300
Feature/146859/update to a modern version of django (#224)
* chore/Update django to v2.2
* feat/Add upgrade pip to Dockerfile.django
* chore/Update Django to v3.2
* chore/Update django-admin-sortable2 to v 1.0.4
* chore/Update django-cors-headers==2.3.0 to django-cors-headers==4.1.0
* refactor/Change simple-feedback to simple_feedback
- Add apps.py to mask simple-feedback to simple_feedback to avoid import issue.
- Remove redundant internal_ips.py.
- Change INSTALLED_APPS and urls.py to use the new settings.
This issue was caused by upgrading Dhango 2.x to 3.x since explicit validation for app labels was introduced.
* Merge dev into feature branch
* chore/Remove django-rest-auth==0.9.5 from requirements
* chore/Refactor authentication process
- Remove rest_auth and rest_auth.registration and switch to dj_rest_auth.
- Import SocialLoginView from dj_rest_auth instead of rest_auth.
- Import LoginSerializer instead of JWTSerializer (needs testing).
- Switch urls from rest-auth to dj-rest-auth.
* chore/Refactor NullBooleanField to BooleanField with allow_null=True
* chore/Refactor base_name to basename to conform with django upgrade
* chore/Remove custom mplementation for simple-feedback
- Remove app.py and custom umplementation for simple_feedback package.
- Upgrade django-redis==4.9.0 to django-redis==5.3.0.
- Upgrade redis==2.10.6 to redis==4.6.0.
* chore/Update packages to resolve dependency issues
- Update drf-yasg==1.17.1 to drf-yasg==1.21.6
- Update pytz==2018.5 to pytz==2023.3
- Update PyYAML==3.13 to PyYAML==6.0
* chore/Update JSONField import
- Change from django.contrib.postgres.fields import JSONField to from django.db.models import JSONField
* fix/Address error with CountryCustomQuestion and DonorCustomQuestion models
* Add DEFAULT_AUTO_FIELD to settings to suppress warnings
* chore/Update python docker image from python:3.7-stretch to python:3.8-slim-buster
* chore/Change python docker image from python:3.8-slim-buster to python:3.8-buster
* chore/Add installation of libpq-dev gcc in the dockerfile
* chore/Major changes in requirements.txt
- Add comments on updated packages
- Update celery to latest version 5.3.1
- Update billiard, kombu and vine to latest versions to support latest celery update
* chore/Update dockerfile to include upgrading of setuptools and wheel
* chore/Add dependencies to support upgrading ipython from 0.12.1 to 8.12.2
* chore/Update parso from 0.3.0 to 0.8.3 to resolve jedi dependency issues
* chore/Add openpyxl to requirements.txt to resolve issue with missing dependencies
* chore/Remove not used libraries
- Remove simplegeneric. This package is discontinued and incompatible with python 3.8
- Remove six. This package is incompatible with django>3
- Remove dj-anonymizer and dj-anonymizer[bulk]
- Remove anonymizer/user.py
* chore/(STABLE) Upgrade django-appconf==1.0.2 to django-appconf==1.0.5
- Upgrading django-appconf==1.0.2 to django-appconf==1.0.5 resolved the import six issue.
This is the first stable edition with the upgraded Django 3.2 version of the requirements.
* chore/Update all django related libraries
- Update django-extensions
- Update django-import-export
- Update django-modeltranslation
- Update django-rosetta
* chore/Refactor requirements.txt file
* chore/Update pytest and secondary packages in latest versions
* chore/Remove deprecated and not directly relevant libraries
- Remove appnope
- Update argh==0.26.2 to argh==0.28.1
- Remove atomicwrites
- Remove backcall
- Remove bcrypt
- Remove behave
- Remove docopt
- Remove Fabric3
- Remove itypes
- Remove Jinja2
- Remove watchdog
* chore/Update packages to resolve inconsistencies
- Update attrs==18.1.0 to attrs==23.1.0
- Reinstated coreapi. Required by rest_framework to resolve AssertionError: `coreapi` must be installed for schema support
- Update dj-inmemorystorage==1.4.1 to dj-inmemorystorage==2.1.0
- Update flake8==3.8.2 to flake8==6.0.0
- Update mccabe==0.6.1 to mccabe==0.7.0
- Update pycodestyle==2.6.0 to pycodestyle==2.10.0
- Update pyflakes==2.2.0 to pyflakes==3.0.1
Remove commented out code.
* chore/Update remaining packages
* revert packages to explore admin panel issue
* chore/Remove unnecessary startup scripts
* [MAJOR]Update Django==3.2 to Django==4.2.3
- Try to update Django 3.2 to the latest version 4.2.3
- Update django-admin-sortable2==1.0.4 to django-admin-sortable2==2.1.8 to see if this resolves the issue with the broken admin panel page
* fix/Change ugettext_lazy to gettext_lazy
- Change from django.utils.translation import ugettext_lazy as _ to from django.utils.translation import gettext_lazy as _ to resolve issue ImportError: cannot import name 'ugettext_lazy' from 'django.utils.translation'
* fix/Change import for KeyTextTransform
- Change from django.contrib.postgres.fields.jsonb import KeyTextTransform to from django.db.models.fields.json import KeyTextTransform. In Django 3.1 and later versions, KeyTextTransform has been moved to django.db.models.fields.json
* fix/Change ugettext to gettext
- Replace from django.utils.translation import override, ugettext to from django.utils.translation import override, gettext as _
* fix/Remove import url from django.conf.urls
- Change from django.conf.urls import url to from django.urls import path.
The url() function was deprecated in Django 3.1 and removed in Django 4.0. Needs to replaced with path() or re_path().
* fix/Check issue with django-import-export-celery module
- django-import-export-celery is currently used from a forked version of the original library and causes some inconsistencies. Check if we can use the original django-import-export-celery module
- Update django-allauth==0.41.0 to current latest django-allauth==0.54.0.
* chore/Change djangorestframework-jwt into djangorestframework-simplejwt
* chore/Update PostgreSQL from 10.4 to 15.2 in docker-compose and Tiltfile
* chore/Fix warnings on translation on building process
* feat/Add new authorization process
- djangorestframework-jwt does not support Django 4.2.3 and was replaced with djangorestframework-simplejwt==5.2.2. For this a new custom authorization process CustomTokenObtainPairView needed to be defined.
- To retain the specific response we need to override the token serializer and create a custom reponse.
* chore/Add comments and minor refactor to CustomTokenObtainPairSerializer
* UI changes
* chore/Add comments to requirements.txt
* feat/Create custom admin site
* feat/Add custom AdminSite to remove certain features
- Remove nav_sidebar
* Deployment to test environment (#194)
* UI changes (#182)
* Updated breadcrumbs My Initiatives to Initiatives link to inventory list (#183)
* Bugfix/130138/admin export users fails (#184)
* added background export action for auth users table
* patching the export_resource_classes to the User model
* added comment
* chore/Remove unnecessary commands from startup_actions
* chore/Silence opentelemetry logs in dev
* chore/Remove unnecessary log statements
* Feature/160750/make end phases config (#186)
* add_checkbox_end_phase_update_current_stage
* dynamically get end phases and hide them in phases board
* remove cache structire
---------
Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
* Count last phase always as end phase (#187)
* Bugfix/increase dev test coverage (#190)
* feat/Add new attribute completion_marks_an_initiative_as_inactive to test files
* chore/Add custom migration files
* chore/Add print statements to add_taxonomies
* chore/Refactor code
- Move add_taxonomies functionality to a new migration file
- Revert add taxonomies to the previous state
* fix/Minor fix to add_taxonomies.py
- Add check to return first if it finds more than one
* increase coverage version 2
* remove return from def fill_named_model -initial form
---------
Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com>
* Revert "Count last phase always as end phase"
This reverts commit 9d7e5a4f05f19c7209becfeb71ae845e7f4ac7a3.
* Revert "dynamically get end phases and hide them in phases board"
This reverts commit d5671dbe75c5422bd9424e96c85d60de2c821ce9.
* remove tests for discontinued and remove duplicate class (#193)
---------
Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
Co-authored-by: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com>
* chore/Update requirements.txt
- Upgrade azure-monitor-opentelemetry==1.0.0b13 to azure-monitor-opentelemetry==1.0.0b15
- Add opentelemetry-instrumentation-django==0.40b0 to get additional database transaction information in application insights
- Freeze opentelemetry-semantic-conventions==0.40b0 and opentelemetry-sdk==1.19.0 to avoid package conflicts.
* feat/Upgrade the css on admin panel to resolve issues
- Remove skip link, logout form and theme toggle
- Add Log out link
- Fix theme toggle on login form
* fix/Change JSONWebTokenAuthentication to JWTAuthentication to avoid import error
* fix/Change get_token implementation to avoid null user_profile id
* feat/Update deploy version to 4.0.0
* feat/Add custom submit_line.html to avoid css issues in django input css
* fix/Various improvements to the css of the admin panel
- Add "Save and add another" button where missing
- Fix css on delete button
- Fix comment section location on platform sections
* chore/Add migration files
* fix/Change staticfiles to static in master-inline.html to comply with django4 requirements
* fix/Change formatting to avoid ormat string with unnamed arguments cannot be properly localized warning
* chore/Apply formatting
* chore/Refactor admin register process to comply with the custom_admin_site
* fix/Remove default comment section from the platform sections
* feat/Register NewsItem to the custom_admin_site
* fix/Remove autocomplete field for UserProfile in ApprovalStateAdmin
---------
Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
Co-authored-by: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com>
Co-authored-by: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
commit c2808e386bfca36ced78955c0bfc6cdbfe585e3d
Merge: 1a76129b 2889d114
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sun Sep 10 17:13:19 2023 +0300
Merge branch 'tst' of https://github.com/unicef/invent into tst
commit 1a76129b59c431a21eba24ff7e1419ca96141d4e
Merge: 4f01cab1 ac8981be
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Sun Sep 10 17:12:00 2023 +0300
Merge branch 'dev' into tst
commit 2889d1144825948081a9563e3a1148410260d8d4
Author: gkalomalos <123368636+gkalomalos@users.noreply.github.com>
Date: Sun Sep 10 17:10:54 2023 +0300
Merge 'dev' into 'tst' (#233)
* feat/Add new DeltaLink model to handle the deltalinks
* chore/Refactor adapters.py to fit in the DeltaLinks logic
- Modify process_aad_users to check for deltalinks.
- Add support methods get_last_delta_link and save_delta_link to fetch and save deltalinks respectively.
* chore/Refactor process_aad_users method and DeltaLink model
- Add get_latest_link class method to DeltaLink model to fetch the latest deltalink from the db
- Refactor the save deltalink process in the process_aad_users method
* chore/Add minor comment to apps.py
* fix/Minor fixed to deltalinks functionality
- Resolve models import issue.
- Change auto_now to auto_now_on since this value won't be updated
- Change property link to url to match the model
* feat/Add django migration file for DeltaLink model
* feat/Add deltalink refresh mechanism in case of link expiration
* Add DeltaLinks support to fetching AAD users (#221)
* feat/Add new DeltaLink model to handle the deltalinks
* chore/Refactor adapters.py to fit in the DeltaLinks logic
- Modify process_aad_users to check for deltalinks.
- Add support methods get_last_delta_link and save_delta_link to fetch and save deltalinks respectively.
* chore/Refactor process_aad_users method and DeltaLink model
- Add get_latest_link class method to DeltaLink model to fetch the latest deltalink from the db
- Refactor the save deltalink process in the process_aad_users method
* chore/Add minor comment to apps.py
* fix/Minor fixed to deltalinks functionality
- Resolve models import issue.
- Change auto_now to auto_now_on since this value won't be updated
- Change property link to url to match the model
* feat/Add django migration file for DeltaLink model
* feat/Add deltalink refresh mechanism in case of link expiration
* feat/Add django admin panel support and debug log statements
* fix/Change new_delta_link to None to debug empty delta link
* chore/Add logging information on the response data keys to check for missing deltaLink
* fix/Add delta parameter to url
* fix/Change delta url according to docs
* feat/Add log filtering and code cleanup
* chore/Update new-updated-ignored user logging info
* fix/Handle MultipleObjectsReturned error in add_taxonomies
* fix/Apply two fixes to handle exceptions on user creation and task execution
- Add check for empty list to avoid IndexErrors on update_solution_log_task
- Handle issues with large string representations of username, job_title and department values.
- Handle issues with duplicate usernames.
* chore/Apply formatting
* feat/Add migration file for altering the platform fields
* chore/Refactor AzureUserManagement and apply exception handling
* fix/Apply fix for duplicate emails
* fix/Remove unnecessary classmethod call
* fix/Remove existing_usernames solution to increase execution time
* fix/Add exception handling for empty projects
* phases and stages now both show office name (#226)
* Feature/169312/add coordinates in unicef offices (#228)
* add coordinates in unicef offices admin and api/add validation rules
* add migration file for coordinates in countryoffice
* correct the text in longitude
* Feature/165891/add funding solutions (#229)
* funding info added to solutions
* updated translations
* added setAside2021 and setAside2022 fields to solution model
* added the setAside2021 and setAside2022 fields to he solution serializer
* changed to pythonic naming
* added migration file
---------
Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
* fix for Api changes from setAside202... to set_aside_202.. , removed comments, some code improvements/refactoring (#230)
* Feature/165116/email corrections (#231)
* Corrected email subject
* email text fix
* footer text fixes
---------
Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
Co-authored-by: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com>
Co-authored-by: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
commit 4f01cab102ac50299ef2cf536d5f335679f971ed
Author: gkalomalos <123368636+gkalomalos@users.noreply.github.com>
Date: Fri Sep 8 14:21:58 2023 +0300
Merge 'dev' into 'tst' (#232)
* feat/Add new DeltaLink model to handle the deltalinks
* chore/Refactor adapters.py to fit in the DeltaLinks logic
- Modify process_aad_users to check for deltalinks.
- Add support methods get_last_delta_link and save_delta_link to fetch and save deltalinks respectively.
* chore/Refactor process_aad_users method and DeltaLink model
- Add get_latest_link class method to DeltaLink model to fetch the latest deltalink from the db
- Refactor the save deltalink process in the process_aad_users method
* chore/Add minor comment to apps.py
* fix/Minor fixed to deltalinks functionality
- Resolve models import issue.
- Change auto_now to auto_now_on since this value won't be updated
- Change property link to url to match the model
* feat/Add django migration file for DeltaLink model
* feat/Add deltalink refresh mechanism in case of link expiration
* Add DeltaLinks support to fetching AAD users (#221)
* feat/Add new DeltaLink model to handle the deltalinks
* chore/Refactor adapters.py to fit in the DeltaLinks logic
- Modify process_aad_users to check for deltalinks.
- Add support methods get_last_delta_link and save_delta_link to fetch and save deltalinks respectively.
* chore/Refactor process_aad_users method and DeltaLink model
- Add get_latest_link class method to DeltaLink model to fetch the latest deltalink from the db
- Refactor the save deltalink process in the process_aad_users method
* chore/Add minor comment to apps.py
* fix/Minor fixed to deltalinks functionality
- Resolve models import issue.
- Change auto_now to auto_now_on since this value won't be updated
- Change property link to url to match the model
* feat/Add django migration file for DeltaLink model
* feat/Add deltalink refresh mechanism in case of link expiration
* feat/Add django admin panel support and debug log statements
* fix/Change new_delta_link to None to debug empty delta link
* chore/Add logging information on the response data keys to check for missing deltaLink
* fix/Add delta parameter to url
* fix/Change delta url according to docs
* feat/Add log filtering and code cleanup
* chore/Update new-updated-ignored user logging info
* fix/Handle MultipleObjectsReturned error in add_taxonomies
* fix/Apply two fixes to handle exceptions on user creation and task execution
- Add check for empty list to avoid IndexErrors on update_solution_log_task
- Handle issues with large string representations of username, job_title and department values.
- Handle issues with duplicate usernames.
* chore/Apply formatting
* feat/Add migration file for altering the platform fields
* chore/Refactor AzureUserManagement and apply exception handling
* fix/Apply fix for duplicate emails
* fix/Remove unnecessary classmethod call
* fix/Remove existing_usernames solution to increase execution time
* fix/Add exception handling for empty projects
* phases and stages now both show office name (#226)
* Feature/169312/add coordinates in unicef offices (#228)
* add coordinates in unicef offices admin and api/add validation rules
* add migration file for coordinates in countryoffice
* correct the text in longitude
* Feature/165891/add funding solutions (#229)
* funding info added to solutions
* updated translations
* added setAside2021 and setAside2022 fields to solution model
* added the setAside2021 and setAside2022 fields to he solution serializer
* changed to pythonic naming
* added migration file
---------
Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
* fix for Api changes from setAside202... to set_aside_202.. , removed comments, some code improvements/refactoring (#230)
* Feature/165116/email corrections (#231)
* Corrected email subject
* email text fix
* footer text fixes
---------
Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
Co-authored-by: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com>
Co-authored-by: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
commit ac8981be17f6d61b3dd9d576954889a232988b6e
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Fri Sep 8 13:15:27 2023 +0300
Feature/165116/email corrections (#231)
* Corrected email subject
* email text fix
* footer text fixes
commit c75fc28e9109f1d03d3afdf67c12cebd7cb57b36
Author: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
Date: Thu Sep 7 12:09:08 2023 +0300
fix for Api changes from setAside202... to set_aside_202.. , removed comments, some code improvements/refactoring (#230)
commit 8dafe52bb95232147e4e2f63bad9fa02d14c063e
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Wed Sep 6 15:30:54 2023 +0300
Feature/165891/add funding solutions (#229)
* funding info added to solutions
* updated translations
* added setAside2021 and setAside2022 fields to solution model
* added the setAside2021 and setAside2022 fields to he solution serializer
* changed to pythonic naming
* added migration file
---------
Co-authored-by: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
commit 70e79b5a622b47e1849ae2875452ed40d95ff938
Author: Alexa-Laf <131444412+Alexa-Laf@users.noreply.github.com>
Date: Wed Sep 6 10:21:50 2023 +0300
Feature/169312/add coordinates in unicef offices (#228)
* add coordinates in unicef offices admin and api/add validation rules
* add migration file for coordinates in countryoffice
* correct the text in longitude
commit 0a3183c1166eeb7c74a040356ec571d3c0bb9ea1
Author: ladeniva2 <122989825+ladeniva2@users.noreply.github.com>
Date: Tue Sep 5 13:31:59 2023 +0300
phases and stages now both show office name (#226)
commit 96ee1bf1bf46aee961050975e1d8e8ec42eac5b3
Author: gkalomalos <123368636+gkalomalos@users.noreply.github.com>
Date: Mon Sep 4 17:02:18 2023 +0300
Merge 'dev' into 'tst' (#225)
* feat/Add new DeltaLink model to handle the deltalinks
* chore/Refactor adapters.py to fit in the DeltaLinks logic
- Modify process_aad_users to check for deltalinks.
- Add support methods get_last_delta_link and save_delta_link to fetch and save deltalinks respectively.
* chore/Refactor process_aad_users method and DeltaLink model
- Add get_latest_link class method to DeltaLink model to fetch the latest deltalink from the db
- Refactor the save deltalink process in the process_aad_users method
* chore/Add minor comment to apps.py
* fix/Minor fixed to deltalinks functionality
- Resolve models import issue.
- Change auto_now to auto_now_on since this value won't be updated
- Change property link to url to match the model
* feat/Add django migration file for DeltaLink model
* feat/Add deltalink refresh mechanism in case of link expiration
* Add DeltaLinks support to fetching AAD users (#221)
* feat/Add new DeltaLink model to handle the deltalinks
* chore/Refactor adapters.py to fit in the DeltaLinks logic
- Modify process_aad_users to check for deltalinks.
- Add support methods get_last_delta_link and save_delta_link to fetch and save deltalinks respectively.
* chore/Refactor process_aad_users method and DeltaLink model
- Add get_latest_link class method to DeltaLink model to fetch the latest deltalink from the db
- Refactor the save deltalink process in the process_aad_users method
* chore/Add minor comment to apps.py
* fix/Minor fixed to deltalinks functionality
- Resolve models import issue.
- Change auto_now to auto_now_on since this value won't be updated
- Change property link to url to match the model
* feat/Add django migration file for DeltaLink model
* feat/Add deltalink refresh mechanism in case of link expiration
* feat/Add django admin panel support and debug log statements
* fix/Change new_delta_link to None to debug empty delta link
* chore/Add logging information on the response data keys to check for missing deltaLink
* fix/Add delta parameter to url
* fix/Change delta url according to docs
* feat/Add log filtering and code cleanup
* chore/Update new-updated-ignored user logging info
* fix/Handle MultipleObjectsReturned error in add_taxonomies
* fix/Apply two fixes to handle exceptions on user creation and task execution
- Add check for empty list to avoid IndexErrors on update_solution_log_task
- Handle issues with large string representations of username, job_title and department values.
- Handle issues with duplicate usernames.
* chore/Apply formatting
* feat/Add migration file for altering the platform fields
* chore/Refactor AzureUserManagement and apply exception handling
* fix/Apply fix for duplicate emails
* fix/Remove unnecessary classmethod call
* fix/Remove existing_usernames solution to increase execution time
* fix/Add exception handling for empty projects
commit 28b6182360f9044d16193a2b8f4bd84361b0b0bc
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Sep 1 16:21:12 2023 +0300
fix/Add exception handling for empty projects
commit 2da3263aea39c88ccaa40bb1a10320400d5abfbe
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 30 16:22:10 2023 +0300
fix/Remove existing_usernames solution to increase execution time
commit 599a2843a4243d578c81a9c5a52e274ec0ef1c14
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 30 15:47:40 2023 +0300
fix/Remove unnecessary classmethod call
commit 5587601ca77c85bee87295e78a06695b0e3255c6
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 30 15:06:22 2023 +0300
fix/Apply fix for duplicate emails
commit 4457fb0d3829c4bb0d69724c004c8dd8ce18266b
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 30 13:50:34 2023 +0300
chore/Refactor AzureUserManagement and apply exception handling
commit 7895ad68a2830b44c76a7f8adfef2edde1951624
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 30 12:00:21 2023 +0300
feat/Add migration file for altering the platform fields
commit 26c097fdb124e0215e53d78f638d623b7e842567
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 30 11:23:46 2023 +0300
chore/Apply formatting
commit 489031c7a16f5519a368ebcee7a8887bc52b1d25
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 30 11:23:16 2023 +0300
fix/Apply two fixes to handle exceptions on user creation and task execution
- Add check for empty list to avoid IndexErrors on update_solution_log_task
- Handle issues with large string representations of username, job_title and department values.
- Handle issues with duplicate usernames.
commit 3801bc44bda1a50ad848080df3f59972ae0f6ec5
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 30 10:33:28 2023 +0300
fix/Handle MultipleObjectsReturned error in add_taxonomies
commit b343b560874af26588aa458a3a6661e9c6830ee6
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Aug 29 16:55:07 2023 +0300
chore/Update new-updated-ignored user logging info
commit 7d2d4aee5e8e81987d82825bc49a9b6c42fa19aa
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Aug 29 16:32:49 2023 +0300
feat/Add log filtering and code cleanup
commit a78a2dd4ebc3bdeb69d951e998d3e8c9fc693190
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Aug 29 13:09:07 2023 +0300
fix/Change delta url according to docs
commit 3f5b22d072399a7f5b673f0127a308e8bef1f15b
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Aug 29 12:39:27 2023 +0300
fix/Add delta parameter to url
commit 0d8d9059d8f430ba8af55156286adecb58fd080b
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Aug 29 12:20:58 2023 +0300
chore/Add logging information on the response data keys to check for missing deltaLink
commit cbf45449e21f14be352634ab803fa255cf4b2847
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 28 17:40:22 2023 +0300
fix/Change new_delta_link to None to debug empty delta link
commit 654d4aea2d410f3f266f5c5f527adcfcac04d39e
Merge: 07c029f7 89807697
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 28 17:09:22 2023 +0300
Merge branch 'dev' of https://github.com/unicef/invent into dev
commit 07c029f7f673be5af2c776a0c88f95fa503d168e
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 28 16:08:14 2023 +0300
feat/Add django admin panel support and debug log statements
commit 89807697de7763e3df41c89c20765de3cb5c05b0
Author: gkalomalos <123368636+gkalomalos@users.noreply.github.com>
Date: Mon Aug 28 15:25:39 2023 +0300
Add DeltaLinks support to fetching AAD users (#221)
* feat/Add new DeltaLink model to handle the deltalinks
* chore/Refactor adapters.py to fit in the DeltaLinks logic
- Modify process_aad_users to check for deltalinks.
- Add support methods get_last_delta_link and save_delta_link to fetch and save deltalinks respectively.
* chore/Refactor process_aad_users method and DeltaLink model
- Add get_latest_link class method to DeltaLink model to fetch the latest deltalink from the db
- Refactor the save deltalink process in the process_aad_users method
* chore/Add minor comment to apps.py
* fix/Minor fixed to deltalinks functionality
- Resolve models import issue.
- Change auto_now to auto_now_on since this value won't be updated
- Change property link to url to match the model
* feat/Add django migration file for DeltaLink model
* feat/Add deltalink refresh mechanism in case of link expiration
commit 323c09387743b35f42de6f82be2febae4b1d2680
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 28 15:22:11 2023 +0300
feat/Add deltalink refresh mechanism in case of link expiration
commit 42b75997b5c357985b4b7a90f98353598f2b1d68
Merge: aac75bac f21a2a8d
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 28 14:50:09 2023 +0300
Merge branch 'dev' into feature/168814/active-directory-synchronization
commit 566a9806cd464102df1092860aabe1aeb1305e71
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 28 14:47:15 2023 +0300
chore/Refactor base.html to be the same in all envs
commit bd19b978eb5d01da03ba42a8fd555359e6815a98
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 28 14:29:33 2023 +0300
chore/Rename migration file
commit 6e3e80281e5b95ae8fdc672fa2acb97312d6ef80
Merge: 70a10375 f21a2a8d
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 28 14:26:24 2023 +0300
Merge branch 'dev' into tst
commit f21a2a8d2ac058fdf3a4083a2b6c79a7b6730203
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 28 14:25:07 2023 +0300
chore/Remove unnecessary projectId prop from SelectBox
commit 70a1037544a28bc9c1cbf0070634ee2331c37391
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 28 14:22:25 2023 +0300
Merge 'dev' into 'tst'
commit 15d90569a011cb44f65855a9cba0011f305b6b72
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 28 13:36:41 2023 +0300
fix/Modify project view and serializers to receive project id and match with project model
commit e9ad935db2775f3f7220c9c5fad60bbdb757aa4e
Merge: 9f336469 9d104194
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 28 12:24:02 2023 +0300
Merge branch 'dev' into feature/168739/improve-notification-email-template
commit 9f3364696ce81eb05b645820b58480eda8d16849
Merge: fe524dee 07f7c49c
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Aug 25 16:36:46 2023 +0300
Merge branch 'feature/168739/improve-notification-email-template' of https://github.com/unicef/invent into feature/168739/improve-notification-email-template
commit fe524deeb0e5b85349a9721d5834fc3179f30b37
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Aug 25 16:36:37 2023 +0300
fix/Remove retrieval of url from ProjectForm and add it on SelectBox component
commit 9d1041945c9c2b1ae5567b29255a66be0e12e81d
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Fri Aug 25 15:05:21 2023 +0300
fixed position of comment field in admin panel (#223)
commit 07f7c49cb623e1a3b8d51f48827e32e4706c49ad
Merge: 8d1d249b d3849c56
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Fri Aug 25 15:03:56 2023 +0300
Merge branch 'dev' into feature/168739/improve-notification-email-template
commit d3849c56afdd42c3c4a748d6c833d303cf297c34
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Fri Aug 25 13:15:03 2023 +0300
Feature/168739/improve notification email template (#222)
* enriched email template with tag details
* added project field in all tag models
* changed name of project field
* added missing 'on_delete'
* changed name of project field
* chore/Manage migration files to avoid issues with reorder_stages and add_taxonomies script
* included initiative url in tag approval/decline email
* project field can be blank in tag object
* corrected field for initiative retrieval
* fixed initiative fields for url creation
---------
Co-authored-by: gkalomalos <georgios.kalomalos@sword-group.com>
commit fce00014b013d968c581c3e7e66d7311e04b049b
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Fri Aug 25 11:52:00 2023 +0300
fix/Fetch id from url instead of project to avoid null issues
commit e80e269b7c971f9ab42f49e4ab032d36a4c5cc9b
Merge: 6429ec95 8d1d249b
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Aug 24 14:24:21 2023 +0300
Merge branch 'feature/168739/improve-notification-email-template' of https://github.com/unicef/invent into feature/168739/improve-notification-email-template
commit 8d1d249b1fa16ed43bd814a16e7e5f18580d4006
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Thu Aug 24 14:24:01 2023 +0300
fixed initiative fields for url creation
commit 6429ec95108216d73e0e5ed8d94df0c01afcee40
Merge: 3c20f12f 1d16af68
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Aug 24 13:55:53 2023 +0300
Merge branch 'feature/168739/improve-notification-email-template' of https://github.com/unicef/invent into feature/168739/improve-notification-email-template
commit 1d16af689195ad57144846f2eed31faeea5f528b
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Thu Aug 24 13:55:09 2023 +0300
corrected field for initiative retrieval
commit 3c20f12f8bc9b7719eb14f31c5b132f97153f8d8
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Aug 24 12:40:26 2023 +0300
fix/Add project_id to setNewItem
commit 66a19cd81a4bd3b4256770debd4570cb4127e2e2
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Thu Aug 24 10:41:34 2023 +0300
feat/Add project id to the setNewItem request
commit a90f51a6c80f4ecc534ed2b9e8aede164aac7f74
Merge: 2b8e2c13 f9f95a23
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Thu Aug 24 09:58:37 2023 +0300
Merge branch 'dev' into feature/168739/improve-notification-email-template
commit 2b8e2c13c68cd1e814dd0d4db2914efbc8d86cee
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Thu Aug 24 09:55:02 2023 +0300
project field can be blank in tag object
commit 62836fac3973a647a2e4cad2b8cb55fb06d53987
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Thu Aug 24 09:50:09 2023 +0300
included initiative url in tag approval/decline email
commit 8566b1da1c3c99436502f922a9b095945ef2f4af
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 23 13:26:48 2023 +0300
chore/Manage migration files to avoid issues with reorder_stages and add_taxonomies script
commit 5b922baf985fcbdfd2a0442368214e0bc4d6eef8
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Wed Aug 23 11:51:23 2023 +0300
changed name of project field
commit af2a9b9b9225b5d58e0a41144796b0dd6822899a
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Wed Aug 23 11:39:51 2023 +0300
added missing 'on_delete'
commit 45f3692a417e75d4454339979dd74926c9e1920e
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Wed Aug 23 11:24:43 2023 +0300
changed name of project field
commit 298368f6d02cdf344cdb882a6b42e3b3931e201e
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Tue Aug 22 15:47:23 2023 +0300
added project field in all tag models
commit aac75bac34304ea41cc700591063fbbd98b07564
Merge: 0b05a3ad f9f95a23
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Aug 22 13:54:16 2023 +0300
Merge branch 'dev' into feature/168814/active-directory-synchronization
commit f9f95a2376fbeeae19676c3ff2d34af4c3457414
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Aug 22 13:52:12 2023 +0300
chore/Update DEPLOY_VERSION to 3.8.0
commit 0b05a3ad5a16bae752ca6c96e8ba97fe8d892b35
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Aug 22 13:07:03 2023 +0300
feat/Add django migration file for DeltaLink model
commit 24c8eebe6a27a54ac814b4356cfa2ddc7ce8d188
Merge: 290bd3b1 168b313e
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Aug 22 12:46:27 2023 +0300
Merge branch 'dev' into feature/168814/active-directory-synchronization
commit 290bd3b1ce50b736f2a821a0ef5faafa2781e9ac
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Tue Aug 22 11:47:21 2023 +0300
fix/Minor fixed to deltalinks functionality
- Resolve models import issue.
- Change auto_now to auto_now_on since this value won't be updated
- Change property link to url to match the model
commit 168b313e4bf89e593f11d23ffa5b4b64d33e7b97
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Tue Aug 22 11:04:36 2023 +0300
Feature/165116/tag request notification (#219)
* added new field to models
* relocated email settings in settings.py so we can test emails locally
* added the needed info for approval/decline emails
* updated email template
* removed redundant variable
* add and fix migration files
* move the comment box
* fix the location of comment box
* corrected field names
* changed subject text, added name variable for email
* updated email template
* removed empty line before comment
* made comment in bold
* fixed overflowing text on comment
---------
Co-authored-by: SWORDGROUP\alafazanidi <alexandra.lafazanidi@sword-group.com>
commit b2fda1d477474e05fdb3f08116c47d4bf1cac184
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Mon Aug 21 17:43:29 2023 +0300
enriched email template with tag details
commit d420577b50941db6ddb0787ce64b9ba68b76faee
Merge: e4b9ce49 7d0fb767
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 21 17:39:22 2023 +0300
Merge branch 'dev' into feature/168814/active-directory-synchronization
commit 7d0fb767cf1585eb001113f57f2a9629b0a17bcc
Author: mgaliatsatou <122973661+mgaliatsatou@users.noreply.github.com>
Date: Mon Aug 21 15:52:50 2023 +0300
Feature/165116/tag request notification (#218)
* added new field to models
* relocated email settings in settings.py so we can test emails locally
* added the needed info for approval/decline emails
* updated email template
* removed redundant variable
* add and fix migration files
* move the comment box
* fix the location of comment box
* corrected field names
* changed subject text, added name variable for email
* updated email template
---------
Co-authored-by: SWORDGROUP\alafazanidi <alexandra.lafazanidi@sword-group.com>
commit e4b9ce49a2b0449c1a3d75be0e5634292f063a44
Merge: a7cf44b4 0142d412
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Mon Aug 21 13:40:20 2023 +0300
Merge branch 'dev' into feature/168814/active-directory-synchronization
commit a7cf44b4022ac9bf0dc591b58c101a2e537fd82e
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 9 12:27:35 2023 +0300
chore/Add minor comment to apps.py
commit 0e1bb8c306dea877f8950faf506cf9c7bf0f3514
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 9 11:34:11 2023 +0300
chore/Refactor process_aad_users method and DeltaLink model
- Add get_latest_link class method to DeltaLink model to fetch the latest deltalink from the db
- Refactor the save deltalink process in the process_aad_users method
commit 9aa8262e1150abff933ecb8342488ad175f1edb6
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 9 10:38:35 2023 +0300
chore/Refactor adapters.py to fit in the DeltaLinks logic
- Modify process_aad_users to check for deltalinks.
- Add support methods get_last_delta_link and save_delta_link to fetch and save deltalinks respectively.
commit f52c1bbe97d4a13be786d3bf2081b6509985a29c
Author: gkalomalos <georgios.kalomalos@sword-group.com>
Date: Wed Aug 9 10:37:05 2023 +0300
feat/Add new DeltaLink model to handle the deltalinks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Count last phase always as end phase
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Checklist: