search

opencrvs / opencrvs-core

A global solution to civil registration
https://www.opencrvs.org
Other
79 stars 58 forks source link

fix(null): update assignment check for unassign declaration #7276

Closed github-actions[bot] closed 1 day ago

github-actions[bot] commented 5 days ago

Automated PR to merge changes from develop to

I failed to cherry-pick the changes automatically because of the following:

  Auto-merging packages/auth/src/features/authenticate/service.ts
Auto-merging packages/commons/package.json
Auto-merging packages/commons/src/authentication.ts
CONFLICT (rename/delete): packages/auth/src/logger.ts renamed to packages/commons/src/logger.ts in dc318cf4c (only use hapi-pino in production, consolidate different logging modules under commons), but deleted in HEAD.
Auto-merging packages/commons/src/logger.ts
CONFLICT (add/add): Merge conflict in packages/commons/src/logger.ts
CONFLICT (rename/delete): packages/workflow/src/logger.ts renamed to packages/components/src/LoadingBar/index.ts in HEAD, but deleted in dc318cf4c (only use hapi-pino in production, consolidate different logging modules under commons).
CONFLICT (modify/delete): packages/components/src/LoadingBar/index.ts deleted in dc318cf4c (only use hapi-pino in production, consolidate different logging modules under commons) and modified in HEAD.  Version HEAD of packages/components/src/LoadingBar/index.ts left in tree.
CONFLICT (rename/delete): packages/config/src/config/logger.ts renamed to packages/components/src/hooks/index.ts in HEAD, but deleted in dc318cf4c (only use hapi-pino in production, consolidate different logging modules under commons).
CONFLICT (modify/delete): packages/components/src/hooks/index.ts deleted in dc318cf4c (only use hapi-pino in production, consolidate different logging modules under commons) and modified in HEAD.  Version HEAD of packages/components/src/hooks/index.ts left in tree.
Auto-merging packages/config/src/config/database.ts
Auto-merging packages/config/src/handlers/application/applicationConfigHandler.ts
Auto-merging packages/config/src/handlers/forms/formsHandler.ts
CONFLICT (content): Merge conflict in packages/config/src/handlers/forms/formsHandler.ts
Auto-merging packages/config/src/handlers/informantSMSNotifications/updateInformantSMSNotification/handler.ts
CONFLICT (rename/delete): packages/config/src/logger.ts renamed to packages/config/src/handlers/locations/location.ts in HEAD, but deleted in dc318cf4c (only use hapi-pino in production, consolidate different logging modules under commons).
CONFLICT (modify/delete): packages/config/src/handlers/locations/location.ts deleted in dc318cf4c (only use hapi-pino in production, consolidate different logging modules under commons) and modified in HEAD.  Version HEAD of packages/config/src/handlers/locations/location.ts left in tree.
Auto-merging packages/config/src/server.ts
CONFLICT (content): Merge conflict in packages/config/src/server.ts
Auto-merging packages/gateway/src/features/OIDPUserInfo/utils.ts
Auto-merging packages/gateway/src/features/user/root-resolvers.ts
CONFLICT (content): Merge conflict in packages/gateway/src/features/user/root-resolvers.ts
Auto-merging packages/gateway/src/server.ts
CONFLICT (content): Merge conflict in packages/gateway/src/server.ts
Auto-merging packages/gateway/src/utils/documents.ts
CONFLICT (content): Merge conflict in packages/gateway/src/utils/documents.ts
Auto-merging packages/metrics/src/config/database.ts
Auto-merging packages/metrics/src/features/performance/viewRefresher.ts
Auto-merging packages/metrics/src/influxdb/client.ts
Auto-merging packages/notification/src/database.ts
Auto-merging packages/notification/src/features/sms/service.ts
CONFLICT (content): Merge conflict in packages/notification/src/features/sms/service.ts
Auto-merging packages/search/src/config/routes.ts
Auto-merging packages/search/src/elasticsearch/dbhelper.ts
CONFLICT (content): Merge conflict in packages/search/src/elasticsearch/dbhelper.ts
Auto-merging packages/search/src/features/fhir/fhir-utils.ts
CONFLICT (content): Merge conflict in packages/search/src/features/fhir/fhir-utils.ts
Auto-merging packages/search/src/features/registration/birth/handler.ts
CONFLICT (content): Merge conflict in packages/search/src/features/registration/birth/handler.ts
Auto-merging packages/search/src/features/registration/death/handler.ts
CONFLICT (content): Merge conflict in packages/search/src/features/registration/death/handler.ts
Auto-merging packages/search/src/features/registration/deduplicate/service.ts
Auto-merging packages/search/src/features/registration/marriage/handler.ts
CONFLICT (content): Merge conflict in packages/search/src/features/registration/marriage/handler.ts
Auto-merging packages/search/src/features/search/handler.ts
Auto-merging packages/search/src/features/search/service.ts
CONFLICT (rename/delete): packages/metrics/src/logger.ts renamed to packages/search/src/utils/event.ts in HEAD, but deleted in dc318cf4c (only use hapi-pino in production, consolidate different logging modules under commons).
CONFLICT (modify/delete): packages/search/src/utils/event.ts deleted in dc318cf4c (only use hapi-pino in production, consolidate different logging modules under commons) and modified in HEAD.  Version HEAD of packages/search/src/utils/event.ts left in tree.
Auto-merging packages/user-mgnt/src/database.ts
Auto-merging packages/user-mgnt/src/features/createUser/handler.ts
Auto-merging packages/user-mgnt/src/features/createUser/service.ts
Auto-merging packages/user-mgnt/src/features/updateUser/handler.ts
Auto-merging packages/user-mgnt/src/features/userSearchRecord/handler.ts
Auto-merging packages/webhooks/src/database.ts
Auto-merging packages/workflow/src/features/registration/fhir/fhir-bundle-modifier.ts
CONFLICT (content): Merge conflict in packages/workflow/src/features/registration/fhir/fhir-bundle-modifier.ts
Auto-merging packages/workflow/src/features/registration/fhir/fhir-utils.ts
Auto-merging packages/workflow/src/records/handler/download.ts
CONFLICT (content): Merge conflict in packages/workflow/src/records/handler/download.ts
error: could not apply dc318cf4c... only use hapi-pino in production, consolidate different logging modules under commons

To continue manually you can use these commands:

  git fetch origin auto-pr--7072-11640:auto-pr--7072-11640
  git fetch origin ocrvs-7035:ocrvs-7035

  git checkout auto-pr--7072-11640
  git reset --hard HEAD~1  # Remove placeholder commit
  git cherry-pick 5c2a411adcb1f378cc64c5485fe9769b86223550..629245cc003be75cbb9729c84e94c5883d6d541f
Zangetsu101 commented 1 day ago

Closing in favor of #7280