fixes-> cyclenumber issue, hover issue, dropdown height issue, (#656)

* fixes-> cyclenumber issue, hover issue, dropdown height issue, * css --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>
egovernments · May 21, 2024 · 77399e0 · 77399e0
1 parent 9c705ef
commit 77399e0
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 15 deletions.
diff --git a/micro-ui/web/micro-ui-internals/example/public/index.html b/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -17,7 +17,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.1-beta.10/dist/index.css" />
 
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-coreui.14/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.40-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.41-campaign/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
 
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.41/dist/index.css" /> -->

diff --git a/micro-ui/web/micro-ui-internals/packages/css/package.json b/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-css",
-  "version": "1.0.40-campaign",
+  "version": "1.0.41-campaign",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <jagan.kumar@egov.org.in>",

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -247,3 +247,11 @@ input[type="date"]::-webkit-calendar-picker-indicator {
     }
   }
 }
+.selecting-boundaries-dropdown{
+  .digit-multiselectdropdown-server{
+    max-height: 15rem;
+  }
+}
+.hover{
+  cursor: pointer;
+}
diff --git a/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/AddProductField.js b/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/AddProductField.js
@@ -133,7 +133,7 @@ const AddProductField = ({ onSelect }) => {
       <Button
         variation="secondary"
         label={t(`CAMPAIGN_ADD_MORE_PRODUCT_BUTTON`)}
-        // className={"add-rule-btn"}
+        className={"hover"}
         icon={<AddIcon styles={{ height: "1.5rem", width: "1.5rem" }} fill={PRIMARY_COLOR} />}
         onButtonClick={addMoreField}
       />

diff --git a/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BulkUpload.js b/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BulkUpload.js
@@ -143,7 +143,7 @@ const BulkUpload = ({ multiple = true, onSubmit, fileData, onFileDelete, onFileD
             variation="secondary"
             icon={<DownloadIcon styles={{ height: "1.25rem", width: "1.25rem" }} fill={PRIMARY_COLOR} />}
             type="button"
-            className="workbench-download-template-btn"
+            className="workbench-download-template-btn hover"
             onButtonClick={(e) => {
               e.stopPropagation();
               handleFileDownload(e, fileUrl);
@@ -154,7 +154,7 @@ const BulkUpload = ({ multiple = true, onSubmit, fileData, onFileDelete, onFileD
             variation="secondary"
             icon={<DeleteIconv2 styles={{ height: "1.25rem", width: "2.5rem" }} fill={PRIMARY_COLOR} />}
             type="button"
-            className="workbench-download-template-btn"
+            className="workbench-download-template-btn hover"
             onButtonClick={(e) => {
               e.stopPropagation();
               handleFileDelete(file, index);

diff --git a/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js b/...eb/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignSummary.js
@@ -430,7 +430,7 @@ const CampaignSummary = () => {
             variation="secondary"
             icon={<DownloadIcon styles={{ height: "1.25rem", width: "1.25rem" }} fill={PRIMARY_COLOR} />}
             type="button"
-            className="campaign-download-template-btn"
+            className="campaign-download-template-btn hover"
             onButtonClick={downloadUserCred}
           />
         )}

diff --git a/...b/micro-ui-internals/packages/modules/campaign-manager/src/components/CycleDataPreview.js b/...b/micro-ui-internals/packages/modules/campaign-manager/src/components/CycleDataPreview.js
@@ -13,7 +13,7 @@ const Tabs = ({ deliveryData, onTabChange }) => {
         <button
           key={index}
           type="button"
-          className={`campaign-sub-tab-head ${_.active === true ? "active" : ""}`}
+          className={`campaign-sub-tab-head ${_.active === true ? "active" : ""} hover`}
           onClick={() => onTabChange(_.deliveryIndex, index)}
         >
           {t(`CAMPAIGN_DELIVERY`)} {index + 1}

diff --git a/...icro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundaries.js b/...icro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundaries.js
@@ -328,6 +328,7 @@ function SelectingBoundaries({ onSelect, formData, ...props }) {
                 </CardLabel>
                 <div className="digit-field">
                   <MultiSelectDropdown
+                    props={{ className: "selecting-boundaries-dropdown" }}
                     t={t}
                     options={boundaryData[boundary?.boundaryType]?.map((item) => item?.boundaryTypeData?.TenantBoundary?.[0]?.boundary)?.flat() || []}
                     optionsKey={"code"}
@@ -347,6 +348,7 @@ function SelectingBoundaries({ onSelect, formData, ...props }) {
                 <div className="digit-field">
                   <MultiSelectDropdown
                     t={t}
+                    props={{ className: "selecting-boundaries-dropdown" }}
                     options={
                       boundaryData[boundary?.boundaryType]?.map((item) => ({
                         code: item?.parentCode,

diff --git a/...o-ui-internals/packages/modules/campaign-manager/src/pages/employee/CycleConfiguration.js b/...o-ui-internals/packages/modules/campaign-manager/src/pages/employee/CycleConfiguration.js
@@ -109,12 +109,14 @@ function CycleConfiguration({ onSelect, formData, control, ...props }) {
 
   const updateCycle = (d) => {
     if (d === 0 || d > 5) return;
+    if (Number(d?.target?.value) === 0 || Number(d?.target?.value) > 5) return;
     // if (d?.target?.value.trim() === "") return;
     dispatch({ type: "UPDATE_CYCLE", payload: d?.target?.value ? Number(d?.target?.value) : d?.target?.value === "" ? d.target.value : d });
   };
 
   const updateDelivery = (d) => {
     if (d === 0 || d > 5) return;
+    if (Number(d?.target?.value) === 0 || Number(d?.target?.value) > 5) return;
     // if (d?.target?.value.trim() === "") return;
     dispatch({ type: "UPDATE_DELIVERY", payload: d?.target?.value ? Number(d?.target?.value) : d });
   };

diff --git a/...s/packages/modules/campaign-manager/src/pages/employee/deliveryRule/AddDeliverycontext.js b/...s/packages/modules/campaign-manager/src/pages/employee/deliveryRule/AddDeliverycontext.js
@@ -548,7 +548,7 @@ const AddAttributeWrapper = ({ deliveryRuleIndex, delivery, deliveryRules, setDe
         <Button
           variation="secondary"
           label={t(`CAMPAIGN_ADD_MORE_ATTRIBUTE_TEXT`)}
-          className="add-attribute"
+          className="add-attribute hover"
           icon={<AddIcon styles={{ height: "1.5rem", width: "1.5rem" }} fill={PRIMARY_COLOR} width="20" height="20" />}
           onButtonClick={addMoreAttribute}
         />
@@ -611,8 +611,17 @@ const AddDeliveryRule = ({ targetedData, deliveryRules, setDeliveryRules, index,
           </p>
           {deliveryRules.length !== 1 && (
             <div
+              className="hover"
               onClick={() => onDelete()}
-              style={{ fontWeight: "600", fontSize: "1rem", color: PRIMARY_COLOR, display: "flex", gap: "0.5rem", alignItems: "center" }}
+              style={{
+                fontWeight: "600",
+                fontSize: "1rem",
+                color: PRIMARY_COLOR,
+                display: "flex",
+                gap: "0.5rem",
+                alignItems: "center",
+                cursor: "pointer",
+              }}
             >
               <DustbinIcon /> {t(`CAMPAIGN_DELETE_CONDITION_LABEL`)}
             </div>
@@ -644,7 +653,7 @@ const AddDeliveryRule = ({ targetedData, deliveryRules, setDeliveryRules, index,
         </div>
         <Button
           variation="secondary"
-          className={"add-product-btn"}
+          className={"add-product-btn hover"}
           label={t(`CAMPAIGN_ADD_PRODUCTS_BUTTON_TEXT`)}
           icon={<SVG.AppRegistration />}
           onButtonClick={() => setShowModal(true)}
@@ -742,7 +751,7 @@ const AddDeliveryRuleWrapper = ({}) => {
         <Button
           variation="secondary"
           label={t(`CAMPAIGN_ADD_MORE_DELIVERY_BUTTON`)}
-          className={"add-rule-btn"}
+          className={"add-rule-btn hover"}
           icon={<AddIcon styles={{ height: "1.5rem", width: "1.5rem" }} fill={PRIMARY_COLOR} />}
           onButtonClick={addMoreDelivery}
         />

diff --git a/...s/packages/modules/campaign-manager/src/pages/employee/deliveryRule/AddProductscontext.js b/...s/packages/modules/campaign-manager/src/pages/employee/deliveryRule/AddProductscontext.js
@@ -177,6 +177,7 @@ function AddProducts({ stref, selectedDelivery, showToast, closeToast }) {
 
   const incrementC = (data, value) => {
     if (value?.target?.value.trim() === "") return;
+    if (value?.target?.value.trim() === 0 || value?.target?.value.trim() > 10 ) return;
     if (value === 0) return;
     if (value > 10) return;
     setProducts((prevState) => {
@@ -244,7 +245,7 @@ function AddProducts({ stref, selectedDelivery, showToast, closeToast }) {
         <Button
           variation="secondary"
           label={t(`CAMPAIGN_PRODUCTS_MODAL_SECONDARY_ACTION`)}
-          className={"add-rule-btn"}
+          className={"add-rule-btn hover"}
           icon={<AddIcon fill={PRIMARY_COLOR} styles={{ height: "1.5rem", width: "1.5rem" }} />}
           onButtonClick={add}
         />

diff --git a/...nals/packages/modules/campaign-manager/src/pages/employee/deliveryRule/MultiTabcontext.js b/...nals/packages/modules/campaign-manager/src/pages/employee/deliveryRule/MultiTabcontext.js
@@ -133,7 +133,7 @@ const Tabs = ({ onTabChange }) => {
         <button
           key={index}
           type="button"
-          className={`campaign-tab-head ${_.active === true ? "active" : ""}`}
+          className={`campaign-tab-head ${_.active === true ? "active" : ""} hover`}
           onClick={() => onTabChange(_.cycleIndex, index)}
         >
           <p style={{ margin: 0, position: "relative", top: "-0.1rem" }}>
@@ -173,7 +173,7 @@ const SubTabs = ({ onSubTabChange }) => {
           <button
             key={index}
             type="button"
-            className={`campaign-sub-tab-head ${_.active === true ? "active" : ""}`}
+            className={`campaign-sub-tab-head ${_.active === true ? "active" : ""} hover`}
             onClick={() => onSubTabChange(_.deliveryIndex, index)}
           >
             {t(`CAMPAIGN_DELIVERY`)} {index + 1}

diff --git a/micro-ui/web/public/index.html b/micro-ui/web/public/index.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.1-beta.10/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-coreui.14/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.40-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.41-campaign/dist/index.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>DIGIT</title>