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

HCM Admin Console v0.3 & Microplan v0.1 Release UI Code changes #1823

Merged
merged 519 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
519 commits
Select commit Hold shift + click to select a range
be26161
fixed assumption audit fixes (#1758)
Swathi-eGov Nov 6, 2024
e9849a8
fixed draft issue of Setup campaign (#1757)
Bhavya-egov Nov 6, 2024
8e9c5a9
Summary css fix (#1755)
rachana-egov Nov 7, 2024
729a249
Breadcrumb for usermanagement (#1761)
abishekTa-egov Nov 7, 2024
40282f5
Finalised microplan download (#1762)
ashish-egov Nov 7, 2024
48c5847
fixed HCMPRE-776 and removed updated old validation (#1763)
Bhavya-egov Nov 7, 2024
cd68a5a
fix key (#1764)
nabeelmd-eGov Nov 7, 2024
9e83a2e
Fixed UiCustomisation Digit issue (#1766)
ashish-egov Nov 7, 2024
74949f3
Fixed double selection of boundaries (#1765)
ashish-egov Nov 7, 2024
0b6af4c
Fixed loader,breadcrumb,table cells css and added placeholder text fo…
Swathi-eGov Nov 7, 2024
2760c50
fixed targetvalidation and added no results in boundary (#1768)
Bhavya-egov Nov 7, 2024
a5d7c67
Dynamic column pop inbox (#1770)
rachana-egov Nov 7, 2024
2cecab5
Feature/bug (#1773)
suryansh-egov Nov 7, 2024
8161371
Updated the search dropdown (#1776)
rachana-egov Nov 7, 2024
1fdc55b
Info ToolTip added (#1775)
ashish-egov Nov 8, 2024
d20fccd
Vesrion update (#1778)
Swathi-eGov Nov 8, 2024
1c7965e
myMicroplanFixes (#1777)
nabeelmd-eGov Nov 8, 2024
6eb526a
Updated date formate (#1779)
rachana-egov Nov 8, 2024
fa87589
Fix for cycle draft ::changes for the draft flow (#1780)
Bhavya-egov Nov 8, 2024
8a5c270
Fixed assumption form multi save (#1781)
nipunarora-eGov Nov 8, 2024
e717315
user tagging fixes (#1782)
nabeelmd-eGov Nov 8, 2024
b1094e1
Usermanagement row on click redirect (#1783)
abishekTa-egov Nov 8, 2024
d29e461
Plan and Pop inbox changes (#1784)
rachana-egov Nov 8, 2024
993e202
Feature/bugs (#1785)
suryansh-egov Nov 8, 2024
62b7995
fixed order in boundary details and changed hierarchy master (#1786)
Bhavya-egov Nov 8, 2024
e4e0a5d
added the checks for the update campaign flow (#1788)
jagankumar-egov Nov 11, 2024
c501b6d
Open Boundary Management ui Info pending changes (#1789)
suryansh-egov Nov 11, 2024
c18e61a
Reverted action in assign to all, updated the column heading with pro…
rachana-egov Nov 11, 2024
ecc1e36
Usermanagement css and boundaryScreen css (#1791)
abishekTa-egov Nov 11, 2024
fbfda55
Vehicle Change Assumptions & Formula (#1787)
nabeelmd-eGov Nov 11, 2024
6e94a55
css fixes (#1792)
Bhavya-egov Nov 11, 2024
9a959b7
LCOALISATION FIXES (#1793)
nabeelmd-eGov Nov 11, 2024
61179f7
some-ui-fixes (#1794)
suryansh-egov Nov 11, 2024
88a1433
fixed boundary selection dropdown issue (#1796)
rachana-egov Nov 11, 2024
e32aad6
Allowed to update the name of microplan (#1795)
rachana-egov Nov 11, 2024
d0408da
demo issue fixes (#1797)
rachana-egov Nov 11, 2024
86ca571
ui fixes (#1798)
ashish-egov Nov 11, 2024
94608ae
Added retry of failed campaign
jagankumar-egov Nov 12, 2024
4bf3640
stepper rvert back (#1799)
suryansh-egov Nov 12, 2024
2cb78eb
ESTIMATION & FORMULA FIXES (#1804)
nabeelmd-eGov Nov 12, 2024
707c0ba
error toast and checklist updates (#1805)
suryansh-egov Nov 12, 2024
ac8f506
HCMPRE 1131 (#1807)
nabeelmd-eGov Nov 12, 2024
dd96fd4
Updated sidebar for microplan (#1802)
rachana-egov Nov 12, 2024
f25f0aa
style change of toolTip (#1806)
ashish-egov Nov 12, 2024
9887205
toast and minor ui (#1809)
suryansh-egov Nov 12, 2024
7381b59
ui/ux fixes (#1810)
Bhavya-egov Nov 12, 2024
a81fc9a
Changes to AssummptionList and stepper disable in setupConfig (#1811)
abishekTa-egov Nov 12, 2024
cd57493
Formula View, and Select Acitivity Screen CSS changes (#1803)
abishekTa-egov Nov 12, 2024
5bc4a38
Revert "Allowed to update the name of microplan (#1795)" (#1812)
rachana-egov Nov 12, 2024
3b476b3
updated message for header and label and added validation for max len…
rachana-egov Nov 12, 2024
4bb88f2
Cleaned up boundary Management code and add some validations
jagankumar-egov Nov 13, 2024
8ec7882
redirect and ui (#1814)
suryansh-egov Nov 13, 2024
938a25c
Assumptionlist fix (#1815)
abishekTa-egov Nov 13, 2024
0539c64
changes in the delivery type and selection of boundary (#1816)
Bhavya-egov Nov 13, 2024
db168ed
to be picked (#1819)
suryansh-egov Nov 13, 2024
04ec9d4
role table fixes, drop down fix, pop up fix, use tag fix (#1820)
nabeelmd-eGov Nov 13, 2024
28c5ea4
fetch data type from mdms (#1822)
suryansh-egov Nov 13, 2024
4055e28
fixed app delivery condition (#1825)
Bhavya-egov Nov 13, 2024
eb972fc
not selected added in single value list (#1824)
suryansh-egov Nov 13, 2024
b99b3fa
Facility dropdown (#1817)
ashish-egov Nov 14, 2024
b911619
Microplan name update (#1821)
rachana-egov Nov 14, 2024
51dbc45
Internal demo fixes (#1827)
rachana-egov Nov 14, 2024
af070ec
tenant logo css fix (#1828)
Swathi-eGov Nov 14, 2024
a6da672
Facility data fix (#1829)
ashish-egov Nov 14, 2024
aa672b1
Added boundary manager access to the home card
jagankumar-egov Nov 14, 2024
5b8e5e0
Updated activity selection screen to have view also (#1830)
rachana-egov Nov 14, 2024
1ca8f46
Added confirmation pop up to finalise actions (#1832)
rachana-egov Nov 14, 2024
4c1e42f
Popup for userAccess boundary area and toast message for assign unass…
abishekTa-egov Nov 14, 2024
bc60ede
My MICROPLAN fixes, formula fixes (#1835)
nabeelmd-eGov Nov 14, 2024
d297c75
Hcmpre 1290 (#1834)
Bhavya-egov Nov 15, 2024
eb719e7
Inbox (#1838)
Bhavya-egov Nov 15, 2024
61d683d
demo review changes in boudnary management (#1836)
suryansh-egov Nov 15, 2024
27592bb
Update searchSavedPlansWithCampaign.js (#1839)
rachana-egov Nov 15, 2024
4a7c338
Space (#1840)
Bhavya-egov Nov 15, 2024
a68bf4a
fixed miner issues (#1837)
rachana-egov Nov 15, 2024
e1767bf
Update searchSavedPlansWithCampaign.js (#1841)
rachana-egov Nov 15, 2024
706044d
Gepspatial map view (#1842)
Swathi-eGov Nov 16, 2024
c3a7bfc
PO finding fixes (#1843)
rachana-egov Nov 17, 2024
f933a58
Fix campaign Type in draft (#1846)
ashish-egov Nov 17, 2024
da0cdd5
Plan Inbox patch fix (#1847)
rachana-egov Nov 18, 2024
36b17dc
Go Back button and microplan name quotes fix (#1844)
ashish-egov Nov 18, 2024
86d4be5
Updated the core and other component version for landing page card o…
jagankumar-egov Nov 18, 2024
229c853
Po finding fixes2 (#1845)
rachana-egov Nov 18, 2024
b52a5e3
Summary user role tagging and Response Screen (#1852)
abishekTa-egov Nov 18, 2024
acec032
minor updates (#1853)
abishekTa-egov Nov 18, 2024
d22da23
toast localistaion (#1855)
suryansh-egov Nov 18, 2024
ae23195
updated core component & css version
jagankumar-egov Nov 19, 2024
7c366dc
updating the module versions
jagankumar-egov Nov 19, 2024
7c0ba40
Reverting the libraries version update
jagankumar-egov Nov 19, 2024
26a98f9
Updated all the core component version from 1.8.3 to 1.8.10
jagankumar-egov Nov 19, 2024
8217b85
PO fixes (#1857)
nipunarora-eGov Nov 19, 2024
591b351
reverted column freeze as it was causing issues (#1858)
nipunarora-eGov Nov 19, 2024
21df7f3
Added column in sorted way, added assignee, added total pop (#1859)
nabeelmd-eGov Nov 19, 2024
c72dd14
added serving facility (#1860)
nabeelmd-eGov Nov 19, 2024
01451ee
updated code (#1861)
nipunarora-eGov Nov 19, 2024
0de2079
Formcomposer action bar fixes (#1862)
nabeelmd-eGov Nov 20, 2024
670e78a
Updated few localisation messages
jagankumar-egov Nov 20, 2024
328454a
added loader screen to ftech data from microplan integration screen
jagankumar-egov Nov 20, 2024
8a75f0c
Updated UI Customizations file
jagankumar-egov Nov 20, 2024
589d276
Approved microplan integration
jagankumar-egov Nov 20, 2024
c112a09
Added toast & success for api response
jagankumar-egov Nov 20, 2024
2e27ce7
plan inbox assignee fix (#1863)
nabeelmd-eGov Nov 20, 2024
872b286
formula and assumption refresh issue (#1864)
nabeelmd-eGov Nov 20, 2024
4a4e762
minor changes (#1866)
nipunarora-eGov Nov 20, 2024
a7fae3f
Action bar fixes, session fixes (#1867)
nabeelmd-eGov Nov 21, 2024
cc683ed
Download Button (#1865)
abishekTa-egov Nov 21, 2024
427f95f
User Role being displayed in Pop, Plan and Fac (#1854)
abishekTa-egov Nov 21, 2024
fd7b142
fixes (#1869)
nabeelmd-eGov Nov 21, 2024
d33a49a
patch fix (#1868)
rachana-egov Nov 21, 2024
120ebe5
polling fix (#1870)
suryansh-egov Nov 21, 2024
3c0f86f
assumptions fixes (#1871)
Swathi-eGov Nov 21, 2024
a4f03f5
Facility pop up fix (#1872)
rachana-egov Nov 21, 2024
d29dc9b
Localizations and Actions being cut (#1874)
abishekTa-egov Nov 21, 2024
51fc69c
Disabled updating security and accessibility details after finalize …
rachana-egov Nov 21, 2024
2061379
Update PopInbox.js (#1875)
rachana-egov Nov 21, 2024
de6b430
scroll (#1876)
nabeelmd-eGov Nov 21, 2024
ddf3225
Update FacilityPopup.js (#1877)
nipunarora-eGov Nov 21, 2024
88f4ada
qquickfix (#1878)
nabeelmd-eGov Nov 21, 2024
976fa6e
Updated the microplan integration piece
jagankumar-egov Nov 22, 2024
e107a4a
adhoc changes (#1879)
nipunarora-eGov Nov 22, 2024
f6fd573
added checklist redirection (#1880)
Bhavya-egov Nov 22, 2024
0343381
Updated workbench module version
jagankumar-egov Nov 22, 2024
cfda909
Plan and Pop inbox fix (#1881)
rachana-egov Nov 22, 2024
cd3f2b2
updated table and other fixes (#1882)
Swathi-eGov Nov 23, 2024
fc83566
Latest KPI values and Heading change (#1883)
abishekTa-egov Nov 23, 2024
8451ab2
Added count of villages and facilities in confirmation messages (#1885)
rachana-egov Nov 25, 2024
bfbe14c
Update UserUpload.js (#1886)
ashish-egov Nov 25, 2024
583516e
fixed localization issue (#1888)
rachana-egov Nov 25, 2024
e94d8d3
Removed Core HRMS and updated the timeout of fetch from microplan
jagankumar-egov Nov 25, 2024
b024006
changed residing-boundary to multiselect dropdown, fixed table scroll…
Swathi-eGov Nov 25, 2024
aaeb4fa
fixed validation in boundary create and timeline button in the summar…
Bhavya-egov Nov 25, 2024
743ef7f
Added missing the translation
jagankumar-egov Nov 25, 2024
922c40b
Added list of assignee for pop and plan inbox (#1887)
rachana-egov Nov 25, 2024
91fc3bb
Re render assumption fix, atleast one mdms check, blank custom name c…
nabeelmd-eGov Nov 25, 2024
4bbdf0b
fixed validation cond for app (#1891)
Bhavya-egov Nov 25, 2024
85ab966
fixed filestore call issue (#1895)
Bhavya-egov Nov 26, 2024
59efc94
toast fix, user tagging table dropdown fix and added comment toast (#…
Swathi-eGov Nov 26, 2024
2d453f3
FIXES (#1893)
nabeelmd-eGov Nov 26, 2024
82f25b2
ui fixes. (#1897)
suryansh-egov Nov 26, 2024
7c65754
Fetch microplan related changes (#1898)
jagankumar-egov Nov 26, 2024
afe7b3f
added back button, redirected checklist success and fixed null issue …
Bhavya-egov Nov 26, 2024
27244a9
fixed finalized button issue (#1899)
rachana-egov Nov 26, 2024
8e72bfd
added fixes for the campaign update and fetch from mp
jagankumar-egov Nov 26, 2024
fb8dd57
added timeout cleaned up & fetch will start after the data template d…
jagankumar-egov Nov 27, 2024
6c60185
Employee search fix (#1892)
abishekTa-egov Nov 27, 2024
872a811
Bug fix (#1900)
rachana-egov Nov 27, 2024
cc92022
Added few extra waiting steps for templates
jagankumar-egov Nov 27, 2024
62fc006
KPI card fix, and css change (#1903)
abishekTa-egov Nov 27, 2024
0ae1d36
update to inbox codes (#1904)
nipunarora-eGov Nov 27, 2024
7f2cf05
Added dynamic columns in facility screen (#1902)
rachana-egov Nov 27, 2024
24540b1
validations done for assumptions and formula (#1906)
Swathi-eGov Nov 27, 2024
0c09a8a
localisation and error codes (#1905)
suryansh-egov Nov 27, 2024
b7d5634
Added fixes for timeout and redirection for fetch microplan (#1901)
jagankumar-egov Nov 27, 2024
e5b3552
wait and retry message (#1909)
suryansh-egov Nov 27, 2024
32f482b
Updated toast wran to warning message toast type
jagankumar-egov Nov 27, 2024
7924f59
checking popup issue in facility screen (#1910)
abishekTa-egov Nov 27, 2024
3e214a9
Adhoc fixes 91 (#1912)
abishekTa-egov Nov 27, 2024
6fe9381
Pop inbox Pagination fix (#1907)
rachana-egov Nov 27, 2024
98aa7ba
Facility Pagination Fix (#1908)
rachana-egov Nov 27, 2024
71918af
Feature/er (#1914)
suryansh-egov Nov 27, 2024
1c6a5dd
fixed plan inbox issues (#1915)
rachana-egov Nov 27, 2024
266a3a9
Table changes (#1913)
abishekTa-egov Nov 27, 2024
546978a
added fixes for sort, view summary issue, no results in dropdown (#1916)
Swathi-eGov Nov 27, 2024
3621550
fixed facility catchment pop up issue (#1917)
rachana-egov Nov 27, 2024
c53e85a
Merge branch 'master' into master-pull
jagankumar-egov Nov 28, 2024
3c9a50a
Fixed Audit issues (#1918)
rachana-egov Nov 28, 2024
f9f43bc
removed alphanumeric valiadtion (#1922)
Swathi-eGov Nov 28, 2024
cdf8bb7
updated the loader screen loader styles as per ux audit
jagankumar-egov Nov 28, 2024
006aa49
Kpis integrate (#1919)
ashish-egov Nov 28, 2024
5c6d702
Assumption Toast Validation and Irs removed 1 (#1921)
abishekTa-egov Nov 28, 2024
d40eb1d
Fixed accessibility dropdown issue (#1923)
rachana-egov Nov 28, 2024
5ab0b40
Added extra steps and styles updated
jagankumar-egov Nov 28, 2024
2bf688a
Added toast and changes primary, seccondary in Assumption,Formula (#1…
abishekTa-egov Nov 28, 2024
f2552b6
Changed hierarchy schema for microplan (#1925)
rachana-egov Nov 28, 2024
09103ff
Fixed small issues (#1927)
rachana-egov Nov 28, 2024
226aebc
Audit fixes main (#1926)
Swathi-eGov Nov 28, 2024
b4c5ce0
width fix for module card (#1929)
Swathi-eGov Nov 28, 2024
38ae76d
Formula Checking Fix (#1930)
abishekTa-egov Nov 28, 2024
d9aeb78
Edit Size button changed (#1931)
abishekTa-egov Nov 28, 2024
55da0c2
Update HypothesisWrapper.js (#1932)
rachana-egov Nov 28, 2024
7a2afde
Feature/fixes (#1928)
suryansh-egov Nov 28, 2024
b79b30e
Updates to formula (#1933)
rachana-egov Nov 28, 2024
50834f5
fixed pop issue (#1934)
rachana-egov Nov 28, 2024
65427f9
css fix on card comp (#1935)
Bhavya-egov Nov 29, 2024
106c3db
Updated the campaign Card for the roles mapping
jagankumar-egov Nov 29, 2024
60d32cb
Fixed screen breaking issue (#1936)
rachana-egov Nov 29, 2024
d986b65
validation update (#1937)
nipunarora-eGov Nov 29, 2024
001718b
Fixed assignee count for pop and plan inbox (#1938)
rachana-egov Nov 29, 2024
134ae7c
Changes in facility kpis (#1939)
ashish-egov Nov 29, 2024
61dd04e
fixed product chip and summary issue (#1941)
Bhavya-egov Nov 29, 2024
b53f239
Mdms kpi (#1942)
ashish-egov Nov 29, 2024
0348915
Dropdown popup fixes (#1943)
Swathi-eGov Nov 29, 2024
ea33a14
Added inline validations (#1944)
rachana-egov Nov 29, 2024
3325f7d
Added refetch (#1945)
ashish-egov Nov 29, 2024
70b49e6
Assumption formula fixes (#1946)
shashwat-egov Nov 29, 2024
7f2bd71
Update createUpdatePlanProject.js (#1948)
Swathi-eGov Nov 30, 2024
7aef8f2
Fixed back button and edit population error message logic (#1949)
rachana-egov Dec 2, 2024
652a965
localizations for user management and user tag (#1950)
abishekTa-egov Dec 2, 2024
8699ab6
added status filters (#1952)
ashish-egov Dec 2, 2024
be0fc8a
additional validations on assumptions + showing formulas in plan inbo…
nipunarora-eGov Dec 2, 2024
144e200
Updated Bread crumbs (#1954)
rachana-egov Dec 2, 2024
c64b251
sort issue fix, title for buttons, actionbar fix (#1955)
Swathi-eGov Dec 2, 2024
dc6d329
Patch fix (#1956)
rachana-egov Dec 2, 2024
4108c50
Popup fix (#1958)
Swathi-eGov Dec 2, 2024
cff5b4b
Changes for kpis (#1960)
ashish-egov Dec 2, 2024
9a0f4f8
Fixed toast issue + fixed invalidation of assumption and formula (#1963)
anuraj-egov Dec 2, 2024
d7a8602
Updated the loader text, updated the icon information, change log upd…
jagankumar-egov Dec 3, 2024
de257b5
fixed error message issue (#1964)
rachana-egov Dec 3, 2024
3af5290
Adhoc fixes 13: Fixed formula custom cascading changes + validations …
nipunarora-eGov Dec 3, 2024
19b1a4e
updated mdms paths (#1968)
nipunarora-eGov Dec 3, 2024
6350019
Update searchDssChartV2.js (#1969)
ashish-egov Dec 3, 2024
6636d8a
fixed resources,delivery screen issue and added campaign name (#1965)
Bhavya-egov Dec 4, 2024
ee914b3
bug bash bug of download popup openinng again and again (#1961)
suryansh-egov Dec 4, 2024
91f1737
changes from count to quantity (#1970)
Bhavya-egov Dec 4, 2024
dd57af3
Feature/time (#1971)
suryansh-egov Dec 4, 2024
fe45e60
added campaign name in update (#1973)
Bhavya-egov Dec 4, 2024
cf596aa
Updated loc codes (#1976)
nipunarora-eGov Dec 5, 2024
9d9d03c
Revert module changes for localisation (#1977)
nipunarora-eGov Dec 5, 2024
2baaf32
Added fix for the buil issue for trying out the optional deepndency h…
jagankumar-egov Dec 5, 2024
b14b6d2
Merge branch 'master' into master-pull
jagankumar-egov Dec 5, 2024
977495b
Merge branch 'console' into master-pull
jagankumar-egov Dec 5, 2024
81c1c5c
Some handlings (#1980)
ashish-egov Dec 5, 2024
6b6d101
Updated hrms path (#1979)
rachana-egov Dec 5, 2024
5de6d4b
removed commented code
Bhavya-egov Dec 5, 2024
97a5d00
fixed usermanagement toast issue (#1982)
Swathi-eGov Dec 5, 2024
1bd0353
removed commented code
Bhavya-egov Dec 5, 2024
94dafd2
Merge branch 'console' into master-pull
jagankumar-egov Dec 6, 2024
9b635a2
Added core ui build to check performance
jagankumar-egov Dec 6, 2024
e3ce6c0
Merge branch 'console' into master-pull
jagankumar-egov Dec 6, 2024
8f2f6fe
Fixed error issue (#1983)
rachana-egov Dec 6, 2024
acbfd80
updated the package version of campaign manager modules
jagankumar-egov Dec 6, 2024
618b9c4
Merge branch 'console' into master-pull
jagankumar-egov Dec 6, 2024
d1a4c20
adding utils and remove hardcoding module name (#1984)
nabeelmd-eGov Dec 6, 2024
ac1899c
added title for all buttons (#1985)
Swathi-eGov Dec 6, 2024
0322ed0
updated package versions
jagankumar-egov Dec 6, 2024
9f8fb7d
filtering fixes (#1986)
nabeelmd-eGov Dec 6, 2024
5f6239c
Updated the config for the core app
jagankumar-egov Dec 6, 2024
cf0f1fb
updated directory
jagankumar-egov Dec 6, 2024
405c9ec
Feature/hcmpre1418 (#1988)
suryansh-egov Dec 6, 2024
a209418
Merge branch 'console' into master-pull
jagankumar-egov Dec 7, 2024
f4fe24e
formatted
jagankumar-egov Dec 7, 2024
1589bf3
Update health/micro-ui/web/core/install-deps.sh
jagankumar-egov Dec 7, 2024
e7b54f8
Update health/micro-ui/web/core/install-deps.sh
jagankumar-egov Dec 7, 2024
d9a3080
updated changeQueryName for planfacilityserach as residingBoundaries …
Swathi-eGov Dec 9, 2024
b92a13e
fixed page responsiveness issue for formula configuration screen (#1990)
Swathi-eGov Dec 9, 2024
b1d50dd
Merge branch 'console' into master-pull
jagankumar-egov Dec 9, 2024
15f58ff
clearing console (#1991)
nabeelmd-eGov Dec 9, 2024
81a3cec
Merge branch 'console' into master-pull
jagankumar-egov Dec 9, 2024
549c9e6
fixed rerendering of summary screen in update dates (#1992)
Bhavya-egov Dec 9, 2024
e5f6b5b
Merge branch 'console' into master-pull
jagankumar-egov Dec 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
43 changes: 40 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,42 @@
## Choose the appropriate template for your PR:

- [Feature PR](./PULL_REQUEST_TEMPLATE/feature_template.md)
- [Bugfix PR](./PULL_REQUEST_TEMPLATE/bugfix_template.md)
- [Release PR](./PULL_REQUEST_TEMPLATE/release_template.md)
### [Feature PR](./PULL_REQUEST_TEMPLATE/feature_template.md)

#### Feature Request

**JIRA ID**
<!-- Provide the JIRA ID or task reference -->

**Module**
<!-- Specify the module impacted by the feature -->

**Description**
<!-- Provide a detailed description of the feature -->

**Related Issues**
<!-- Link any related GitHub issues here -->

jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved
---

### [Bugfix PR](./PULL_REQUEST_TEMPLATE/bugfix_template.md)

#### Bugfix Request

**JIRA ID**
<!-- Provide the JIRA ID or task reference -->

**Module**
<!-- Specify the module impacted by the bugfix -->

**Description**
<!-- Provide a detailed description of the bugfix -->

**Root Cause**
<!-- Describe the root cause of the bug -->

**Related Issues**
<!-- Link any related GitHub issues here -->
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved

---

### [Release PR](./PULL_REQUEST_TEMPLATE/release_template.md)
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved
54 changes: 46 additions & 8 deletions .github/workflows/buildWorkbenchUI.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Digit Admin Console Build workflow
on:
push:
branches: [ 'develop','campaign' ,'microplan','master']
branches: [ 'develop','console','master']
paths:
- 'health/micro-ui/web/micro-ui-internals/**'
workflow_dispatch:
Expand Down Expand Up @@ -40,9 +40,6 @@ jobs:
echo "COMMIT_ID=${GITHUB_SHA: -8}" >> $GITHUB_ENV # Extract last 8 characters of SHA
echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV




- name: Login to egovio docker Container Registry
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
Expand All @@ -51,10 +48,51 @@ jobs:
# Authenticate with Docker Hub
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin

- name: Build and Push Docker image for digit-ui
- name: Build and Push Docker images for digit-ui
if: ${{ steps.check_files.outputs.run_job_digit_ui == 'true' }}
run: |
docker build -t workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }} -f web/workbench/Dockerfile .
docker tag workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }} egovio/workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
docker push egovio/workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
# workbench ui Docker build
IMAGE_NAME_1=workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
docker build -t $IMAGE_NAME_1 -f web/workbench/Dockerfile . &

# microplan ui Docker build
IMAGE_NAME_2=core-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
docker build -t $IMAGE_NAME_2 -f web/core/Dockerfile . &

# Wait for both builds to complete
wait

# Tag and push Docker images after both builds complete
docker tag $IMAGE_NAME_1 egovio/$IMAGE_NAME_1
docker push egovio/$IMAGE_NAME_1


docker tag $IMAGE_NAME_2 egovio/$IMAGE_NAME_2
docker push egovio/$IMAGE_NAME_2

# Set outputs for the summary
echo "IMAGE_NAME_1=egovio/$IMAGE_NAME_1" >> $GITHUB_ENV
echo "IMAGE_NAME_2=egovio/$IMAGE_NAME_2" >> $GITHUB_ENV
working-directory: health/micro-ui

- name: Display Docker images in Actions tab
run: |
echo "First Docker image: ${{ env.IMAGE_NAME_1 }}"
echo "Second Docker image: ${{ env.IMAGE_NAME_2 }}"
echo "::set-output name=first_image::$IMAGE_NAME_1"
echo "::set-output name=second_image::$IMAGE_NAME_2"
if: ${{ steps.check_files.outputs.run_job_digit_ui == 'true' }}

- name: Show Docker images in job summary
if: ${{ steps.check_files.outputs.run_job_digit_ui == 'true' }}
run: |
echo "## Docker images built and pushed:" >> $GITHUB_STEP_SUMMARY
echo "- ${{ env.IMAGE_NAME_1 }}" >> $GITHUB_STEP_SUMMARY
echo "- ${{ env.IMAGE_NAME_2 }}" >> $GITHUB_STEP_SUMMARY







8 changes: 5 additions & 3 deletions .github/workflows/publishAllPackages.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
name: Node.js Publish Health UI Packages
# name: Node.js Publish Health UI Packages
name: Node.js Publish Health UI CSS Packages

on:
push:
branches: [ 'develop','campaign' ,'microplan']
branches: [ 'develop','console']
paths:
- 'health/micro-ui/web/micro-ui-internals/**'
- 'health/micro-ui/web/micro-ui-internals/packages/css/**'
# - 'health/micro-ui/web/micro-ui-internals/**' disabling main since we target only for css

pull_request:
branches:
Expand Down
3 changes: 1 addition & 2 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.* @jagankumar-egov
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Consider scoping the default owner pattern.

The pattern .* matches everything in the repository, which means @jagankumar-egov will be notified for all changes. Consider if this broad scope is necessary or if it could be more targeted.

A more specific approach could be:

-.* @jagankumar-egov
+* @jagankumar-egov

This still acts as a catch-all but is more conventional in CODEOWNERS files.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
.* @jagankumar-egov
* @jagankumar-egov


micro-ui/web/ @egovernments/core-ui-reviewers
health/micro-ui/web/ @egovernments/core-ui-reviewers

health/micro-ui/web/ @egovernments/core-ui-reviewers
Comment on lines 2 to +4
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Add documentation for the ownership structure.

To improve maintainability and clarity, consider adding comments to explain:

  1. The relationship between these paths
  2. The rationale for the ownership assignments
  3. The team responsibilities

Example structure:

+# Default owner for all files unless overridden
 * @jagankumar-egov

+# Core UI team owns all micro-ui web components
 micro-ui/web/ @egovernments/core-ui-reviewers
+
+# Health module specific UI components
 health/micro-ui/web/ @egovernments/core-ui-reviewers
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
micro-ui/web/ @egovernments/core-ui-reviewers
health/micro-ui/web/ @egovernments/core-ui-reviewers
health/micro-ui/web/ @egovernments/core-ui-reviewers
# Default owner for all files unless overridden
* @jagankumar-egov
# Core UI team owns all micro-ui web components
micro-ui/web/ @egovernments/core-ui-reviewers
# Health module specific UI components
health/micro-ui/web/ @egovernments/core-ui-reviewers

6 changes: 3 additions & 3 deletions build/build-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ config:

- name: builds/Digit-Frontend/karnataka-ui
build:
- work-dir: micro-ui/
dockerfile: micro-ui/web/docker/Dockerfile
image-name: karnataka-ui
- work-dir: health/micro-ui/
dockerfile: health/micro-ui/web/core/Dockerfile
image-name: core-ui


- name: builds/Digit-Frontend/workbench-ui
Expand Down
2 changes: 1 addition & 1 deletion health/micro-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "workbench-ui",
"version": "0.2.0"
"version": "0.3.0"
}
18 changes: 17 additions & 1 deletion health/micro-ui/web/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
# Changelog
All notable changes to this module will be documented in this file.

# Changelog
All notable changes to this module will be documented in this file.

## 0.3.0 - 2024-12-03
#### Base Admin console web
1. Updating the campaign details
2. Configure Checklist
3. Manage Boundaries


## 0.2.0 - 2024-08-24
#### Base Admin console web
1. Helps in Updating the campaign Dates
2. View the timeline porcess of the campaign Creation


## 0.1.0 - 2024-05-28
#### Base Admin console web
1. Helps in creating the Campaign and configure delivery rules
2. Create Data: Validates and creates resource details of type facility,user and boundary.
2. Create Data: Validates and creates resource details of type facility,user and boundary.
121 changes: 121 additions & 0 deletions health/micro-ui/web/core/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
/**
* The above code initializes various Digit UI modules and components, sets up customizations, and
* renders the DigitUI component based on the enabled modules and state code.
* @returns The `App` component is being returned, which renders the `DigitUI` component with the
* specified props such as `stateCode`, `enabledModules`, `moduleReducers`, and `defaultLanding`. The
* `DigitUI` component is responsible for rendering the UI based on the provided configuration and
* modules.
*/
Comment on lines +1 to +8
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Consider revising or removing the multi-line comment

The comment from lines 1-8 appears to be misplaced or redundant. It refers to "The above code," which might not be accurate. Comments should provide meaningful insights rather than restating the code. Consider updating the comment to be more precise or removing it if unnecessary.

import React from "react";
import { initLibraries } from "@egovernments/digit-ui-libraries";
import { DigitUI } from "@egovernments/digit-ui-module-core";
// import { initHRMSComponents } from "@egovernments/digit-ui-module-hrms";
import { UICustomizations } from "./Customisations/UICustomizations";
import { initWorkbenchComponents } from "@egovernments/digit-ui-module-workbench";
import { initUtilitiesComponents } from "@egovernments/digit-ui-module-utilities";
import { initWorkbenchHCMComponents } from "@egovernments/digit-ui-module-hcmworkbench";
import { initCampaignComponents } from "@egovernments/digit-ui-module-campaign-manager"

window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH");
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved

const enabledModules = [
"DSS",
"NDSS",
"Utilities",
// "HRMS",
"Engagement",
"Workbench",
"HCMWORKBENCH",
"Campaign"
];
const HCM_MODULE_NAME = "boundary";
export const OverrideUICustomizations = {
HCM_MODULE_NAME,
}
const setupLibraries = (Library, service, method) => {
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved
window.Digit = window.Digit || {};
window.Digit[Library] = window.Digit[Library] || {};
window.Digit[Library][service] = method;
};
/* To Overide any existing config/middlewares we need to use similar method */
const updateCustomConfigs = () => {
setupLibraries("Customizations", "commonUiConfig", { ...window?.Digit?.Customizations?.commonUiConfig, ...OverrideUICustomizations });
};


const moduleReducers = (initData) => ({
initData,
});

const initDigitUI = () => {

try {
window.Digit.ComponentRegistryService.setupRegistry({});
window.Digit.Customizations = {
PGR: {},
commonUiConfig: UICustomizations,
};
// initHRMSComponents();
initUtilitiesComponents();
initWorkbenchComponents();
initWorkbenchHCMComponents();
initCampaignComponents();
} catch (error) {
console.error('Failed to initialize DigitUI:', error);
// Consider showing a user-friendly error message
}
};
let initializationError = null;

const handleInitError = (error) => {
console.error('Failed to initialize libraries:', error);
initializationError = error;
};
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved

initLibraries().then(() => {
initDigitUI();
}).catch(handleInitError);



function App() {

const [stateCode, setStateCode] = React.useState(null);

const [isLoading, setIsLoading] = React.useState(true);
React.useEffect(() => {
// Add any necessary initialization checks here
window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH");
const code =
window.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID") ||
process.env.REACT_APP_STATE_LEVEL_TENANT_ID;
setStateCode(code);
setIsLoading(false);
}, []);

if (isLoading) {
return <div>Loading application...</div>;
}
// Consider adding this to your App component:
if (initializationError) {
return <div>Failed to initialize application. Please refresh the page.</div>;
}
if (!stateCode) {
return (
<div className="error-container">
<h1>Configuration Error</h1>
<p>State code is not defined. Please check your configuration.</p>
</div>
);
}
return (
<DigitUI
stateCode={stateCode}
enabledModules={enabledModules}
moduleReducers={moduleReducers}
defaultLanding="employee"
/>
);
}

export default App;
30 changes: 30 additions & 0 deletions health/micro-ui/web/core/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
FROM egovio/alpine-node-builder-14:yarn AS build
#FROM ghcr.io/egovernments/alpine-node-builder-14:yarn AS build
Comment on lines +1 to +2
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Consider documenting the base image selection rationale

There are two base image options (one commented out). Consider documenting the reason for choosing egovio over ghcr.io to help with future maintenance decisions.

RUN apk update && apk upgrade
RUN apk add --no-cache git>2.30.0
Comment on lines +3 to +4
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Pin package versions for reproducible builds

While specifying a minimum git version is good for security, using exact version pins would ensure reproducible builds.

-RUN apk add --no-cache git>2.30.0
+RUN apk add --no-cache git=2.34.8-r0
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
RUN apk update && apk upgrade
RUN apk add --no-cache git>2.30.0
RUN apk update && apk upgrade
RUN apk add --no-cache git=2.34.8-r0
🧰 Tools
🪛 Hadolint (2.12.0)

[warning] 4-4: Pin versions in apk add. Instead of apk add <package> use apk add <package>=<version>

(DL3018)

ARG WORK_DIR
WORKDIR /app
ENV NODE_OPTIONS "--max-old-space-size=4792"
Copy link
Contributor

Choose a reason for hiding this comment

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

💡 Codebase verification

Consider standardizing Node.js memory limit configuration

The codebase shows inconsistent memory limits across different Dockerfiles:

  • Most services use 4792MB
  • Some services use 8168MB
  • Others use 1792MB

These varying configurations suggest different memory requirements for different services. Consider:

  • Documenting the rationale for each memory configuration
  • Standardizing the values where possible
  • Using environment variables to make these configurations more maintainable
🔗 Analysis chain

Verify Node.js memory limit configuration

The 4792MB memory limit seems specific. Consider documenting why this exact value was chosen and verify if it's sufficient for your build requirements.


Let's search for any documentation or similar memory configurations in the codebase to understand if this value is consistently used or documented somewhere.


Let's examine the actual memory values used across different Dockerfiles to see if this is a consistent configuration or if there are variations that might provide insights about the chosen value.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check for memory-related issues in build logs
git log -n 10 --grep="memory\|heap\|OOM"

Length of output: 0


Script:

#!/bin/bash
# Search for memory-related configurations in Dockerfiles
rg -l "max-old-space-size" --type dockerfile

# Search for build or memory-related comments/documentation
rg -i "memory|heap size|node_options" --type md

Length of output: 129


Script:

#!/bin/bash
# Search for memory configurations in any Dockerfile
fd Dockerfile --exec rg -l "max-old-space-size" {}

# Search for memory-related documentation in any markdown or text files
fd -e md -e txt | xargs rg -i "memory|heap size|node_options" || true

Length of output: 541


Script:

#!/bin/bash
# Check the specific memory configurations across all Dockerfiles
fd Dockerfile --exec rg "max-old-space-size" -A 1 -B 1 {}

Length of output: 590


COPY ${WORK_DIR} .
RUN ls -lah

#RUN node web/envs.js
RUN cd web/ \
&& node -e 'console.log(v8.getHeapStatistics().heap_size_limit/(1024*1024))' \
&& node -e 'console.log("health-core only")' \
&& cd core/ \
&& chmod +x ./install-deps.sh \
&& ./install-deps.sh \
&& cd ../ \
&& yarn install \
&& yarn build:webpack
Comment on lines +13 to +21
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Refactor build steps for better maintainability

Several improvements can be made to the build process:

  1. Use WORKDIR instead of multiple cd commands
  2. Add error checking for the install-deps.sh script
  3. Consider removing or documenting the heap statistics logging
-RUN cd web/ \
-    && node -e 'console.log(v8.getHeapStatistics().heap_size_limit/(1024*1024))' \
-    && node -e 'console.log("health-core only")' \
-    && cd core/ \
-    && chmod +x ./install-deps.sh \
-    &&  ./install-deps.sh \
-    && cd ../ \
-    && yarn install \ 
-    && yarn build:webpack 
+WORKDIR /app/web/core
+RUN chmod +x ./install-deps.sh && \
+    ./install-deps.sh || exit 1
+WORKDIR /app/web
+RUN yarn install && \
+    yarn build:webpack

Committable suggestion skipped: line range outside the PR's diff.

🧰 Tools
🪛 Hadolint (2.12.0)

[warning] 13-13: Use WORKDIR to switch to a directory

(DL3003)


FROM nginx:mainline-alpine
#FROM ghcr.io/egovernments/nginx:mainline-alpine
ENV WORK_DIR=/var/web/core-ui

RUN mkdir -p ${WORK_DIR}

COPY --from=build /app/web/build ${WORK_DIR}/
COPY --from=build /app/web/core/nginx.conf /etc/nginx/conf.d/default.conf
Comment on lines +23 to +30
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Validate nginx configuration during build

Consider adding a configuration test step to catch any nginx configuration issues during the build phase.

 COPY --from=build /app/web/build ${WORK_DIR}/
 COPY --from=build /app/web/core/nginx.conf /etc/nginx/conf.d/default.conf
+RUN nginx -t
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
FROM nginx:mainline-alpine
#FROM ghcr.io/egovernments/nginx:mainline-alpine
ENV WORK_DIR=/var/web/core-ui
RUN mkdir -p ${WORK_DIR}
COPY --from=build /app/web/build ${WORK_DIR}/
COPY --from=build /app/web/core/nginx.conf /etc/nginx/conf.d/default.conf
FROM nginx:mainline-alpine
#FROM ghcr.io/egovernments/nginx:mainline-alpine
ENV WORK_DIR=/var/web/core-ui
RUN mkdir -p ${WORK_DIR}
COPY --from=build /app/web/build ${WORK_DIR}/
COPY --from=build /app/web/core/nginx.conf /etc/nginx/conf.d/default.conf
RUN nginx -t

🧹 Nitpick (assertive)

Enhance security configuration

Consider implementing these security best practices:

  1. Run nginx as a non-root user
  2. Add security-related HTTP headers in nginx configuration
 COPY --from=build /app/web/build ${WORK_DIR}/
 COPY --from=build /app/web/core/nginx.conf /etc/nginx/conf.d/default.conf
+RUN chown -R nginx:nginx ${WORK_DIR}
+USER nginx

Committable suggestion skipped: line range outside the PR's diff.

18 changes: 18 additions & 0 deletions health/micro-ui/web/core/install-deps.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/sh

jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved
BRANCH="$(git branch --show-current)"

echo "Main Branch: $BRANCH"
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved

INTERNALS="micro-ui-internals"
cd ..
jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved

jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved
cp core/App.js src
cp core/package.json package.json
cp core/webpack.config.js webpack.config.js
cp core/inter-package.json $INTERNALS/package.json

jagankumar-egov marked this conversation as resolved.
Show resolved Hide resolved
cp $INTERNALS/example/src/UICustomizations.js src/Customisations

echo "UI :: core " && echo "Branch: $(git branch --show-current)" && echo "$(git log -1 --pretty=%B)" && echo "installing packages"
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Improve command output efficiency

The echo command with command substitution can be simplified.

-echo "UI :: core " && echo "Branch: $(git branch --show-current)" && echo "$(git log -1 --pretty=%B)" && echo "installing packages" 
+echo "UI :: core"
+echo "Branch: $(git branch --show-current)"
+git log -1 --pretty=%B
+echo "installing packages"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
echo "UI :: core " && echo "Branch: $(git branch --show-current)" && echo "$(git log -1 --pretty=%B)" && echo "installing packages"
echo "UI :: core"
echo "Branch: $(git branch --show-current)"
git log -1 --pretty=%B
echo "installing packages"
🧰 Tools
🪛 Shellcheck (0.10.0)

[style] 17-17: Useless echo? Instead of 'echo $(cmd)', just use 'cmd'.

(SC2005)


Loading
Loading