@asaleh37/ui-base 25.9.16 → 25.9.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "25.9.16",
+  "version": "25.9.17",
   "description": "",
   "license": "ISC",
   "author": "Ahmed Saleh Mohamed",

package/src/components/App.tsx

@@ -18,13 +18,17 @@ import { MsalProvider } from "@azure/msal-react";
 
 const App: React.FC<AppInfo> = (props: AppInfo) => {
   const dispatch = useDispatch();
-  const msalInstance = new PublicClientApplication({
-    auth: {
-      clientId: props?.azureConfiguration?.frontEndClientId,
-      authority: `https://login.microsoftonline.com/${props?.azureConfiguration?.tenantId}`,
-      redirectUri: props?.azureConfiguration?.redirectURL,
-    },
-  });
+  let msalInstance;
+  if (props?.authenticationMethod === "AZURE") {
+    msalInstance = new PublicClientApplication({
+      auth: {
+        clientId: props?.azureConfiguration?.frontEndClientId,
+        authority: `https://login.microsoftonline.com/${props?.azureConfiguration?.tenantId}`,
+        redirectUri: props?.azureConfiguration?.redirectURL,
+      },
+    });
+  }
+
   LicenseInfo.setLicenseKey(props.muiPremiumKey);
   const LightThemeOptions: ThemeOptions = {
     components: {

package/src/components/ExampleTrial.tsx

@@ -0,0 +1,24 @@
+import { useApiActions } from "../hooks";
+import { FormElementProps, TemplateForm } from "./templates";
+
+const ExampleTrial: React.FC = () => {
+  const formElements: FormElementProps[] = [
+    {
+      mode: "props",
+      type: "field",
+      props: {
+        fieldLabel: "test",
+        fieldName: "test",
+        fieldType: "combobox",
+        commonStoreKey: "SystemParameterTypes",
+        optionValueField: "value",
+        optionDisplayField: "value",
+      },
+    },
+  ];
+  const apiActions = useApiActions({});
+
+  return <TemplateForm apiActions={apiActions} elements={formElements} />;
+};
+
+export default ExampleTrial;

package/src/components/templates/DataEntryTemplates/TemplateDataForm/FormFields/ComboBox.tsx

@@ -73,11 +73,13 @@ const ComboBox: React.FC<ComboBoxProps> = (props) => {
     props?.storeLoadParam,
     props?.dataQueryId,
     props?.commonStoreKey,
+    props?.options,
+    commonStoreData,
   ]);
 
   const { t } = useTranslation();
   const getValue = (v: string) => {
-    for (let option of props.options) {
+    for (let option of comboboxData) {
       if (option[props.valueField] == v) {
         return option;
       }

package/src/navigationItems/index.tsx

@@ -31,5 +31,12 @@ export const findNavigationItemById = (
 };
 
 export const NavigationItems: TreeViewBaseItem<ExtendedTreeItemProps>[] = [
-  ...AdministrationItems
+  ...AdministrationItems,
+  {
+    id: "example",
+    icon: "wind",
+    action: "NAVIGATION",
+    actionPayload: { path: "example" },
+    label: "Example",
+  },
 ];

package/src/routes/index.ts

@@ -1,5 +1,8 @@
-
+import ExampleTrial from "../components/ExampleTrial";
 import { ADMINISTRATION_ROUTES } from "./administration";
 import { SystemRoute } from "./types";
 
-export const SYSTEM_ROUTES: Array<SystemRoute> = [...ADMINISTRATION_ROUTES];
+export const SYSTEM_ROUTES: Array<SystemRoute> = [
+  ...ADMINISTRATION_ROUTES,
+  { path: "example", component: ExampleTrial },
+];