robobyte-front-builder 1.0.19 → 1.0.23

package/src/pages/reportModule/reportBuilder/reportViewer/index.js

@@ -8,11 +8,11 @@ import CardHeader from "@mui/material/CardHeader";
 import Grid from "@mui/material/Grid";
 import {Plus} from "mdi-material-ui";
 import TAGGrid from "views/genericTable/TAGGrid";
-import {SettingsOutlined} from "@mui/icons-material";
+import {SettingsOutlined, AssessmentOutlined} from "@mui/icons-material";
 import UpdateReportPermissionDialog from "views/rolePermissions/UpdateReportPermissionDialog";
 import {getReportSession} from 'src/services/helper/reportSessionHelper'
-import BlankLayout from "src/@core/layouts/BlankLayout";
-import ReportsCard from "src/pages/reportModule/reportBuilder/reportsPermissions";
+import BlankLayout from '../../../../lib/layouts/BlankLayout';
+import ReportsCard from "../reportsPermissions";
 
 
 // make sure you’ve globally included the Alpine theme once in _app.js or your main stylesheet:
@@ -40,7 +40,24 @@ const ReportViewer = (params) => {
     sessionId,
     globalParams,
     isRerender = false,
-    updateRef
+    updateRef,
+    // Presentation — render above the toolbar. If title is omitted, the
+    // report's own name from builderMetadata.name is used.
+    title,
+    caption,
+    // Page-level toolbar buttons rendered after Filter / Refresh.
+    // Built by ReportViewerRenderer with bound onClick handlers.
+    viewerActions,
+    // nodeId / reportRefs are injected by the UI builder's ReportViewerRenderer.
+    // nodeId    — the builder schema node ID for this ReportViewer instance
+    // reportRefs — the shared registry { [nodeId]: updateRef } for all reports on the page
+    nodeId,
+    reportRefs,
+    // Viewer state — threaded from ReportViewerRenderer for column function scope
+    data,
+    dataRef,
+    openDialog,
+    closeDialog,
   } = params ?? router.query
   const [isLoading, setIsLoading] = useState(false)
   const [builderModel, setBuilderModel] = useState(null)
@@ -162,9 +179,8 @@ const ReportViewer = (params) => {
   return (
     <Box
       sx={{
-        display: 'flex',
+        display: 'block',
         width: '100%',
-        p: minimized !== true ? 2 : 0,
       }}
     >
       {isLoading ? (
@@ -178,33 +194,72 @@ const ReportViewer = (params) => {
           <CircularProgress/>
         </Box>
       ) : !builderModel ? (
-        <Box textAlign="center" mt={8}>
-          <Typography variant="subtitle1" color="text.secondary">
+        // ── Empty state ─────────────────────────────────────────────────────
+        // Shown when no `id` / `pageId` has resolved yet. In the standalone
+        // /report/viewer page this is the persistent "pick a report" state;
+        // inside the builder it usually flashes for one render before the
+        // model loads.
+        <Box
+          sx={{
+            minHeight: minimized ? 'auto' : '60vh',
+            display: 'flex',
+            flexDirection: 'column',
+            alignItems: 'center',
+            justifyContent: 'center',
+            gap: 1.5,
+            p: 4,
+            color: 'text.secondary',
+          }}
+        >
+          <Box
+            sx={{
+              width: 72,
+              height: 72,
+              borderRadius: '50%',
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+              bgcolor: 'action.hover',
+              color: 'text.disabled',
+              mb: 0.5,
+            }}
+          >
+            <AssessmentOutlined sx={{ fontSize: 36 }} />
+          </Box>
+          <Typography variant='h6' sx={{ fontWeight: 600, color: 'text.primary', textAlign: 'center' }}>
             No report selected
           </Typography>
+          <Typography variant='body2' sx={{ color: 'text.secondary', textAlign: 'center', maxWidth: 380 }}>
+            Pick a report from the list, or pass a <code>pageId</code> / <code>id</code> to load one here.
+          </Typography>
         </Box>
       ) : (
         <>
-          <Box display="flex" gap={1} flexDirection={'column'} sx={{
-            width: '100%',
-            backgroundColor: 'white', borderRadius: 2,
-            boxShadow: minimized !== true && '0 4px 12px rgba(0,0,0,0.08)',  // subtle custom shadow
-          }}>
+          <Box display="flex" gap={1} flexDirection={'column'} sx={{ width: '100%' }}>
+            {/*
+              Studio header — only shown on the standalone /report/viewer page
+              (noHeader is set by the builder when ReportViewer is embedded as
+              a component, which suppresses this row entirely). The title and
+              caption are now rendered inside SGrid's toolbar on the same row
+              as Filter / Refresh / viewer actions, so this header is just the
+              "go to studio" affordance for the standalone page.
+            */}
             {(minimized !== true && noHeader !== true) &&
               <Box display="flex" justifyContent={'space-between'} alignItems={'center'} gap={1} sx={{p: 2}}>
                 <Typography variant="subtitle1" color="text.secondary">{builderMetadata?.name ?? ""}</Typography>
-                {/*<Tooltip title={'Studio'}>*/}
-                {/*  <IconButton*/}
-                {/*    size={'small'}*/}
-                {/*    onClick={() => {*/}
-                {/*      router.push({pathname: '/reportModule/reportBuilder', query: {id: id ?? router.query?.id}})*/}
-                {/*    }}*/}
-                {/*  >*/}
-                {/*    <SettingsOutlined color={'primary'}/>*/}
-                {/*  </IconButton>*/}
-                {/*</Tooltip>*/}
+                <Tooltip title={'Studio'}>
+                  <IconButton
+                    size={'small'}
+                    onClick={() => {
+                      router.push({pathname: '/builders/report', query: {id: id ?? router.query?.id}})
+                    }}
+                  >
+                    <SettingsOutlined color={'primary'}/>
+                  </IconButton>
+                </Tooltip>
               </Box>}
-            <Box display={'flex'} alignItems="center" gap={1} width={'100%'}>
+
+            <Box sx={{width: '100%'}}>
               <SGrid
                 key={`rv-${payloadVersion}`}
                 minimized={minimized}
@@ -215,6 +270,12 @@ const ReportViewer = (params) => {
                 setOutGridApi={setOutGridApi}
                 externalTimer={externalTimer}
                 actions={actions}
+                viewerActions={viewerActions}
+                // Toolbar left side. Fall back to the report's own name from
+                // builderMetadata so standalone-page views still get a sensible
+                // title without explicit configuration.
+                title={title ?? builderMetadata?.name}
+                caption={caption}
                 reportTitle={builderMetadata?.name}
                 filter={sessionPayload?.externalFilter ?? filter}
                 columnsConfig={columnsConfig ?? []}
@@ -224,7 +285,13 @@ const ReportViewer = (params) => {
                 isRerender={isRerender}
                 // uniqueIdPath={'Id'}
                 // noPurge={true}
-                updateRef ={updateRef}
+                updateRef={updateRef}
+                nodeId={nodeId}
+                reportRefs={reportRefs}
+                data={data}
+                dataRef={dataRef}
+                openDialog={openDialog}
+                closeDialog={closeDialog}
               />
             </Box>
           </Box>

package/src/pages/reportModule/reportBuilder/reports/index.js

@@ -16,10 +16,8 @@ import ClearIcon from '@mui/icons-material/Clear'
 import {Endpoints, Services} from 'services/Endpoints'
 import PermissionsSubjects from 'src/configs/Permissions/PermissionsSubjects.json'
 import {EditOutlined, SettingsOutlined} from "@mui/icons-material";
-import DriverRequestStatus from "services/enums/DriverRequestStatusEnum";
 import Grid from "@mui/material/Grid";
 import ReportBuilderTypeEnum from "services/enums/ReportBuilderTypeEnum";
-import UpdateRangeProductPriceDialog from "views/productPrice/UpdateRangeProductPriceDialog";
 import handleChange from "services/helper/handleChange";
 import UpdateReportPermissionDialog from "views/rolePermissions/UpdateReportPermissionDialog";
 
@@ -107,7 +105,7 @@ const ReportsList = () => {
                   ))}
                 </Select>
               </FormControl>
-              <Button variant="contained" sx={{ml:3}} onClick={() => router.push('/reportModule/reportBuilder')}>
+              <Button variant="contained" sx={{ml:3}} onClick={() => router.push('/builders/report')}>
                 New
               </Button>
             </Box>
@@ -192,7 +190,7 @@ const ReportsList = () => {
                       size="small"
                       variant="outlined"
                       onClick={() =>
-                        router.push({pathname: '/reportModule/reportBuilder/reportViewer', query: {id: report.id}})
+                        router.push({pathname: '/builders/report/viewer', query: {id: report.id}})
                       }
                       sx={{flexGrow: 1}}    // <-- takes all remaining space
                     >
@@ -202,7 +200,7 @@ const ReportsList = () => {
                       size="small"
                       variant="outlined"
                       onClick={() =>
-                        router.push({pathname: '/reportModule/reportBuilder', query: {id: report.id}})
+                        router.push({pathname: '/builders/report', query: {id: report.id}})
                       }
                     >
                       <EditOutlined color={'secondary'} fontSize="small"/>

package/src/pages/reportModule/reportBuilder/reportsPermissions/index.js

@@ -13,11 +13,10 @@ import {CloudUploadOutline, Delete, DeleteCircle, DotsVerticalCircleOutline, Plu
 import {useEffect, useState, useContext, useMemo} from 'react'
 import handleChange from 'src/services/helper/handleChange'
 import {Avatar, Button, ButtonGroup, Card, CardContent, Checkbox, Dialog, IconButton, Popover} from '@mui/material'
-import ReportViewer from "src/pages/reportBuilder/reportViewer";
+import ReportViewer from "../reportViewer";
 import PermissionsSubjects from "src/configs/Permissions/PermissionsSubjects.json";
 import {AuthContext} from "context/AuthContext";
-import CompanyDeliveryLayout from "src/layouts/CompanyDeliveryLayout";
-import BlankLayout from "src/@core/layouts/BlankLayout";
+import BlankLayout from '../../../../lib/layouts/BlankLayout';
 // ** Utils Import
 
 // ** Actions Imports

package/src/pages/viewBuilder/index.jsx

@@ -1,17 +1,86 @@
-import { Box } from '@mui/material'
-import BlankLayout from 'src/@core/layouts/BlankLayout'
+import { Box, IconButton, Tooltip } from '@mui/material'
+import { ThemeProvider, CssBaseline } from '@mui/material'
+import BlankLayout from '../../lib/layouts/BlankLayout'
 import Sidebar from 'views/builder/sidebar/Sidebar'
 import Viewer from 'views/builder/viewer/Viewer'
-import { BuilderProvider, useBuilder } from 'src/context/BuilderContext'
+import { BuilderProvider, useBuilder } from 'context/BuilderContext'
 import Inspector from 'views/builder/inspector/Inspector'
 import { useRouter } from 'next/router'
 import { useEffect, useState } from 'react'
 import { Endpoints, Services } from 'services/Endpoints'
+import { ChevronLeft, ChevronRight } from '@mui/icons-material'
+import { createTheme } from '@mui/material/styles'
 
-function ViewBuilderContent() {
+// ── Builder themes (inlined to avoid cross-package path resolution issues) ────
+const _STORAGE_KEY = 'rbb:builderThemeMode'
+const BUILDER_THEMES = {
+  dark: createTheme({
+    palette: {
+      mode: 'dark',
+      primary:    { main: '#9c27b0' },
+      secondary:  { main: '#f5a623' },
+      background: { default: '#141618', paper: '#1e2227' },
+      divider:    '#3a3f45',
+      text:       { primary: '#e8eaed', secondary: '#9aa0aa' },
+    },
+  }),
+  light: createTheme({
+    palette: {
+      mode: 'light',
+      primary:   { main: '#9c27b0' },
+      secondary: { main: '#f5a623' },
+      background: { default: '#f0f2f5', paper: '#ffffff' },
+      divider:   '#dde1e7',
+    },
+  }),
+}
+function getBuilderThemeMode() {
+  try { return localStorage.getItem(_STORAGE_KEY) === 'light' ? 'light' : 'dark' } catch { return 'dark' }
+}
+function saveBuilderThemeMode(mode) {
+  try { localStorage.setItem(_STORAGE_KEY, mode) } catch {}
+}
+
+const SIDEBAR_WIDTH = 300
+const COLLAPSED_WIDTH = 32
+
+function CollapseToggle({ collapsed, onClick, side }) {
+  const Icon = side === 'left'
+    ? (collapsed ? ChevronRight : ChevronLeft)
+    : (collapsed ? ChevronLeft : ChevronRight)
+  const label = collapsed ? 'Expand' : 'Collapse'
+  return (
+    <Tooltip title={label} placement={side === 'left' ? 'right' : 'left'}>
+      <IconButton
+        size='small'
+        onClick={onClick}
+        sx={{
+          position: 'absolute',
+          top: '50%',
+          transform: 'translateY(-50%)',
+          [side === 'left' ? 'right' : 'left']: -14,
+          zIndex: 10,
+          width: 28,
+          height: 28,
+          bgcolor: 'background.paper',
+          border: '1px solid',
+          borderColor: 'divider',
+          borderRadius: '50%',
+          '&:hover': { bgcolor: 'action.hover' },
+        }}
+      >
+        <Icon sx={{ fontSize: 16 }} />
+      </IconButton>
+    </Tooltip>
+  )
+}
+
+function ViewBuilderContent({ isDark, onToggleTheme }) {
   const router = useRouter()
   const { id } = router.query
-  const { setSchema,setViewMetaData } = useBuilder()
+  const { loadSchema, setViewMetaData } = useBuilder()
+  const [leftCollapsed, setLeftCollapsed] = useState(false)
+  const [rightCollapsed, setRightCollapsed] = useState(false)
 
   const handleGetView = async id => {
     try {
@@ -19,7 +88,9 @@ function ViewBuilderContent() {
         id: id
       })
       if (response) {
-        setSchema(JSON.parse(response.data.value))
+        const parsed = JSON.parse(response.data.value)
+        // Backfill dialogs array for schemas saved before the dialogs feature
+        loadSchema({ dialogs: [], ...parsed })
         setViewMetaData({
           id: response.data.id,
           title: response.data.title,
@@ -31,7 +102,6 @@ function ViewBuilderContent() {
       }
     } catch (error) {
       console.error(error)
-    } finally {
     }
   }
 
@@ -40,54 +110,69 @@ function ViewBuilderContent() {
   }, [id])
 
   return (
-    <Box
-      sx={{
-        height: '100vh',
-        display: 'flex',
-        overflow: 'hidden',
-      }}
-    >
+    <Box sx={{ height: '100vh', display: 'flex', overflow: 'hidden', bgcolor: 'background.default' }}>
+
       {/* LEFT SIDEBAR */}
       <Box
         sx={{
-          width: 300,
-          minWidth: 220,
-          borderRight: '1px solid #3a3f45'
+          position: 'relative',
+          width: leftCollapsed ? COLLAPSED_WIDTH : SIDEBAR_WIDTH,
+          minWidth: leftCollapsed ? COLLAPSED_WIDTH : SIDEBAR_WIDTH,
+          borderRight: '1px solid',
+          borderColor: 'divider',
+          transition: 'width 0.2s ease, min-width 0.2s ease',
+          overflow: 'hidden',
         }}
       >
-        <Sidebar />
+        <Box sx={{ width: SIDEBAR_WIDTH, height: '100%', opacity: leftCollapsed ? 0 : 1, transition: 'opacity 0.15s ease', pointerEvents: leftCollapsed ? 'none' : 'auto' }}>
+          <Sidebar />
+        </Box>
+        <CollapseToggle collapsed={leftCollapsed} onClick={() => setLeftCollapsed(v => !v)} side='left' />
       </Box>
 
       {/* CENTER VIEWER */}
-      <Box
-        sx={{
-          flex: 1,
-          overflow: 'auto'
-        }}
-      >
-        <Viewer />
+      <Box sx={{ flex: 1, overflow: 'auto', bgcolor: 'background.default' }}>
+        <Viewer isDark={isDark} onToggleTheme={onToggleTheme} />
       </Box>
 
       {/* RIGHT INSPECTOR */}
       <Box
         sx={{
-          width: 300,
-          minWidth: 260,
-          borderLeft: '1px solid #3a3f45',
+          position: 'relative',
+          width: rightCollapsed ? COLLAPSED_WIDTH : SIDEBAR_WIDTH,
+          minWidth: rightCollapsed ? COLLAPSED_WIDTH : SIDEBAR_WIDTH,
+          borderLeft: '1px solid',
+          borderColor: 'divider',
+          transition: 'width 0.2s ease, min-width 0.2s ease',
+          overflow: 'hidden',
         }}
       >
-        <Inspector />
+        <Box sx={{ width: SIDEBAR_WIDTH, height: '100%', opacity: rightCollapsed ? 0 : 1, transition: 'opacity 0.15s ease', pointerEvents: rightCollapsed ? 'none' : 'auto' }}>
+          <Inspector />
+        </Box>
+        <CollapseToggle collapsed={rightCollapsed} onClick={() => setRightCollapsed(v => !v)} side='right' />
       </Box>
+
     </Box>
   )
 }
 
 export default function ViewBuilder() {
+  const [themeMode, setThemeMode] = useState(() => getBuilderThemeMode())
+
+  const toggleTheme = () => {
+    const next = themeMode === 'dark' ? 'light' : 'dark'
+    setThemeMode(next)
+    saveBuilderThemeMode(next)
+  }
 
   return (
-    <BuilderProvider>
-      <ViewBuilderContent />
-    </BuilderProvider>
+    <ThemeProvider theme={BUILDER_THEMES[themeMode]}>
+      <CssBaseline />
+      <BuilderProvider>
+        <ViewBuilderContent isDark={themeMode === 'dark'} onToggleTheme={toggleTheme} />
+      </BuilderProvider>
+    </ThemeProvider>
   )
 }
 

package/src/pages/viewBuilder/views/index.js

@@ -59,7 +59,7 @@ const ViewsList = () => {
           </Grid>
           <Grid item size={4}>
             <Box sx={{ display: 'flex',justifyContent: 'flex-end' }}>
-              <Button variant='contained' sx={{ ml: 3 }} onClick={() => router.push('/viewBuilder/')}>
+              <Button variant='contained' sx={{ ml: 3 }} onClick={() => router.push('/builders/ui')}>
                 New
               </Button>
             </Box>
@@ -113,7 +113,7 @@ const ViewsList = () => {
                     <Button
                       size='small'
                       variant='outlined'
-                      onClick={() => router.push({ pathname: '/viewBuilder/viewPage', query: { viewId: view.viewId } })}
+                      onClick={() => router.push(`/viewer/${view.viewId}`)}
                       sx={{ flexGrow: 1 }} // <-- takes all remaining space
                     >
                       Open
@@ -121,7 +121,7 @@ const ViewsList = () => {
                     <IconButton
                       size='small'
                       variant='outlined'
-                      onClick={() => router.push({ pathname: '/viewBuilder', query: { id: view.id } })}
+                      onClick={() => router.push({ pathname: '/builders/ui', query: { id: view.id } })}
                     >
                       <EditOutlined color={'secondary'} fontSize='small' />
                     </IconButton>

package/src/pages/viewer/[id]/index.js

@@ -26,7 +26,8 @@ export default function ViewPage() {
       })
 
       if (response && response.data) {
-        setSchema(JSON.parse(response.data.value))
+        const parsed = JSON.parse(response.data.value)
+        setSchema({ dialogs: [], ...parsed })
         setViewMetaData({
           id: response.data.id,
           title: response.data.title,

package/src/services/DeleteService.js

@@ -4,71 +4,42 @@ import { resolveURL, getAccessToken } from './config'
 import toast from 'react-hot-toast'
 
 export default async function DeleteService(endpoint, showToast, data, params) {
-  const accessToken = getAccessToken()
-    let response = { status: 'Error', message: '' }
-  let result = null
-  let currentParams = {
-    ...params,
-    ...(endpoint.DataType == DataTypes.Params ? { ...data } : {})
-  }
-
-  if (!data) return
-  const url = resolveURL(endpoint)
+  try {
+    const accessToken = getAccessToken()
+    const url = resolveURL(endpoint)
 
-  const axiosConfig = {
-    method: 'delete',
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      'Content-Type': endpoint.ContentType
-    },
-    params: {
-      ...currentParams
+    const currentParams = {
+      ...params,
+      ...(endpoint.DataType === DataTypes.Params ? { ...data } : {})
     }
-  }
-
-  try {
-    await Axios.delete(url, axiosConfig)
-      .then(r => {
-        result = r.data
-        response = {
-          status: 'Success',
-          message: r.data.message ? r.data.message : 'تم الحفظ بنجاح'
-        }
-      })
-      .catch(r => {
 
-        if (r.response && r.response.status == 400) {
-          response = {
-            status: 'Error',
-            message: typeof r.response.data == 'string' ? r.response.data : r.response.data.title
-            // message: "حدث خطأ اثناء الحفظ",
-          }
-        } else if (r.response && (r.response.status == 401 || r.response.status == 403)) {
-          response = {
-            status: 'Error',
-            message: 'غير مخول'
-          }
-        } else {
+    const r = await Axios.delete(url, {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        'Content-Type': endpoint.ContentType
+      },
+      params: currentParams
+    })
 
-          response = {
-            status: 'Error',
-            message: 'حدث خطأ في الاتصال مع الخادم'
-          }
-        }
-      })
-  } catch (error) {
-    response = {
-      status: 'Error',
-      message: 'حدث خطأ في الخادم'
-    }
-  } finally {
     if (showToast) {
-      if (response.status == 'Success') {
-        toast.success(response.message)
-      } else {
-        toast.error(response.message)
-      }
+      toast.success(r.data?.message || 'تم الحذف بنجاح')
     }
+    return r.data
+  } catch (err) {
+    console.log(err)
+    const message = resolveErrorMessage(err)
+    toast.error(message)
+    return null
   }
-  return result
+}
+
+function resolveErrorMessage(err) {
+  const status = err?.response?.status
+  const data = err?.response?.data
+
+  if (status === 400) return typeof data === 'string' ? data : data?.title || 'طلب غير صحيح'
+  if (status === 401 || status === 403) return 'غير مخول'
+  if (status >= 500) return 'حدث خطأ في الخادم'
+  if (err?.message) return err.message
+  return 'حدث خطأ في الاتصال مع الخادم'
 }

package/src/services/Endpoints/PrintLayoutEndpoints.js

@@ -0,0 +1,42 @@
+import { ContentTypes, DataTypes } from '../ContentTypes'
+
+export const PrintLayoutEndpoints = {
+  Post: {
+    Add: {
+      group: 'PrintLayout', name: 'Add',
+      URL: 'UiBuilderModule/PrintLayout',
+      ContentType: ContentTypes.Json,
+      DataType: DataTypes.Body
+    }
+  },
+  Put: {
+    Update: {
+      group: 'PrintLayout', name: 'Update',
+      URL: 'UiBuilderModule/PrintLayout',
+      ContentType: ContentTypes.Json,
+      DataType: DataTypes.Body
+    }
+  },
+  Get: {
+    GetAll: {
+      group: 'PrintLayout', name: 'GetAll',
+      URL: 'UiBuilderModule/PrintLayout/GetAll',
+      ContentType: ContentTypes.Json,
+      DataType: DataTypes.Params
+    },
+    GetById: {
+      group: 'PrintLayout', name: 'GetById',
+      URL: 'UiBuilderModule/PrintLayout/GetById',
+      ContentType: ContentTypes.Json,
+      DataType: DataTypes.Params
+    }
+  },
+  Delete: {
+    Delete: {
+      group: 'PrintLayout', name: 'Delete',
+      URL: 'UiBuilderModule/PrintLayout',
+      ContentType: ContentTypes.Json,
+      DataType: DataTypes.Params
+    }
+  }
+}

package/src/services/Endpoints/ReportBuilderEndpoints.js

@@ -4,43 +4,43 @@ export const ReportBuilderEndpoints = {
   Post: {
     GetModels: {
       group: 'ReportBuilder', name: 'GetModels',
-      URL: 'ReportingModule/ReportBuilder/GetTypes',
+      URL: 'ReportBuilder/GetTypes',
       ContentType: ContentTypes.Json,
       DataType: DataTypes.Params
     },
     GetModelFields: {
       group: 'ReportBuilder', name: 'GetModelFields',
-      URL: 'ReportingModule/ReportBuilder/GetModelFields',
+      URL: 'ReportBuilder/GetModelFields',
       ContentType: ContentTypes.Json,
       DataType: DataTypes.Params
     },
     GenericGet: {
       group: 'ReportBuilder', name: 'GenericGet',
-      URL: 'ReportingModule/ReportBuilder/GenericGet',
+      URL: 'ReportBuilder/GenericGet',
       ContentType: ContentTypes.Json,
       DataType: DataTypes.Body
     },
     GetRawColumns: {
       group: 'ReportBuilder', name: 'GetRawColumns',
-      URL: 'ReportingModule/ReportBuilder/GetRawColumns',
+      URL: 'ReportBuilder/GetRawColumns',
       ContentType: ContentTypes.Json,
       DataType: DataTypes.Body
     },
     GetAllReports: {
       group: 'ReportBuilder', name: 'GetAllReports',
-      URL: 'ReportingModule/ReportBuilder/GetAllReports',
+      URL: 'ReportBuilder/GetAllReports',
       ContentType: ContentTypes.Json,
       DataType: DataTypes.Body
     },
     GetReportDetails: {
       group: 'ReportBuilder', name: 'GetReportDetails',
-      URL: 'ReportingModule/ReportBuilder/GetReportDetails',
+      URL: 'ReportBuilder/GetReportDetails',
       ContentType: ContentTypes.Json,
       DataType: DataTypes.Body
     },
     AddUpdate: {
       group: 'ReportBuilder', name: 'AddUpdate',
-      URL: 'ReportingModule/ReportBuilder/AddUpdate',
+      URL: 'ReportBuilder/AddUpdate',
       ContentType: ContentTypes.Json,
       DataType: DataTypes.Body
     },