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.

Sign up for GitHub

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

integration with the generate and create api #314

Merged
merged 7 commits into from
Apr 17, 2024
Merged

integration with the generate and create api #314

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f0c0b12
HLM-5110 integrated facility with generate api
Bhavya-egov Apr 17, 2024
32a187a
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
Bhavya-egov Apr 17, 2024
6dc5eb0
updated css version
Bhavya-egov Apr 17, 2024
211b3c2
made hierarchy type as generic
Bhavya-egov Apr 17, 2024
8fbcede
changed variable names
Bhavya-egov Apr 17, 2024
e1a1b68
changes in hierarchy type
Bhavya-egov Apr 17, 2024
54355b0
Merge branch 'campaign' into HLM-5110
jagankumar-egov Apr 17, 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
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/example/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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].13-campaign/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].14-campaign/dist/index.css" />
Copy link
Contributor

Choose a reason for hiding this comment

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

Tip

Codebase Verification

Verification Result: Issue with CSS Version Link

The verification process aimed to confirm the accessibility of the updated version 1.0.14-campaign of @egovernments/digit-ui-css at the specified URL. The script executed returned a 404 HTTP status code, indicating that the resource is not found at the provided URL.

Action Required:

  • Please check the version number and the URL for any typographical errors.
  • Verify if the version 1.0.14-campaign is correctly published and available on the CDN.
  • Consider reverting to a previous version if the current one is not yet deployed.
Analysis chain

Confirm that the updated version 1.0.14-campaign of @egovernments/digit-ui-css is correctly deployed and accessible at the specified URL.

Scripts Executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check if the specified CSS version is accessible.
curl -o /dev/null -s -w "%{http_code}\n" https://unpkg.com/@egovernments/[email protected]/dist/index.css

Length of output: 122

<!-- added below css for hcm-workbench module inclusion-->

<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->
Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/example/src/setupProxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ module.exports = function (app) {
"/hcm-bff/bulk/_transform",
"/hcm-bff/hcm/_processmicroplan",
"/health-hrms",
"/project-factory/v1/project-type",
"/project-factory",
"/boundary-service"
].forEach((location) => app.use(location, createProxy));
["/pb-egov-assets"].forEach((location) => app.use(location, assetsProxy));
Expand Down
3 changes: 2 additions & 1 deletion micro-ui/web/micro-ui-internals/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"*.{js,css,md}": "prettier --write"
},
"dependencies": {
"ajv": "^8.12.0",
"lodash": "4.17.21",
"microbundle-crl": "0.13.11",
"@egovernments/digit-ui-react-components": "1.8.1-beta.12",
Expand All @@ -53,4 +54,4 @@
"react-query": "3.6.1",
"react-router-dom": "5.3.0"
}
}
}
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/css/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-css",
"version": "1.0.13-campaign",
"version": "1.0.14-campaign",
"license": "MIT",
"main": "dist/index.css",
"author": "Jagankumar <[email protected]>",
Expand Down
15 changes: 15 additions & 0 deletions micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaignCycle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@
margin-bottom: 1.5rem;
}
}
.uploaded-file-container {
margin-left: 0rem;
}
.bulk-drag-drop-container {
background-color: #fafafa;
border: 1.5px dashed #d6d5d4;
Expand Down Expand Up @@ -105,6 +108,18 @@
}
}

.drag-drop-container{
margin-left: 0rem;
.drag-drop{
color: #B1B4B6;
}
.browse-text {
text-decoration: underline;
color: #f47738;
transition: color 0.3s;
}
}

.campaign-counter-container {
padding: 1.5rem;
.card-text {
Expand Down
10 changes: 4 additions & 6 deletions micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@ import EmployeeApp from "./pages/employee";
import { CustomisedHooks } from "./hooks";
import { UICustomizations } from "./configs/UICustomizations";
import CampaignCard from "./components/CampaignCard";
import UploadBoundaryData from "./pages/employee/UploadBoundaryData";
import CycleConfiguration from "./pages/employee/CycleConfiguration";
import DeliverySetup from "./pages/employee/deliveryRule";
import TimelineCampaign from "./components/TimelineCampaign";
import CampaignDates from "./components/CampaignDates";
import CampaignType from "./components/CampaignType";
import CampaignName from "./components/CampaignName";
import MyCampaign from "./pages/employee/MyCampaign";
import UploadFacilityData from "./pages/employee/UploadFacilityData";
import CampaignSummary from "./components/CampaignSummary";
import CycleDetaisPreview from "./components/CycleDetaisPreview";
import Response from "./pages/employee/Response";
import SelectingBoundaries from "./pages/employee/SelectingBoundaries";
import SelectingBoundaries from "./components/SelectingBoundaries";
import UploadData from "./components/UploadData";

const CampaignModule = ({ stateCode, userType, tenants }) => {
const moduleCode = ["campaignmanager", "workbench", "mdms", "schema"];
Expand Down Expand Up @@ -45,19 +44,18 @@ const componentsToRegister = {
// campaignModule: CampaignModule,
// campaignCard: CampaignCard,
CampaignCard: CampaignCard,
UploadBoundaryData,
UploadData,
DeliveryRule: DeliverySetup,
CycleConfiguration: CycleConfiguration,
TimelineCampaign,
CampaignDates,
CampaignType,
CampaignName,
MyCampaign,
UploadFacilityData,
CampaignSummary,
CycleDetaisPreview,
Response,
SelectingBoundaries: SelectingBoundaries
SelectingBoundaries
};

const overrideHooks = () => {
Expand Down
4 changes: 2 additions & 2 deletions ...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BulkUpload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const BulkUpload = ({ multiple = true, onSubmit, fileData, onFileDelete, onFileD
<div className="drag-drop-container">
<UploadIcon />
<p className="drag-drop-text">
{t("WBH_DRAG_DROP")} <text className="browse-text">{t("WBH_BULK_BROWSE_FILES")}</text>
<text className="drag-drop"> {t("WBH_DRAG_DROP")}</text> <text className="browse-text">{t("WBH_BULK_BROWSE_FILES")}</text>
</p>
</div>
);
Expand Down Expand Up @@ -98,7 +98,7 @@ const BulkUpload = ({ multiple = true, onSubmit, fileData, onFileDelete, onFileD

const handleChange = async (newFiles) => {
try {
await validateExcel(newFiles[0]);
// await validateExcel(newFiles[0]);
onSubmit([...newFiles]);
} catch (error) {
// Handle the validation error, you can display a message or take appropriate actions.
Expand Down
2 changes: 1 addition & 1 deletion ...src/pages/employee/SelectingBoundaries.js → ...ger/src/components/SelectingBoundaries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useEffect, useState, Fragment } from "react";
import { CardText, LabelFieldPair, Card, Header, CardLabel } from "@egovernments/digit-ui-react-components";
import { useTranslation } from "react-i18next";
import { Dropdown, InfoCard, MultiSelectDropdown } from "@egovernments/digit-ui-components";
import { mailConfig } from "../../configs/mailConfig";
import { mailConfig } from "../configs/mailConfig";
function SelectingBoundaries({ onSelect, formData, ...props }) {
const { t } = useTranslation();
const tenantId = Digit.ULBService.getCurrentTenantId();
Expand Down
Loading
Loading