LF-4562 remove unused animal sections #3539

antsgar · 2024-11-20T00:49:23Z

Description

Removed Locations and Groups sections in Animals module. Animals now doesn't have subsections in the main menu.
Removed group relations from animal and batch models, and removed code related to animals from animal/batch controllers and tests.
Removed group routes from API.
Removed group column and group filters from inventory UI, group name text field from animal creation flow, and all other group related code from the UI.
Removed "Clone" and "Add to group" actions from action menu.

Jira link:
https://lite-farm.atlassian.net/browse/LF-4562

Type of change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

Passes test case
UI components visually reviewed on desktop view
UI components visually reviewed on mobile view
Other (please explain)

Checklist:

I have commented my code, particularly in hard-to-understand areas
My changes generate no new warnings
I have added tests that prove my fix is effective or that my feature works
New and existing unit tests pass locally with my changes
The precommit and linting ran successfully
I have added or updated language tags for text that's part of the UI
I have added "MISSING" for all new language tags to languages I don't speak
I have added the GNU General Public License to all new files

Duncan-Brain · 2024-11-20T16:06:37Z

Wondering if we can comment out backend stuff too? It might be nice to prevent insertions on group table on all api accessible routes. Just so when we return to it we have a guaranteed clean db.

antsgar · 2024-11-20T16:18:28Z

@Duncan-Brain yeah for sure, are you referring to the group related routes? I can comment out those.

Duncan-Brain · 2024-11-20T16:27:55Z

Those yes, but it is also possible to add groups on add/edit animals/batches. I am not sure whether the noInsert option or removing model relations, or removing controller logic would be best.

Duncan-Brain · 2024-12-04T19:19:45Z

@antsgar so far seeing 'groups' in the withGraphFetched() expression in taskController. That is the main error I see in the log. Will test and see if thats it.

Heres the fix for merg into this: #3563

…ns-b Fix broken tests by removing groups from eager expression

antsgar · 2024-12-04T21:18:18Z

packages/webapp/src/containers/Animals/Inventory/index.tsx

@@ -422,9 +403,7 @@ export default function AnimalInventory({
  };

  const iconActions: iconAction[] = [
-    { label: t(`common:ADD_TO_GROUP`), iconName: 'ADD_ANIMAL', onClick: () => ({}) },
    { label: t(`common:CREATE_A_TASK`), iconName: 'TASK_CREATION', onClick: () => ({}) },


Kept this one because I added the feature on #3564

kathyavini

Has a merge conflict but it looks good to me!

Is there a difference between the tests that were skipped vs the ones deleted?

antsgar · 2024-12-05T14:39:50Z

@kathyavini I deleted all the logic related to groups from the animal/batch controllers and models (I was initially going to comment it out but thought it might end up being too confusing for future readers), and so since that functionality no longer exists in the code I removed the associated tests as well. For groups, I kept the routes, controller and model and so I kept the tests. Not sure if this makes total sense though, I wasn't sure! I could also just skip the test that was entirely removed on the animal test file

kathyavini

so since that functionality no longer exists in the code I removed the associated tests as well

That distinction makes sense to me!

SayakaOno

Just one thing to revert!
Could we keep the translations? I would feel bad for the translators if they had to translate the same strings again...

SayakaOno · 2024-12-05T17:58:32Z

packages/webapp/src/App.jsx


 function App() {
  const [isCompactSideMenu, setIsCompactSideMenu] = useState(false);
  const [isFeedbackSurveyOpen, setFeedbackSurveyOpen] = useState(false);
-  const FULL_WIDTH_ROUTES = ['/map', ANIMALS_INVENTORY_URL, ANIMALS_URL];
+  const FULL_WIDTH_ROUTES = ['/map', ANIMALS_INVENTORY_URL];


We need ANIMALS_URL to make the animal details view full width ;)

Good call!!

Duncan-Brain

Awesome thanks for doing this!

Edit: saw Sayaka is also reviewing haha ... undo my approval!

Question: should we immediately make a "revert" PR for future us?

Duncan-Brain · 2024-12-05T18:23:55Z

packages/webapp/src/containers/Animals/Inventory/useAnimalInventory.tsx

@@ -43,17 +41,15 @@ import { useSelector } from 'react-redux';
 import { locationsSelector } from '../../locationSlice';
 import { Location } from '../../../types';

-export type AnimalInventory = {
+export type AnimalInventoryItem = {


Thanks for improving this!

kathyavini · 2024-12-05T19:50:00Z

Question: should we immediately make a "revert" PR for future us?

@Duncan-Brain Aren't we doing a sensors release before we add anything to animals, though?

@antsgar you have another conflict, sorry. At this point it feels like every merge is a conflict in three other PRs 😅

Duncan-Brain · 2024-12-05T19:56:39Z

@kathyavini yeah, just asking if we should make a PR -- not merge it. Probably answer is no haha

antsgar · 2024-12-05T22:06:14Z

@Duncan-Brain it'd be pretty easy to create one with a revert commit from the merge commit once this is merged, so I think we could do that when the time comes!

@SayakaOno I readded the translation strings, good call ☺️ this is ready for re-reviews I think

remove unused animal sections

262c869

antsgar requested review from a team as code owners November 20, 2024 00:49

antsgar requested review from Duncan-Brain and SayakaOno and removed request for a team November 20, 2024 00:49

antsgar marked this pull request as draft November 20, 2024 17:18

antsgar added 7 commits December 2, 2024 19:18

remove groups

7c6a879

remove animals menu subsections

7123453

Merge branch 'integration' into remove-unused-animal-sections

d5fd9cc

Merge branch 'integration' into remove-unused-animal-sections

605e03e

fix missing url

d6cbd54

fix filtered inventory

66dbf33

skip group tests

fbbd66a

antsgar changed the title ~~remove unused animal sections~~ LF-4562 remove unused animal sections Dec 3, 2024

skip group tests

e1922e4

Duncan-Brain and others added 3 commits December 4, 2024 14:28

Fix broken tests by removing groups from eager expression

a34f784

Merge pull request #3563 from LiteFarmOrg/remove-unused-animal-sectio…

ec99adb

…ns-b Fix broken tests by removing groups from eager expression

remove additional actions from action menu

2c6e921

antsgar marked this pull request as ready for review December 4, 2024 21:14

antsgar mentioned this pull request Dec 4, 2024

LF-4482 support creating task from animal inventory (nice to have) #3564

Merged

16 tasks

antsgar commented Dec 4, 2024

View reviewed changes

kathyavini previously approved these changes Dec 5, 2024

View reviewed changes

Merge branch 'integration' into remove-unused-animal-sections

6127ab2

antsgar dismissed kathyavini’s stale review via 6127ab2 December 5, 2024 14:44

kathyavini previously approved these changes Dec 5, 2024

View reviewed changes

SayakaOno reviewed Dec 5, 2024

View reviewed changes

Duncan-Brain previously approved these changes Dec 5, 2024

View reviewed changes

Duncan-Brain reviewed Dec 5, 2024

View reviewed changes

Duncan-Brain self-requested a review December 5, 2024 18:27

antsgar added 3 commits December 5, 2024 18:48

Merge branch 'integration' into remove-unused-animal-sections

a0f371b

readd animals url

42fe754

readd translations

e18b86c

antsgar dismissed stale reviews from Duncan-Brain and kathyavini via e18b86c December 5, 2024 22:05

antsgar requested review from SayakaOno and kathyavini December 5, 2024 22:06

SayakaOno approved these changes Dec 5, 2024

View reviewed changes

kathyavini added this pull request to the merge queue Dec 5, 2024

Merged via the queue into integration with commit f1db435 Dec 5, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

LF-4562 remove unused animal sections #3539

LF-4562 remove unused animal sections #3539

antsgar commented Nov 20, 2024 •

edited

Loading

Duncan-Brain commented Nov 20, 2024

antsgar commented Nov 20, 2024

Duncan-Brain commented Nov 20, 2024

Duncan-Brain commented Dec 4, 2024 •

edited

Loading

antsgar Dec 4, 2024

kathyavini left a comment

antsgar commented Dec 5, 2024

kathyavini left a comment

SayakaOno left a comment

SayakaOno Dec 5, 2024

antsgar Dec 5, 2024

Duncan-Brain left a comment •

edited

Loading

Duncan-Brain Dec 5, 2024

kathyavini commented Dec 5, 2024

Duncan-Brain commented Dec 5, 2024

antsgar commented Dec 5, 2024

LF-4562 remove unused animal sections #3539

LF-4562 remove unused animal sections #3539

Conversation

antsgar commented Nov 20, 2024 • edited Loading

Duncan-Brain commented Nov 20, 2024

antsgar commented Nov 20, 2024

Duncan-Brain commented Nov 20, 2024

Duncan-Brain commented Dec 4, 2024 • edited Loading

antsgar Dec 4, 2024

Choose a reason for hiding this comment

kathyavini left a comment

Choose a reason for hiding this comment

antsgar commented Dec 5, 2024

kathyavini left a comment

Choose a reason for hiding this comment

SayakaOno left a comment

Choose a reason for hiding this comment

SayakaOno Dec 5, 2024

Choose a reason for hiding this comment

antsgar Dec 5, 2024

Choose a reason for hiding this comment

Duncan-Brain left a comment • edited Loading

Choose a reason for hiding this comment

Duncan-Brain Dec 5, 2024

Choose a reason for hiding this comment

kathyavini commented Dec 5, 2024

Duncan-Brain commented Dec 5, 2024

antsgar commented Dec 5, 2024

antsgar commented Nov 20, 2024 •

edited

Loading

Duncan-Brain commented Dec 4, 2024 •

edited

Loading

Duncan-Brain left a comment •

edited

Loading