IFC-598 - Rebase button on diff view #4215
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
Contributor
pa-lem
commented
Aug 28, 2024
•
pa-lem
commented
- Adds rebase button in diff view
- Moves the diff update button with the rebase button
- Always display reset filter button but disable it
- Rebase + trigger diff update on rebase action
pa-lem
added
type/feature
…FC-598-rebase-button
bilalabbad
reviewed
Aug 30, 2024
Comment on lines
119
to
129
| export const CloseBadgeUpdated = ({ className }: CloseBadgeProps) => { | ||
| return ( | ||
| <div | ||
| className={classNames( | ||
| "flex justify-center items-center absolute border-2 border-white -top-2 -right-2 bg-blue-200 text-blue-800 rounded-full", | ||
| className | ||
| )}> | ||
| <Icon icon="mdi:close" size={1} /> | ||
| </div> | ||
| ); | ||
| }; |
There was a problem hiding this comment.
these 3 components looks duplicated. Is it possible to only have 1, then having the other one by passing colors in className?
|
will merge, one of the two e2e test is failing due to nats being very slow but the other one is good to go |
ajtmccarty
pushed a commit
that referenced
this pull request
Aug 30, 2024
* add rebase button to rebase the branch + update the diff * disable filter button if no qsp * remove buttons hover effect if disabled * update reset filter UI * fix locators * add small close icons on badges for filters * fix padding * update filter locator * refactor close badges
pa-lem
added a commit
that referenced
this pull request
Sep 6, 2024
* Move credentials objects within the menu to the admin section * Remove mention of isolated mode in docs Fixes #3968 * diff lifecycle tests and bugs (#4168) * test and fix for bug when removed on main and updated on branch * diff merge integration test * more tests * confirm nodes added on branch are added * update path identifiers to match values expected by merge logic * more tests and bug fixes * fix query bug * formatting * add delete to integration test * final integration tests and bug fixes * UI improvement and cleaning on Search Anywhere (#4183) cleaning some old code reuse some component and utils functions Small UI update * Update on Diff tree UX/UI (#4180) * Pre-release 1 for Python SDK 0.13.0 (#4194) * IFC-264 - Diff refresh fix in branch details view (#4193) * fix branch props for branch view * display kind if no label provided * manually adds label for schema items * IFC-585 diff relationship cardinality (#4196) * IFC-585 add cardinality to diff relationship response in DiffTree * formatting * Update proposed change overview UI (#4190) - removed name and description on side card - Added description about comment and styled it as a comment - some cleaning of dead code - removed "comment added" toast because we already have a visual update of threads * IFC-597 - Handle error messages from context in apollo hook + update diff summary error state (#4195) * hide icon for diff summary error screen * add processErrorMessage function in context * enable context from hook options * enable className in error screen * disable alerts for diff summary if the branch is not found * Allow generators and artifacts to run on node without name attribute (#4187) * Use display label instead of name * Add changelog shard * Add support for using default_branch in git other than main * Diff updates for UI and E2E test (#4178) * update toggle button to be disabled * add new test for diff * uncomment diff trigger * update diff click * remove flaky verification * Update on Diff tree UX/UI (#4180) * update text locator for filters * update empty and loading states * update node titles to remove branches and give more space * update reload icon * udpate branche display * ui updtaes for branch display * add loading button for loading state to prevent UI clipping * update test * add disbaled filter buttons * fix disabled cursor * fix e2e * update reset filter condition * update locators * refresh also summary * improve lint and error message --------- Co-authored-by: Bilal ABBAD <bilal@opsmill.com> * IFC-604 - Update repositories fields (#4208) * add fields for read only and regular repo * update schema label typo * Set attribute source when assigning from number pools * IFC-601 set contains_conflict correctly on diff relationship element (#4216) * Add support for using partial_match queries with array variables (#4201) * update states filters (#4191) * add namespaces in number pool form object dropdown (#4212) * add unique for field in number pool form (#4213) * Add newsfragment for importing non main default branch Together with other PRs fixes #3435 * Use correct attribute names for update errors The model and model_attribute attributes on the number pools were renamed to node and node_attribute but this error message never changed. This PR fixes this mistake. * Remove unique_for from CoreNumberPool It was decided that we'd go with a different approach instead. * Fix number pool from_pool inconsistency * Update diff tree construction by using "parent" value of DiffTree query (#4199) * Add colors to generic repo dropdown choices * update from pool value in mutation (#4222) * IFC-587 track conflicts with an attribute instead of by ID (#4223) * IFC-587 track conflicts with an attribute instead of by ID * formatting * mode updates * update protocols again * Allow seaching by HFID using GraphQL (#4205) * [FIX] Fixed a bug prevent thread on proposed change overview (#4226) * [FIX] Edit form contains only relationship field of cardinality many if kind is Attribute or Parent (#4229) * Added test on getRelationshipsForForm func when create form * hide relationship field of cardinality many on edit form * IFC-598 - Rebase button on diff view (#4215) * add rebase button to rebase the branch + update the diff * disable filter button if no qsp * remove buttons hover effect if disabled * update reset filter UI * fix locators * add small close icons on badges for filters * fix padding * update filter locator * refactor close badges * IFC-583 improve diff labels (#4197) * IFC-583 allow getting a deleted node and its attributes * a little more unit test * IFC-583 include deleted node labels * fix unit test * add labels all over the place * finish adding more labels and testing * remove invalid conflicts during enrichment * include empty diffs in the coordinator to delete them if appropriate * fix action determination bug in cardinality one enricher * update types for leaf diff values to str | None * remove commented out code * update handling for cardinality one relationship diffs, add tests * mypy fixes * Revert "IFC-583 allow getting a deleted node and its attributes" This reverts commit 32e4bc9. * formatting * update labels without getting deleted nodes * fix un-reverted unit test * fix flappy test * npm audit: update lint-staged * Documentation for enhanced git integration (#4227) * Create placeholder for credentials * Update repository documentation following integration v2 * Update generator with new queries section * IFC-576 fields for untracked changes on DiffSummary and DiffTree (#4231) * IFC-583 allow getting a deleted node and its attributes * a little more unit test * IFC-583 include deleted node labels * fix unit test * Revert "IFC-583 allow getting a deleted node and its attributes" This reverts commit 32e4bc9. * update labels without getting deleted nodes * fix un-reverted unit test * IFC-576 add num_untracked_changes field to DiffTree * untracked fields for DiffSummary too * fix unit tests * Fix HFID when using generic relationship attributes (#4238) * make diff responses consistent with NULL vs being empty (#4242) * make diff responses consistent with NULL vs being empty * mypy fix * Fix idempotency for number pools * IFC-572 - Account permissions fix (#4230) * add is admin permission in hook + test for accounts * add permissions test * update isAdmin structure * update buttons component for account object * update adming message * update permissions messages * udpate permission message * remove log * IFC-613 - Form pool update cleanup (#4241) * fix clean up for same pool source * clean test * add override to display value in edit form * update from pool display test * 🔧 * add unit test * Apply a lock to DiffCoordinator._update_diffs() * Added counter and icon of checks conclusion on proposed change list (#4240) * Added counter on pc list tab * overflow on diff tree + tooltip * Added icon checks on pc list * adjust padding * fix typo * Apply correct relationship filter * Added help button on proposed change + update the way branches are on PC's header (#4251) * Differentiate when diff is empty vs when diff is being computed (#4247) * Rename Repository.admin_status -> internal_status Also adds missing order_weight * Fixed css issue on Time selector calendar when no datepicker is loaded (#4258) * ignore pkg_resources is deprecated as an API message in pytest config (#4256) * ignore pkg_resources is deprecated as an API message in pytest config * Add description in pyproject * Update Python packages ahead of 0.16 release (#4255) * UPdate all packages with poetry update * Pin pylint to 3.1 * Update neo4j driver and fastapi * fix message from usePermission * Move response parsing to query * IFC-618 fix diff relationship bug when conflicting changes with main changes after branch changes (#4244) * IFC-618 test that fails on root cause of the bug * IFC-618 fix bug in applying previous base values in DiffCalculator * mypy fix and remove comment * IFC-623 diff locking enhancements (#4263) * IFC-623 diff locking enhancements * add locked method to NATSLock * add unit test * add some debug logging statements * add exception handling for deleted proposed change * pylint exclusion * Added link to the related tab on each column of proposed change list (#4267) * e2e diff tests with better locking (#4264) * add cardnality in query * use node attribute for relationship one * udpate relationshiip structure for attribute * add more details in response * make relationships match attribute node diff * fix test with new UI * default open for items with conflicts * fix test with new UI * fix test after rebase * fix test * update test * avoid retry failure * increase timeout for diff update query * IFC-623 diff locking enhancements * add locked method to NATSLock * add unit test * add some debug logging statements * add exception handling for deleted proposed change * pylint exclusion --------- Co-authored-by: pa-lem <pa-lem@hotmail.fr> Co-authored-by: bilalabbad <bilal@opsmill.com> * Minor tutorial docs changes related to 'Integration with Git' * add diff conflict at the attribute level for value conflicts (#4253) * add cardnality in query * use node attribute for relationship one * udpate relationshiip structure for attribute * add more details in response * make relationships match attribute node diff * fix test with new UI * default open for items with conflicts * fix test with new UI * fix test after rebase * add diff conflict at the attribute level for value conflicts * remove HAS_VALUE conflict from the property * fix test * update test * avoid retry failure * increase timeout for diff update query * IFC-623 diff locking enhancements * add locked method to NATSLock * add unit test * add some debug logging statements * add exception handling for deleted proposed change * pylint exclusion * add conflict at top level if needed * add conflict badge in title for node attribute * update types and details * update toggle button ui * update conflict resolution ui * add diff conflict at the attribute level for value conflicts * remove HAS_VALUE conflict from the property * e2e test updates for new diff --------- Co-authored-by: pa-lem <pa-lem@hotmail.fr> Co-authored-by: bilalabbad <bilal@opsmill.com> * uncomment refetch --------- Co-authored-by: Patrick Ogenstad <patrick@ogenstad.com> Co-authored-by: Aaron McCarty <ajtmccarty@pm.me> Co-authored-by: Bilal ABBAD <bilal@opsmill.com> Co-authored-by: Guillaume Mazoyer <guillaume@opsmill.com> Co-authored-by: Baptiste <32564248+BaptisteGi@users.noreply.github.com> Co-authored-by: Damien Garros <dgarros@gmail.com> Co-authored-by: LucasG0 <lucas@opsmill.com> Co-authored-by: LucasG0 <44552904+LucasG0@users.noreply.github.com>
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.