css fixes (#1400)

* css fixes * removed console
egovernments · Sep 19, 2024 · aa99baf · aa99baf
1 parent 0ac90d9
commit aa99baf
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 12 deletions.
diff --git a/health/micro-ui/web/micro-ui-internals/example/public/index.html b/health/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -18,7 +18,7 @@
  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
 
  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].67-campaign/dist/index.css" />
+ <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].69-campaign/dist/index.css" />
 
  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
 

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/package.json b/health/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@egovernments/digit-ui-css",
- "version": "1.0.68-campaign",
+ "version": "1.0.69-campaign",
  "license": "MIT",
  "main": "dist/index.css",
  "author": "Jagankumar <[email protected]>",

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss
@@ -131,6 +131,7 @@
  flex-direction: row;
  gap: 1.5rem;
  align-items: stretch;
+ height: 31.25rem;
 }
 .stepper-card{
  height: 36.5rem;
@@ -139,3 +140,10 @@
 .stepper-subheader{
  color: theme(digitv2.lightTheme.header-sidenav);
 }
+.container-full{
+ display: flex;
+ flex-direction: row;
+ gap: 1.5rem;
+ align-items: stretch;
+ height: 100%;
+}
diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -828,13 +828,17 @@ tbody {
  padding: 1rem;
 }
 .card-container{
- height: 50rem;
+ height: 100%;
 }
 .card-container2{
  width: -webkit-fill-available;
  padding-bottom: 1.5rem;
 
 }
+.card-container-delivery{
+ height: 100%;
+ width: -webkit-fill-available;
+}
 
 .parent{
  color: theme(digitv2.lightTheme.header-sidenav);

diff --git a/...o-ui-internals/packages/modules/campaign-manager/src/components/BoundaryDetailsSummary.js b/...o-ui-internals/packages/modules/campaign-manager/src/components/BoundaryDetailsSummary.js
@@ -58,6 +58,7 @@ const BoundaryDetailsSummary = (props) => {
  text={t(boundary.code)}
  onClick={() => {}}
  className="multiselectdropdown-tag"
+ hideClose={true}
  />
  ))}
  {groupedByParent[parentKey].length > 10 && (

diff --git a/...ro-ui-internals/packages/modules/campaign-manager/src/components/UpdateBoundaryWrapper.js b/...ro-ui-internals/packages/modules/campaign-manager/src/components/UpdateBoundaryWrapper.js
@@ -3,19 +3,21 @@ import { UploadIcon, FileIcon, DeleteIconv2, Toast, Card, Header } from "@egover
 import { useTranslation } from "react-i18next";
 import { useLocation , useHistory } from "react-router-dom";
 import { Wrapper } from "./SelectingBoundaryComponent";
+import { Loader } from "@egovernments/digit-ui-components";
 
 const UpdateBoundaryWrapper = ({ ...props }) => {
  const { t } = useTranslation();
  const tenantId = Digit.ULBService.getStateId();
  const searchParams = new URLSearchParams(location.search);
  const id = searchParams.get("id");
- const hierarchyType = props?.props?.hierarchyType;
+ // const hierarchyType = props?.props?.hierarchyType;
  const { data: hierarchyConfig } = Digit.Hooks.useCustomMDMS(tenantId, "HCM-ADMIN-CONSOLE", [{ name: "hierarchyConfig" }]);
  const lowestHierarchy = useMemo(() => {
  return hierarchyConfig?.["HCM-ADMIN-CONSOLE"]?.hierarchyConfig?.find((item) => item.isActive)?.lowestHierarchy;
  }, [hierarchyConfig]);
- const [boundaryOptions, setBoundaryOptions] = useState( );
+ const [boundaryOptions, setBoundaryOptions] = useState({});
  const [selectedData, setSelectedData] = useState([]);
+ const [hierarchyType , SetHierarchyType] = useState(props?.props?.hierarchyType);
 
  const reqCriteriaCampaign = {
  url: `/project-factory/v1/project-type/search`,
@@ -29,7 +31,7 @@ const UpdateBoundaryWrapper = ({ ...props }) => {
 
  const { data: CampaignData } = Digit.Hooks.useCustomAPIHook(reqCriteriaCampaign);
 
- const hierarchyData = Digit.Hooks.campaign.useBoundaryRelationshipSearch({hierarchyType,tenantId});
+ const hierarchyData = Digit.Hooks.campaign.useBoundaryRelationshipSearch({BOUNDARY_HIERARCHY_TYPE: hierarchyType,tenantId});
 
  const handleBoundaryChange =(value) =>{
  setBoundaryOptions(value?.boundaryOptions);
@@ -38,6 +40,7 @@ const UpdateBoundaryWrapper = ({ ...props }) => {
 
  useEffect (() => {
  setSelectedData(CampaignData?.CampaignDetails?.[0]?.boundaries);
+ SetHierarchyType(CampaignData?.CampaignDetails?.[0]?.hierarchyType);
  },[CampaignData])
 
  return (
@@ -47,8 +50,9 @@ const UpdateBoundaryWrapper = ({ ...props }) => {
  <Wrapper 
  hierarchyType={hierarchyType} 
  lowest={lowestHierarchy} 
- // frozenData = { CampaignData?.CampaignDetails?.[0]?.boundaries} 
- // frozenType = {"filter"}
+ isMultiSelect ={"true"}
+ frozenData = { CampaignData?.CampaignDetails?.[0]?.boundaries} 
+ frozenType = {"filter"}
  hierarchyData = { hierarchyData}
  onSelect={(value) => {
  handleBoundaryChange(value);

diff --git a/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js b/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js
@@ -1039,7 +1039,7 @@ const UploadData = ({ formData, onSelect, ...props }) => {
 
  return (
  <>
- <div className="container">
+ <div className="container-full">
  <div className="card-container">
  <Card className="card-header-timeline">
  <TextBlock

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
@@ -263,7 +263,7 @@ const MultiTab = ({ tabCount = 3, subTabCount = 2 }) => {
 
  return (
  <>
- <div className="container">
+ <div className="container-full">
  <div className="card-container">
  <Card className="card-header-timeline">
  <TextBlock subHeader={t("HCM_DELIVERY_DETAILS")} subHeaderClasName={"stepper-subheader"} wrapperClassName={"stepper-wrapper"} />
@@ -277,7 +277,7 @@ const MultiTab = ({ tabCount = 3, subTabCount = 2 }) => {
  />
  </Card>
  </div>
- <div className="card-container2">
+ <div className="card-container-delivery">
  <Header>
  {t(
  `CAMPAIGN_PROJECT_${

diff --git a/health/micro-ui/web/public/index.html b/health/micro-ui/web/public/index.html
@@ -11,7 +11,8 @@
  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
  <!-- added below css for hcm-workbench module inclusion-->
- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
+
+ <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
 
  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
  <meta name="viewport" content="width=device-width, initial-scale=1" />