Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

Develop Code sync up #788

Merged
merged 73 commits into from
May 7, 2024
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
b8813f0
PFM-5822: forgot password fixes WIP
anilsingha-eGov Mar 11, 2024
7567198
PFM-5822:Fixed forgot password not redirecting,added validation for p…
anilsingha-eGov Mar 12, 2024
b8988fa
PFM-5882: Updatd mobile
anilsingha-eGov Mar 13, 2024
ded45aa
PFM-5822: Updated css
anilsingha-eGov Mar 13, 2024
1dfbb70
PFM-5822:Updated max and min length to 15 for change password
anilsingha-eGov Mar 13, 2024
70cd6fc
PFM-5822: Updated css in index.html
anilsingha-eGov Mar 14, 2024
8d12ad4
Merge pull request #751 from egovernments/PFM-5822
anilsingha-eGov Mar 18, 2024
022b3d2
PFM-5842: Fixed category & subcategory value showing null
anilsingha-eGov Apr 1, 2024
50cba4d
Revert "PFM-5842: Fixed category & subcategory value showing null"
anilsingha-eGov Apr 1, 2024
2cf7ca6
PFM-5842: Fixed category & subcategory value showing null
anilsingha-eGov Apr 1, 2024
cde3e5d
Merge pull request #757 from egovernments/PFM-5842
pradeepkumarcm-egov Apr 1, 2024
043553e
PFM-5968:Updated password to max 10
anilsingha-eGov Apr 2, 2024
47b6d3c
Merge pull request #758 from egovernments/develop-digit-ui
pradeepkumarcm-egov Apr 2, 2024
608f00b
PFM-5969: Added select all for roles dropdown
anilsingha-eGov Apr 3, 2024
71e10c9
Merge pull request #759 from egovernments/PFM-5969
pradeepkumarcm-egov Apr 3, 2024
c5611ab
PFM-5983: Password length max set to 10, Fixed uppercase not giving hint
anilsingha-eGov Apr 3, 2024
8623f97
Merge pull request #760 from egovernments/PFM-5983-flutter
pradeepkumarcm-egov Apr 3, 2024
8508a99
PFM-5973 Added condtion to open any dashboard in new tab
chinmoy-eGov Apr 3, 2024
b8c7ae3
PFM-5973 Added condtion to open any dashboard in new tab
chinmoy-eGov Apr 3, 2024
9344f2e
Merge pull request #761 from egovernments/PFM-5973
anilsingha-eGov Apr 3, 2024
3ed308a
PFM-5971 added filter for current tenant
chinmoy-eGov Apr 3, 2024
a7cd53f
Merge pull request #762 from egovernments/PFM-5971
anilsingha-eGov Apr 3, 2024
f612d14
PFM-5984 Added Eye for password visibility
chinmoy-eGov Apr 4, 2024
2044be5
PFM-5984 Addition of password icon
chinmoy-eGov Apr 8, 2024
8b84303
PFM-5984 Addition of password icon
chinmoy-eGov Apr 8, 2024
2936f24
PFM-5996: Fixed employee side bar not working
anilsingha-eGov Apr 8, 2024
e3e14da
PFM-5996: Fixed employee side bar not working ( #765 )
anilsingha-eGov Apr 8, 2024
b50389f
PFM-5971 Added a default function to select a default jurisdiction fo…
chinmoy-eGov Apr 10, 2024
3d43c79
PFM-5971 Added a default function to select a default jurisdiction ( …
anilsingha-eGov Apr 10, 2024
35fda66
PFM-5998: Added Sarpanch, Secretory, Revenue Collector
anilsingha-eGov Apr 10, 2024
9ac3a8c
PFM-5998: Added Sarpanch, Secretory, Revenue Collector ( #768 )
anilsingha-eGov Apr 10, 2024
cf33eb9
Update application.properties
Saloni-eGov Apr 17, 2024
07c3c3d
Merge pull request #769 from egovernments/saloni041-patch-3
pradeepkumarcm-egov Apr 17, 2024
2dc3991
ISTE-17 Password icon change
chinmoy-eGov Apr 18, 2024
6d9d97f
ISTE-19: Updated password for profile
anilsingha-eGov Apr 18, 2024
8eab20e
ISTE-19: Updated password for profile ( #770 )
anilsingha-eGov Apr 18, 2024
cffa35f
PFM-5984 Added Eye for password visibility ( #764 )
anilsingha-eGov Apr 18, 2024
786ac8d
ISTE-7,ISTE-20: Fixed Revenue Collector roles issue
anilsingha-eGov Apr 19, 2024
52d44f4
ISTE-7,ISTE-20: Fixed Revenue Collector roles issue ( #771 )
anilsingha-eGov Apr 19, 2024
f610ab0
ISTE-17 Changes in password component
chinmoy-eGov Apr 19, 2024
b24c6ae
Added password not taking props
anilsingha-eGov Apr 19, 2024
1d2c20a
Merge pull request #772 from egovernments/password-fix
anilsingha-eGov Apr 19, 2024
5a30509
Merge branch 'develop' of https://github.com/egovernments/punjab-mgra…
chinmoy-eGov Apr 22, 2024
ec5c4f1
ISTE-17 Changes in password component ( #773 )
anilsingha-eGov Apr 22, 2024
c6e0ea2
ISTE-19: Foxed minlentgh issue
anilsingha-eGov Apr 22, 2024
befcab5
ISTE-19: Fixed minlength issue ( #774 )
anilsingha-eGov Apr 22, 2024
cd0613b
ISTE-20: Added sarpanch,revenue collector, secretory & Updated role
anilsingha-eGov Apr 23, 2024
5c48d28
ISTE-20: Added sarpanch,revenue collector, secretory & Updated role (…
anilsingha-eGov Apr 23, 2024
fc40dab
ISTE-19: Fixed forgot password issue
anilsingha-eGov Apr 24, 2024
ac7bad3
ISTE-19: Fixed forgot password issue ( #776 )
anilsingha-eGov Apr 24, 2024
4ce98e5
ISTE-8 Modification for role dropdown
chinmoy-eGov Apr 24, 2024
c027c07
Merge branch 'develop' of https://github.com/egovernments/punjab-mgra…
chinmoy-eGov Apr 24, 2024
d47c92a
Merge branch 'ISTE-8' of https://github.com/egovernments/punjab-mgram…
chinmoy-eGov Apr 24, 2024
154a215
ISTE-9 Addded Division user and state user type
chinmoy-eGov Apr 24, 2024
75bb0ce
ISTE-9 Addded Division user and state user type
chinmoy-eGov Apr 24, 2024
07540df
Merge pull request #777 from egovernments/ISTE-8
anilsingha-eGov Apr 24, 2024
800fff9
Merge pull request #778 from egovernments/ISTE-9
anilsingha-eGov Apr 24, 2024
7c2778a
ISTE-20: Fixed count not reflecting
anilsingha-eGov Apr 25, 2024
7421dad
ISTE-20: Fixed count not reflecting ( #779 )
anilsingha-eGov Apr 25, 2024
2faae33
ISTE-9 changes in top bar for type of user
chinmoy-eGov Apr 26, 2024
2b9459f
ISTE-9 changes in top bar for type of user ( #780 )
anilsingha-eGov Apr 26, 2024
1929fe4
ISTE-10 Validation added while creating employee
chinmoy-eGov Apr 26, 2024
f2ae513
ISTE-10 Validation added while creating employee ( #781 )
anilsingha-eGov Apr 26, 2024
175514d
ISTE-8 Modification in Multiselect dropdown
chinmoy-eGov Apr 26, 2024
2b54487
ISTE-8 Modification in Multiselect dropdown (#782)
anilsingha-eGov Apr 26, 2024
40b048f
ISTE-8 Modified Tag for Division user
chinmoy-eGov Apr 29, 2024
51f872c
ISTE-8 Modified Tag for Division user ( #783 )
anilsingha-eGov Apr 29, 2024
ce1b545
ISTE-8 Modification in all select for Multiselect
chinmoy-eGov Apr 29, 2024
acca060
ISTE-8 Modification in all select for Multiselect ( #784 )
anilsingha-eGov Apr 29, 2024
76aad43
ISTE-22 Modification in Change city dropdown
chinmoy-eGov Apr 30, 2024
6674f41
ISTE-22 Modification in Change city dropdown ( #785 )
anilsingha-eGov Apr 30, 2024
5147e08
ISTE-11: Added css to hide breadcrum
anilsingha-eGov May 3, 2024
9c606c8
ISTE-11: Added css to hide breadcrum ( #787 )
anilsingha-eGov May 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
PFM-5822: forgot password fixes WIP
  • Loading branch information
anilsingha-eGov committed Mar 11, 2024
commit b8813f0b850d4de0da66181b33c4d4ae1bb0ef1d
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ import Background from "../../../components/Background";
import Header from "../../../components/Header";
import SelectOtp from "../../citizen/Login/SelectOtp";


const ChangePasswordComponent = ({ config: propsConfig, t }) => {
const [user, setUser] = useState(null);
const { mobile_number: mobileNumber, tenantId } = Digit.Hooks.useQueryParams();
@@ -76,14 +75,6 @@ const ChangePasswordComponent = ({ config: propsConfig, t }) => {
const config = [
{
body: [
{
label: t(username.label),
type: username.type,
populators: {
name: username.name,
},
isMandatory: true,
},
{
label: t(password.label),
type: password.type,
Original file line number Diff line number Diff line change
@@ -12,6 +12,8 @@ const ForgotPassword = ({ config: propsConfig, t }) => {
const [showToast, setShowToast] = useState(null);
const getUserType = () => Digit.UserService.getType();

const tenantId = Digit.ULBService.getCurrentTenantId();

useEffect(() => {
if (!user) {
Digit.UserService.setType("employee");
@@ -27,21 +29,22 @@ const ForgotPassword = ({ config: propsConfig, t }) => {
};

const onForgotPassword = async (data) => {
if (!data.city) {
alert("Please Select City!");
return;
}
console.log("datatata", data);
// if (!data.city) {
// alert("Please Select City!");
// return;
// }
const requestData = {
otp: {
mobileNumber: data.mobileNumber,
userType: getUserType().toUpperCase(),
type: "passwordreset",
tenantId: data.city.code,
tenantId: tenantId,
},
};
try {
await Digit.UserService.sendOtp(requestData, data.city.code);
history.push(`/${window?.contextPath}/employee/user/change-password?mobile_number=${data.mobileNumber}&tenantId=${data.city.code}`);
await Digit.UserService.sendOtp(requestData, tenantId);
history.push(`/${window?.contextPath}/employee/user/change-password?mobile_number=${data.mobileNumber}&tenantId=${tenantId}`);
} catch (err) {
setShowToast(err?.response?.data?.error?.fields?.[0]?.message || "Invalid login credentials!");
setTimeout(closeToast, 5000);
@@ -61,18 +64,23 @@ const ForgotPassword = ({ config: propsConfig, t }) => {
type: userId.type,
populators: {
name: userId.name,
validation: {
pattern: /^[6-9]\d{9}$/,
maxLength: 10,
},
componentInFront: "+91",
},

isMandatory: true,
}
},
],
},
];

if (isLoading) {
return <Loader />;
}
console.log(config,"config")
console.log("configgg", config);
return (
<Background>
<div className="employeeBackbuttonAlign">
Original file line number Diff line number Diff line change
@@ -99,25 +99,27 @@ const Login = ({ config: propsConfig, t, isDisabled }) => {

let config = [{ body: propsConfig?.inputs }];

console.log("configigigig", config);

const { mode } = Digit.Hooks.useQueryParams();
if (mode === "admin" && config?.[0]?.body?.[2]?.disable == false && config?.[0]?.body?.[2]?.populators?.defaultValue == undefined) {
config[0].body[2].disable = true;
config[0].body[2].isMandatory = false;
config[0].body[2].populators.defaultValue = defaultValue;
}
if(config && config[0].body && config[0].body[1].label === 'CORE_LOGIN_PASSWORD'){
if (config && config[0].body && config[0].body[1].label === "CORE_LOGIN_PASSWORD") {
config[0].body[1].populators.validation = {
maxlength: 30
maxlength: 30,
};
}
}
return isLoading || isStoreLoading ? (
<Loader />
) : (
<Background>
<div className="employeeBackbuttonAlign">
<BackButton variant="white" style={{ borderBottom: "none" }} />
</div>

<FormComposerV2
onSubmit={onLogin}
isDisabled={isDisabled || disable}
@@ -159,4 +161,4 @@ Login.defaultProps = {
loginParams: null,
};

export default Login;
export default Login;
Original file line number Diff line number Diff line change
@@ -16,16 +16,21 @@ const MobileNumber = (props) => {
<React.Fragment>
<div className="field-container">
{!props.hideSpan ? (
<span style={{ maxWidth: "50px", marginTop: "unset",border:"1px solid #464646",borderRight:"none", ...props.labelStyle }} className="citizen-card-input citizen-card-input--front">
<span
style={{ maxWidth: "50px", marginTop: "unset", border: "1px solid #464646", borderRight: "none", ...props.labelStyle }}
className="citizen-card-input citizen-card-input--front"
>
+91
</span>
) : null}
<div className={`text-input ${user_type === "employee"? "" : "text-mobile-input-width"} ${props.className}`}>
<div className={`text-input ${user_type === "employee" ? "" : "text-mobile-input-width"} ${props.className}`}>
<input
type={"text"}
name={props.name}
id={props.id}
className={`${user_type ? "employee-card-input" : "citizen-card-input"} ${props.disable && "disabled"} focus-visible ${props.errorStyle && "employee-card-input-error"}`}
className={`${user_type ? "employee-card-input" : "citizen-card-input"} ${props.disable && "disabled"} focus-visible ${
props.errorStyle && "employee-card-input-error"
}`}
placeholder={props.placeholder}
onChange={onChange}
ref={props.inputRef}