Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SDBELGA-778] fix: Show recurring Planning update method on Ignore|Cancel|Save modal #1930

Merged
merged 2 commits into from
Mar 15, 2024

Conversation

MarkLark86
Copy link
Collaborator

Also improve look and feel when rendering Event & Planning metadata in the modal

…ncel|Save modal

Also improve look and feel when rendering Event & Planning metadata in the modal
@MarkLark86 MarkLark86 added this to the 2.7 milestone Mar 14, 2024
@MarkLark86 MarkLark86 requested a review from tomaskikutis March 14, 2024 06:15
EVENTS.UPDATE_METHODS[0].value;
eventUpdates.update_method = eventUpdates.update_method == null ?
EVENTS.UPDATE_METHODS[0].value :
eventUpdates.update_method?.value ?? eventUpdates.update_method;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to defined type for update_method - it's a union of strings. It'd be best to either update the type or remove the logic where .value is accessed.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tomaskikutis These are the ulgy parts of the code that I was talking about in last night's Scrum. Some of the ItemActionModals provide the enableSaveInModal and update_method differently. IMO we can leave as is for now, as long as it works, until we refactor the modals in Planning

modalProps: IModalProps;
enableSaveInModal(): void;
resolve(item?: IEventItem): void;
enableSaveInModal?(): void;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this function is taken as prop and then unconditionally executed on componentDidMount - why not simply execute it in a parent component instead of passing a prop here?

@MarkLark86 MarkLark86 merged commit 4bdf221 into superdesk:release/2.7 Mar 15, 2024
17 checks passed
MarkLark86 added a commit that referenced this pull request Jun 19, 2024
* [SDBELGA-778] fix: Show recurring Planning update method on Ignore|Cancel|Save modal (#1930)

* [SDBELGA-778] fix: Show recurring Planning update method on Ignore|Cancel|Save modal
Also improve look and feel when rendering Event & Planning metadata in the modal

* fix(ci): Use superdesk/release/2.7 branch for test instance

* fix extension build error

* add new should_udpate func [SDCP-742] (#1963)

* add new should_udpate func [SDCP-742]

* update params

* refactore logic

* Onclusive parse new key for event status mapping [SDCP-749] (#1970)

* Onclusive parse new key for event status mapping [SDCP-749]

* address comment

* Fix content profile closing after canceling a groups' creation (#1964)

* implement onclusive reingesting (#1971)

SDCP-751

* drop angular-history (#1933)

* drop angular-history

* fix test build

* sync redux versions with client core

* update package-lock

* update events during ingest if name/subject changes

SDCP-751

* allow removing contact email/phone via update (#1979)

SDCP-762

* set expiry when parsing onclusive events (#1995)

* set expiry when parsing onclusive events

CPCN-825

* fix mypy

* bump version

* update ui framework version (#1997)

* fix ci

* Set version to 2.8.0-dev

---------

Co-authored-by: MarkLark86 <mark.pittaway@gmail.com>
Co-authored-by: Ketan <73937490+devketanpro@users.noreply.github.com>
Co-authored-by: Konstantin Markov <maga.ot.oz@protonmail.com>
MarkLark86 added a commit that referenced this pull request Jun 19, 2024
… schema (#1996)

* Bump coverage from 7.5.1 to 7.5.3 (#1994)

Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.5.1 to 7.5.3.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](nedbat/coveragepy@7.5.1...7.5.3)

---
updated-dependencies:
- dependency-name: coverage
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update interfaces

* Update redux reducers

* Update redux selectors

* Update redux actions

* Update websocket notification handling

* Update internal PlanningAPI

* Update UI components

* Update utils

* Update package-lock.json

* fix unit test

* Add comment to IPlanningRelatedEventLinkType interface, update variable name

* merging `release/2.7` to develop (#1998)

* [SDBELGA-778] fix: Show recurring Planning update method on Ignore|Cancel|Save modal (#1930)

* [SDBELGA-778] fix: Show recurring Planning update method on Ignore|Cancel|Save modal
Also improve look and feel when rendering Event & Planning metadata in the modal

* fix(ci): Use superdesk/release/2.7 branch for test instance

* fix extension build error

* add new should_udpate func [SDCP-742] (#1963)

* add new should_udpate func [SDCP-742]

* update params

* refactore logic

* Onclusive parse new key for event status mapping [SDCP-749] (#1970)

* Onclusive parse new key for event status mapping [SDCP-749]

* address comment

* Fix content profile closing after canceling a groups' creation (#1964)

* implement onclusive reingesting (#1971)

SDCP-751

* drop angular-history (#1933)

* drop angular-history

* fix test build

* sync redux versions with client core

* update package-lock

* update events during ingest if name/subject changes

SDCP-751

* allow removing contact email/phone via update (#1979)

SDCP-762

* set expiry when parsing onclusive events (#1995)

* set expiry when parsing onclusive events

CPCN-825

* fix mypy

* bump version

* update ui framework version (#1997)

* fix ci

* Set version to 2.8.0-dev

---------

Co-authored-by: MarkLark86 <mark.pittaway@gmail.com>
Co-authored-by: Ketan <73937490+devketanpro@users.noreply.github.com>
Co-authored-by: Konstantin Markov <maga.ot.oz@protonmail.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Petr Jašek <jasekpetr@gmail.com>
Co-authored-by: Ketan <73937490+devketanpro@users.noreply.github.com>
Co-authored-by: Konstantin Markov <maga.ot.oz@protonmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants