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

Dev to main sync #968

Merged
merged 8 commits into from
Oct 31, 2023
Merged

Dev to main sync #968

merged 8 commits into from
Oct 31, 2023

Conversation

sahsisunny
Copy link
Contributor

@sahsisunny sahsisunny commented Oct 26, 2023

PR Number(s):-

Developer name:- @skv93-coder @anishpawaskar

Backend changes

  • Yes
  • No

Frontend Changes

  • Yes
  • No

Is Under Feature Flag

  • [] Yes
  • No

Database changes

  • Yes
  • No

Breaking changes (If your feature is breaking/missing something please mention pending tickets)

  • Yes
  • No

Deployment notes
Any special instructions for the deployment - No

Tested in staging

  • Yes
  • No

List of PRs going in this Sync.

Also attach their screenshots.
Task status without feature flag
image

Idle users :-
note: we don't have any idle user on staging so added dev screenshot
Idle Users _ Status Real Dev Squad _ Status Real Dev Squad - Google Chrome 31-10-2023 13_14_13

Removed filter
image

@vercel
Copy link

vercel bot commented Oct 26, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
status-app ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 31, 2023 6:21pm

…tatus tabs (#923)

* Removed the task filter copy on status site, (ie) tabs section for larger devices and Select dropdown task filter for smaller devices are removed

Signed-off-by: Aneena John Xavier <[email protected]>

* Test case fixes:

- Fixed failing test cases for seacrch button handler and input search
  param handling test cases on tasks pages
- Removed test cases corresponding to tabs component.
- Removed unneccesary import and variables corresponding to Tabs
  component in TasksContent.tsx
- css classes removed for the same in tasks scss module

Signed-off-by: Aneena John Xavier <[email protected]>

* Removed loggers for debuggers in test cases

Signed-off-by: Aneena John Xavier <[email protected]>

* Resolved conflicts

Signed-off-by: Aneena John Xavier <[email protected]>

* Updated search btn handler test case as it was getting called twice on single click on test

Signed-off-by: Aneena John Xavier <[email protected]>

* Feature flag updates for second status tabs:

- The secondary dropdown will be rendered on UI only with feature flag
  (ie) when dev is passed as true in queryparam `?dev=true`
- Updated task container css to compensate for the width reduction when the secondary status
  tab is removed.
- Test cases updated to test the secondary tabs only when dev is true

Signed-off-by: Aneena John Xavier <[email protected]>

* Removed commented tests

Signed-off-by: Aneena John Xavier <[email protected]>

* Merged changes from develop branch and updated the feature flag to not render secondary tabs

Signed-off-by: Aneena John Xavier <[email protected]>

* fix- testing fix for failing testcase on git pipeline for taskdetail title and desc should not with same values case

Signed-off-by: Aneena John Xavier <[email protected]>

* Replace null with react fragment to handle the false condition

Signed-off-by: Aneena John Xavier <[email protected]>

* Updated testcases title

Signed-off-by: Aneena John Xavier <[email protected]>

* deleted unnecessary constant file for task as this was added to resolve conflicts in the early stages

* chore: Restructure media queries on tasks module

Signed-off-by: Aneena John Xavier <[email protected]>

---------

Signed-off-by: Aneena John Xavier <[email protected]>
Co-authored-by: Aneena John Xavier <[email protected]>
Co-authored-by: Sunny Sahsi <[email protected]>
* fix getIdleSinceText function

* Update src/helperFunctions/getIdleSinceText.ts

Co-authored-by: Shubham Kumar Singh <[email protected]>

* Update src/helperFunctions/getIdleSinceText.ts

* Update src/helperFunctions/getIdleSinceText.ts

* Update src/helperFunctions/getIdleSinceText.ts

* Update src/helperFunctions/getIdleSinceText.ts

* refactor code

* change variable name

---------

Co-authored-by: Yash Raj <[email protected]>
Co-authored-by: Shubham Kumar Singh <[email protected]>
Co-authored-by: Achintya Chatterjee <[email protected]>
Copy link
Contributor

@shubhamsinghbundela shubhamsinghbundela left a comment

Choose a reason for hiding this comment

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

I am seeing @Ajeyakrishna-k @aneenajohn changes
please ask them to fill the form

@Ajeyakrishna-k
Copy link
Contributor

I am seeing @Ajeyakrishna-k @aneenajohn changes please ask them to fill the form

My changes are already in prod.

@iamitprakash iamitprakash merged commit 9ba8939 into main Oct 31, 2023
1 check passed
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.

7 participants