Merge pull request #683 from odisha-muktasoft/UCEM-699

kibana redirection core update
odisha-muktasoft · Oct 3, 2024 · 3587ff5 · 3587ff5
2 parents d987d2a + 6f88c14
commit 3587ff5
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 10 deletions.
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -12,7 +12,7 @@
     "@egovernments/digit-ui-react-components": "1.5.12",
     "@egovernments/digit-ui-components": "0.0.2-beta.43",
     "@egovernments/digit-ui-libraries": "1.5.0",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.18",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.19",
     "@egovernments/digit-ui-module-hrms": "1.5.26",
     "@egovernments/digit-ui-module-dss": "1.5.52",
     "@egovernments/digit-ui-module-attendencemgmt": "0.4.9",

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

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/override.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/override.scss
@@ -155,4 +155,19 @@
 
   .digit-bread-crumb{
     margin-bottom: 1.5rem;
+  }
+
+
+  th{
+    background-color: theme(digitv2.lightTheme.paper-primary);
+  }
+
+  .uploadfile-composer-textfield{
+    margin-bottom: 1.5rem;
+  }
+
+  .digit-header-content{
+    &.label{
+      margin-top: 0.565rem;
+    }
   }
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
@@ -25,6 +25,10 @@ const GetParamFromUrl = (key, fallback, search) => {
   return fallback;
 };
 
+const getMultiRootTenant = () => {
+  return window?.globalConfigs?.getConfig("MULTI_ROOT_TENANT") || false;
+};
+
 const getPattern = (type) => {
   switch (type) {
     case "Name":
@@ -320,6 +324,10 @@ const trimStringsInObject =  ( obj ) => {
   return trimmedObj;
 }
 
+const getRoleBasedHomeCard = () => {
+  return window?.globalConfigs?.getConfig("ROLE_BASED_HOMECARD") || false;
+};
+
 export default {
   pdf: PDFUtil,
   downloadWorksPDF,
@@ -369,5 +377,7 @@ export default {
   trimStringsInObject,
   statusBasedNavigation,
   getThumbnails,
-  debouncing
+  debouncing,
+  getMultiRootTenant,
+  getRoleBasedHomeCard
 };
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/works/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/works/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-works",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "Works",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
@@ -19,7 +19,7 @@
   },
   "dependencies": { 
     "@egovernments/digit-ui-react-components": "^1.5.0",
-    "@egovernments/digit-ui-components": "0.0.2-beta.40",
+    "@egovernments/digit-ui-components": "0.0.2-beta.43",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
     "react-dom": "17.0.2",

diff --git a/...nd/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/InputTextAmount.js b/...nd/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/InputTextAmount.js
@@ -1,4 +1,4 @@
-import TextInput from "./TextInput";
+import { TextInput } from "@egovernments/digit-ui-components";
 
 import React, { forwardRef, useImperativeHandle, useMemo, useRef, useEffect, useState } from "react";
 import {

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/FormComposer.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/FormComposer.js
@@ -215,7 +215,7 @@ export const FormComposer = (props) => {
       case "amount":
         // if (populators.defaultValue) setTimeout(setValue(populators?.name, populators.defaultValue));
         return (
-          <div className="field-container">
+          <div className="digit-field-container">
             {populators?.componentInFront ? (
               <span className={`component-in-front ${disable && "disabled"}`}>{populators.componentInFront}</span>
             ) : null}

diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
@@ -19,7 +19,7 @@
     "@egovernments/digit-ui-react-components": "1.5.12",
     "@egovernments/digit-ui-libraries": "1.5.0",
     "@egovernments/digit-ui-components": "0.0.2-beta.43",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.18",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.19",
     "@egovernments/digit-ui-module-hrms": "1.5.26",
     "@egovernments/digit-ui-module-dss": "1.5.52",
     "@egovernments/digit-ui-module-attendencemgmt": "0.4.9",

diff --git a/frontend/micro-ui/web/public/index.html b/frontend/micro-ui/web/public/index.html
@@ -9,7 +9,7 @@
     rel='stylesheet' type='text/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" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].48/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].49/dist/index.css" />
   <link rel="stylesheet" href="https://mukta-uat-bucket-s3.s3.ap-south-1.amazonaws.com/mukta-login.css" />
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-works-css/dist/index.css" /> -->
   <meta name="viewport" content="width=device-width, initial-scale=1" />

diff --git a/frontend/micro-ui/web/works/package.json b/frontend/micro-ui/web/works/package.json
@@ -16,7 +16,7 @@
   "homepage": "/core-ui",
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.5.0",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.18",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.19",
     "@egovernments/digit-ui-react-components": "1.5.12",
     "@egovernments/digit-ui-module-hrms": "1.5.5-alpha.4",
     "@egovernments/digit-ui-module-works": "^0.0.9",