updated some fixes in taregts

egovernments · Oct 10, 2024 · 92eebce · 92eebce
1 parent c78d6f0
commit 92eebce
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 55 deletions.
diff --git a/...web/micro-ui-internals/packages/modules/workbench-hcm/src/components/FacilityComponent.js b/...web/micro-ui-internals/packages/modules/workbench-hcm/src/components/FacilityComponent.js
@@ -2,6 +2,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Card, Header, Button, Loader } from "@egovernments/digit-ui-react-components";
 import { data } from "../configs/ViewProjectConfig";
+import getProjectServiceUrl from "../utils/getProjectServiceUrl";
 
 const FacilityComponent = (props) => {
  const { t } = useTranslation();

diff --git a/.../web/micro-ui-internals/packages/modules/workbench-hcm/src/components/HCMWORKBENCHCard.js b/.../web/micro-ui-internals/packages/modules/workbench-hcm/src/components/HCMWORKBENCHCard.js
@@ -17,36 +17,36 @@ const HCMWORKBENCHCard = () => {
  const tenantId = Digit.ULBService.getCurrentTenantId();
 
  let links = [
- {
- label: t("WORKBENCH_HELP_SCREEN_BASIC_SETUP"),
- link: `/${window?.contextPath}/employee/hcmworkbench/help-screen/basic-setup`,
- roles: ROLES.HCM,
- },
+ // {
+ //  label: t("WORKBENCH_HELP_SCREEN_BASIC_SETUP"),
+ //  link: `/${window?.contextPath}/employee/hcmworkbench/help-screen/basic-setup`,
+ //  roles: ROLES.HCM,
+ // },
  {
  label: t("WORKBENCH_MASTER"),
  link: `/${window?.contextPath}/employee/hcmworkbench/master/master-landing-screen`,
  roles: ROLES.HCM,
  },
- {
- label: t("ACTION_TEST_LOCALISATION"),
- link: `/${window?.contextPath}/employee/workbench/localisation-search`,
- roles: ROLES.HCM,
- },
- {
- label: t("WORKBENCH_USER"),
- link: `/${window?.contextPath}/employee/hcmworkbench/master/user-landing-screen`,
- roles: ROLES.HCM,
- },
- {
- label: t("WORKBENCH_HELP_SCREEN_CHECKLIST"),
- link: `/${window?.contextPath}/employee/hcmworkbench/help-screen/check-list`,
- roles: ROLES.HCM,
- },
- {
- label: t("WORKBENCH_INBOX"),
- link: `/${window?.contextPath}/employee/hcmworkbench/inbox`,
- roles: ROLES.HCM,
- },
+ // {
+ //  label: t("ACTION_TEST_LOCALISATION"),
+ //  link: `/${window?.contextPath}/employee/workbench/localisation-search`,
+ //  roles: ROLES.HCM,
+ // },
+ // {
+ //  label: t("WORKBENCH_USER"),
+ //  link: `/${window?.contextPath}/employee/hcmworkbench/master/user-landing-screen`,
+ //  roles: ROLES.HCM,
+ // },
+ // {
+ //  label: t("WORKBENCH_HELP_SCREEN_CHECKLIST"),
+ //  link: `/${window?.contextPath}/employee/hcmworkbench/help-screen/check-list`,
+ //  roles: ROLES.HCM,
+ // },
+ // {
+ //  label: t("WORKBENCH_INBOX"),
+ //  link: `/${window?.contextPath}/employee/hcmworkbench/inbox`,
+ //  roles: ROLES.HCM,
+ // },
 
  // {
  // label: t("WORKBENCH_CREATE_CAMPAIGN"),

diff --git a/...i/web/micro-ui-internals/packages/modules/workbench-hcm/src/components/TargetComponent.js b/...i/web/micro-ui-internals/packages/modules/workbench-hcm/src/components/TargetComponent.js
@@ -2,6 +2,7 @@ import { Button, Header, SVG, Toast } from "@egovernments/digit-ui-react-compone
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import AssignTarget from "./AssignTarget";
+import getProjectServiceUrl from "../utils/getProjectServiceUrl";
 
 const TargetComponent = (props) => {
  const { t } = useTranslation();

diff --git a/...ui/web/micro-ui-internals/packages/modules/workbench-hcm/src/configs/ViewProjectConfig.js b/...ui/web/micro-ui-internals/packages/modules/workbench-hcm/src/configs/ViewProjectConfig.js
@@ -65,95 +65,99 @@ export const data = (project) => {
  ],
  },
  {
- navigationKey: "card2",
+ navigationKey: "card5",
  sections: [
  {
- navigationKey: "card2",
+ navigationKey: "card5",
+
  type: "COMPONENT",
- component: "ProjectBeneficiaryComponent",
- props: { projectId: project?.Project?.[0]?.id },
+ component: "TargetComponent",
+ props: { targets: project?.Project?.[0]?.targets, project: project?.Project?.[0] },
  },
  ],
  },
  {
- navigationKey: "card1",
+ navigationKey: "card3",
  sections: [
  {
- navigationKey: "card1",
+ navigationKey: "card3",
 
  type: "COMPONENT",
- component: "ProjectStaffComponent",
+ component: "ProjectChildrenComponent",
  props: { projectId: project?.Project?.[0]?.id, ...project },
  },
  ],
  },
  {
- navigationKey: "card3",
+ navigationKey: "card2",
  sections: [
  {
- navigationKey: "card3",
-
+ navigationKey: "card2",
  type: "COMPONENT",
- component: "ProjectChildrenComponent",
- props: { projectId: project?.Project?.[0]?.id, ...project },
+ component: "ProjectBeneficiaryComponent",
+ props: { projectId: project?.Project?.[0]?.id },
  },
  ],
  },
  {
- navigationKey: "card4",
+ navigationKey: "card1",
  sections: [
  {
- navigationKey: "card4",
+ navigationKey: "card1",
 
  type: "COMPONENT",
- component: "FacilityComponent",
- props: { projectId: project?.Project?.[0]?.id },
+ component: "ProjectStaffComponent",
+ props: { projectId: project?.Project?.[0]?.id, ...project },
  },
  ],
  },
+
  {
- navigationKey: "card5",
+ navigationKey: "card4",
  sections: [
  {
- navigationKey: "card5",
+ navigationKey: "card4",
 
  type: "COMPONENT",
- component: "TargetComponent",
- props: { targets: project?.Project?.[0]?.targets, project: project?.Project?.[0] },
+ component: "FacilityComponent",
+ props: { projectId: project?.Project?.[0]?.id },
  },
  ],
  },
+
  ],
  apiResponse: {},
  additionalDetails: {},
  horizontalNav: {
  showNav: true,
  configNavItems: [
  {
- name: "card2",
+ name: "card5",
  active: true,
- code: "Project Resource",
+ code: "Targets",
  },
  {
- name: "card1",
+ name: "card3",
  active: true,
- code: "Project Staff",
+ code: "Children",
  },
  {
- name: "card3",
+ name: "card2",
  active: true,
- code: "Children",
+ code: "Project Resource",
  },
  {
- name: "card4",
+ name: "card1",
  active: true,
- code: "Facility",
+ code: "Project Staff",
  },
+
  {
- name: "card5",
+ name: "card4",
  active: true,
- code: "Targets",
+ code: "Facility",
  },
+
  ],
  activeByDefault: "card1",
  },