-
-
Notifications
You must be signed in to change notification settings - Fork 690
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
webuipoc: UI implementation to reactWeb #5460
Conversation
This needs to integrate the latest changes. |
Ready for review: did code cleanup, conflicts resolve and rebase. |
Conflict resolved - Ready for review |
addOns/webuipoc/src/main/pocs/reactWebUI/src/Components/Sidebar/SidebarData.js
Outdated
Show resolved
Hide resolved
This PR is ready to review |
It has conflicts. Though that doesn't prevent review, but it'll need to be addressed before merge. |
Resolved them just now |
The build is failing. |
I am unable to understand the reason it's failing. |
Click checks, pick one of the failed jobs, look at the log. |
Its stating that |
Probably a bad merge commit. You'd be better off rebasing and addressing conflicts. |
The |
Re-doing |
I get the same error when trying to build this as per the CI build: |
Still failing to build :/ |
Fixed. |
Seems to have a ton of unrelated commits again. |
I'm struggling with rebase, can you tell me exact way or cmds to get this done |
To provide commands to fix it I'll have to clone it later and try. As for rebasing, the normal process is:
|
If I know no one else has changed the code I'm working on then I just do a mixed reset, not sure if thats good practice or not.. |
I can't seem to figure out what you've done 😞 |
There are so many conflicts :( I am trying to resolve in rebase for past 30 mins or so, any other solution I can try to fix this? |
Don't worry about the commits. |
The build is failing due to changes in other add-ons |
any idea how to get this done , I've tried npm i and npm ci |
Nice work. Glad you got this passing again! |
Signed-off-by: Moeez Ahmed <118293110+Moeez905@users.noreply.github.com>
Signed-off-by: Moeez Ahmed <118293110+Moeez905@users.noreply.github.com>
Signed-off-by: Moeez Ahmed <x311099@gmail.com>
IMO the tree should look like more the Sites tree (or the |
addOns/webuipoc/src/main/pocs/reactWebUI/src/Components/Accordion/AccordionData.jsx
Outdated
Show resolved
Hide resolved
addOns/webuipoc/src/main/pocs/reactWebUI/src/Components/SearchBar/SearchBar.jsx
Outdated
Show resolved
Hide resolved
Signed-off-by: Moeez Ahmed <x311099@gmail.com>
Signed-off-by: Moeez Ahmed <x311099@gmail.com>
Thank you! |
Eslint configured in our Zap React App.
Issue Reference:
#8287.