-
Notifications
You must be signed in to change notification settings - Fork 4.5k
chore: git mod - connect modal and branches #38171
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
Merged
Merged
Changes from all commits
Commits
Show all changes
101 commits
Select commit
Hold shift + click to select a range
1119f65
chore: adding apis for git
2900b65
fix: review changes
0d1fa18
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
146238c
fix: fixing enum imports
e72e02f
chore: changing named export to default export
54b5d93
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
a1b608b
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
0bb662f
fix: adding saga for commit and connect
d7e6c79
chore: adding global profile and config redux slice
02e128b
chore: adding saga for git profile update
3218b3a
chore: adding fetch branches saga
f9c4030
chore: adding fetch and update local profile
adafd14
fix: fixing connectsaga
488b346
fix: review changes
942193d
chore: adding branch based sagas
e9167f2
fix: moving things around
d024160
chore: adding ctx
ef34582
chore: expanding context provider and making contextaware comps
c3d9a31
fix: remove gittest
fa8c461
chore: adding init sagas
9b1414e
fix: test fixes
2de337e
fix: review changes
40f057e
Merge branch 'chore/git-mod-5' of github.com:appsmithorg/appsmith int…
826dbf8
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
3a47055
chore: adding autocommit to saga
ca19474
fix: adding relevant selectors for quick git actions
3a2a045
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
59f91f4
fix: resolving conflict errors
e1eb35a
fix: review changes
3c4a4c2
Merge branch 'chore/git-mod-5' of github.com:appsmithorg/appsmith int…
fbcf6ae
fix: fixing test cases
56cbaef
fix: fixing more test cases
f8545b4
fix: changing AxiosResponse to AxiosPromise
65e9ea6
fix: fixing build and naming issues
2b7c3d2
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
f613ae1
fix: remove expect error
adddd08
chore: adding git ops modal
c6343d3
fix: arranging dumb components in a better fashion
c5c9585
fix: adding conflicterror and conflicterrormodal
c5b8cf3
fix: adding pull sagas
bcef9f5
chore: adding deploy tab
0e84fb8
chore: adding merge tab
c88bc0b
fix: review changes
885446c
Merge branch 'chore/git-mod-6' of github.com:appsmithorg/appsmith int…
e106d43
fix: better handling of ctx values
005a655
fix: minor fixes to merge comp
ba6ac37
chore: adding skeleton for status
54ac997
chore: adding status component and transformer
8c310af
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
523296b
fix: adding autocommit statusbar
8745497
Merge branch 'chore/git-mod-7' of github.com:appsmithorg/appsmith int…
9d57e5a
chore: adding git settings modal
44167c0
chore: wip - git settings modal
f698d26
fix: fixing error handling
245cb9b
chore: minor changes in error handling
cc35140
chore: review fixes
1b1da07
Merge branch 'chore/git-mod-7' of github.com:appsmithorg/appsmith int…
8dc482f
fix: review comments
e70f659
Merge branch 'chore/git-mod-7' of github.com:appsmithorg/appsmith int…
801b06b
chore: minor fixes for build failures
b4f8925
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
ec461fd
chore: review fixes
7f54647
Merge branch 'chore/git-mod-7' of github.com:appsmithorg/appsmith int…
b997ada
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
a569b22
chore: shifting fixes from ee to ee
f715c2a
fix: minor fixes
1273fc6
chore: adding initial state
0be3210
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
2953823
chore: renaming files
2be8c89
fix: minor
e1588c9
chore: fixes build issue
008f857
chore: adding branch protection
fe620bd
chore: adding local profile
d8dca7f
fix: issue with localprofile
e23819b
chore: adding general tab
a7f5832
chore: added disconnect modal
7b48aa2
chore: adding disable autocommit modal
57aa219
chore: adding disconnect and toggle autocommit saga
612c35a
chore: adding base for CD
ee50685
chore: moving things around
e20e0a2
chore: adding minor fixes
b16bf38
chore: adding connect first draft
34f7a00
chore: adding logic for connect modal
a71a664
chore: adding fixes
5e40b10
chore: review comment fix
3921112
chore: adding branch popup
9071d0e
chore: wip ce-ee split
6314fe2
chore: additional ee files
8d077c8
chore: wip more ce-ee split
56f05cf
chore: removing old ee folder
24d5e1c
Merge branch 'chore/git-mod-8' of github.com:appsmithorg/appsmith int…
546fd66
chore: conflict errors
bbbee85
chore: fix branch list
52b5c4f
chore: adding ff
f789c5a
chore: unlicensed cd
062e19a
Merge branch 'chore/git-mod-8' of github.com:appsmithorg/appsmith int…
a6529bc
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
bc6b90e
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
243f299
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
5d758ca
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
34d96b4
chore: fixing typo
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
app/client/src/git/ce/components/ContinuousDelivery/index.tsx
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| import React from "react"; | ||
| import CDUnLicnesed from "./CDUnLicensed"; | ||
| import CDUnLicensed from "./CDUnLicensed"; | ||
|
|
||
| function ContinuousDelivery() { | ||
| return <CDUnLicnesed />; | ||
| return <CDUnLicensed />; | ||
| } | ||
|
|
||
| export default ContinuousDelivery; |
This file contains hidden or 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
This file contains hidden or 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
86 changes: 86 additions & 0 deletions
86
app/client/src/git/components/BranchList/BranchListHotKeys.tsx
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| import React from "react"; | ||
| import { Hotkey, Hotkeys, HotkeysTarget } from "@blueprintjs/core"; | ||
|
|
||
| interface Props { | ||
| handleUpKey: () => void; | ||
| handleDownKey: () => void; | ||
| handleSubmitKey: () => void; | ||
| handleEscKey: () => void; | ||
| children: React.ReactNode; | ||
| } | ||
|
|
||
| @HotkeysTarget | ||
| class GlobalSearchHotKeys extends React.Component<Props> { | ||
| get hotKeysConfig() { | ||
| return [ | ||
| { | ||
| combo: "up", | ||
| onKeyDown: () => { | ||
| this.props.handleUpKey(); | ||
| }, | ||
| allowInInput: true, | ||
| group: "Branches", | ||
| label: "Move up the list", | ||
| }, | ||
| { | ||
| combo: "down", | ||
| onKeyDown: this.props.handleDownKey, | ||
| allowInInput: true, | ||
| group: "Branches", | ||
| label: "Move down the list", | ||
| }, | ||
| { | ||
| combo: "return", | ||
| onKeyDown: this.props.handleSubmitKey, | ||
| allowInInput: true, | ||
| group: "Branches", | ||
| label: "Submit", | ||
| }, | ||
| { | ||
| combo: "ESC", | ||
| onKeyDown: this.props.handleEscKey, | ||
| allowInInput: true, | ||
| group: "Branches", | ||
| label: "ESC", | ||
| }, | ||
| ]; | ||
| } | ||
|
|
||
| renderHotkeys() { | ||
| return ( | ||
| <Hotkeys> | ||
| {this.hotKeysConfig.map( | ||
| ({ allowInInput, combo, group, label, onKeyDown }, index) => ( | ||
| <Hotkey | ||
| allowInInput={allowInInput} | ||
| combo={combo} | ||
| global={false} | ||
| group={group} | ||
| key={index} | ||
| label={label} | ||
| onKeyDown={onKeyDown} | ||
| /> | ||
| ), | ||
brayn003 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| )} | ||
| </Hotkeys> | ||
| ); | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <div | ||
| style={{ | ||
| display: "flex", | ||
| flex: 1, | ||
| flexDirection: "column", | ||
| minHeight: 0, | ||
| overflow: "auto", | ||
| }} | ||
| > | ||
| {this.props.children} | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default GlobalSearchHotKeys; | ||
37 changes: 37 additions & 0 deletions
37
app/client/src/git/components/BranchList/BranchListItemContainer.tsx
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import styled from "styled-components"; | ||
|
|
||
| const BranchListItemContainer = styled.div<{ | ||
| isSelected?: boolean; | ||
| isActive?: boolean; | ||
| isDefault?: boolean; | ||
| }>` | ||
| padding: ${(props) => `${props.theme.spaces[4]}px`}; | ||
| margin: ${(props) => `${props.theme.spaces[1]}px 0`}; | ||
| color: var(--ads-v2-color-fg-emphasis); | ||
| cursor: pointer; | ||
| width: 100%; | ||
| height: 36px; | ||
| border-radius: var(--ads-v2-border-radius); | ||
| background-color: ${(props) => | ||
| props.isSelected || props.isActive ? "var(--ads-v2-color-bg-muted)" : ""}; | ||
| ${(props) => | ||
| !props.isActive && | ||
| `&:hover { | ||
| background-color: var(--ads-v2-color-bg-subtle); | ||
| }`} | ||
|
|
||
| display: flex; | ||
| align-items: center; | ||
|
|
||
| .branch-list-item-text { | ||
| white-space: nowrap; | ||
| overflow: hidden; | ||
| text-overflow: ellipsis; | ||
| display: flex; | ||
| align-items: center; | ||
| gap: 4px; | ||
| flex: 1; | ||
| } | ||
| `; | ||
|
|
||
| export default BranchListItemContainer; |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.