Merge pull request #38 from dhis2/fix/status-tag-states

fix(status-tag): remove unused status tag states and add APPROVED_ABOVE
dhis2 · Aug 10, 2021 · edee42c · edee42c
2 parents b6dcde7 + e175523
commit edee42c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/src/shared/status-tag/get-tag-display-data.js b/src/shared/status-tag/get-tag-display-data.js
@@ -13,15 +13,14 @@ import { Approved, Ready, Waiting } from './icons.js'
 const getTagDisplayData = approvalState => {
     switch (approvalState) {
         case 'APPROVED_HERE':
-        case 'APPROVED_ELSEWHERE':
+        case 'APPROVED_ABOVE':
             return {
                 icon: Approved,
                 displayName: i18n.t('Approved'),
                 type: 'positive',
             }
 
         case 'ACCEPTED_HERE':
-        case 'ACCEPTED_ELSEWHERE':
             return {
                 icon: Ready,
                 displayName: i18n.t('Ready for approval and accepted'),
@@ -36,7 +35,6 @@ const getTagDisplayData = approvalState => {
             }
 
         case 'UNAPPROVED_WAITING':
-        case 'UNAPPROVED_ELSEWHERE':
         case 'UNAPPROVED_ABOVE':
             return {
                 icon: Waiting,

diff --git a/src/shared/status-tag/get-tag-display-data.test.js b/src/shared/status-tag/get-tag-display-data.test.js
@@ -9,9 +9,7 @@ describe('getTagDisplayData', () => {
             type: 'positive',
         }
         expect(getTagDisplayData('APPROVED_HERE')).toEqual(expectedDisplayData)
-        expect(getTagDisplayData('APPROVED_ELSEWHERE')).toEqual(
-            expectedDisplayData
-        )
+        expect(getTagDisplayData('APPROVED_ABOVE')).toEqual(expectedDisplayData)
     })
     it('returns "ready for approval and accepted" display data for the correct approval states', () => {
         const expectedDisplayData = {
@@ -20,9 +18,6 @@ describe('getTagDisplayData', () => {
             type: 'neutral',
         }
         expect(getTagDisplayData('ACCEPTED_HERE')).toEqual(expectedDisplayData)
-        expect(getTagDisplayData('ACCEPTED_ELSEWHERE')).toEqual(
-            expectedDisplayData
-        )
     })
     it('returns "ready for approval" display data for the correct approval states', () => {
         const expectedDisplayData = {
@@ -43,9 +38,6 @@ describe('getTagDisplayData', () => {
         expect(getTagDisplayData('UNAPPROVED_WAITING')).toEqual(
             expectedDisplayData
         )
-        expect(getTagDisplayData('UNAPPROVED_ELSEWHERE')).toEqual(
-            expectedDisplayData
-        )
         expect(getTagDisplayData('UNAPPROVED_ABOVE')).toEqual(
             expectedDisplayData
         )

diff --git a/src/shared/status-tag/status-tag.js b/src/shared/status-tag/status-tag.js
@@ -16,12 +16,10 @@ const StatusTag = ({ approvalState }) => {
 StatusTag.propTypes = {
     approvalState: PropTypes.oneOf([
         'APPROVED_HERE',
-        'APPROVED_ELSEWHERE',
+        'APPROVED_ABOVE',
         'ACCEPTED_HERE',
-        'ACCEPTED_ELSEWHERE',
         'UNAPPROVED_READY',
         'UNAPPROVED_WAITING',
-        'UNAPPROVED_ELSEWHERE',
         'UNAPPROVED_ABOVE',
         'UNAPPROVABLE',
     ]),