@bygd/nc-report-ui 0.1.44 → 0.1.45

package/dist/app/esm/index.js

@@ -90727,11 +90727,6 @@ const Filters = ({
 
     // Check if this is a date filter
     if (isDateDimension(existingFilter.dimension)) {
-      // For date filters, validate that at least one date is provided
-      if (!dateRangeFrom && !dateRangeTo) {
-        return; // Don't save if no dates provided
-      }
-
       // Update with new date range values (only include provided dates)
       const dateValues = {};
       if (dateRangeFrom) {
@@ -90748,11 +90743,6 @@ const Filters = ({
       // Save the updated filter
       onSaveFilter(fullPath, updatedFilter);
     } else {
-      // For regular filters, validate selected values
-      if (selectedFilterValues.length === 0) {
-        return; // Don't save if no values selected
-      }
-
       // Update with new values
       const updatedFilter = {
         ...existingFilter,
@@ -90926,13 +90916,6 @@ const Filters = ({
 
     // Check if this is a date filter
     const isDate = isDateDimension(selectedItem.dimension);
-
-    // Validate based on filter type
-    if (isDate) {
-      if (!dateRangeFrom && !dateRangeTo) return; // At least one date must be provided
-    } else {
-      if (selectedFilterValues.length === 0) return; // Regular filters must have values
-    }
     if (!selectedDimension) return;
 
     // Build the complete relation objects array
@@ -91007,13 +90990,6 @@ const Filters = ({
     // Check if this is a date filter
     const isDate = isDateDimension(dimensionData.dimension);
 
-    // Validate based on filter type
-    if (isDate) {
-      if (!dateRangeFrom && !dateRangeTo) return; // At least one date must be provided
-    } else {
-      if (selectedFilterValues.length === 0) return; // Regular filters must have values
-    }
-
     // Prepare filter values based on type
     let filterValues;
     if (isDate) {
@@ -91385,14 +91361,7 @@ const Filters = ({
   }, "Cancel"), /*#__PURE__*/gn.createElement(Button, {
     variant: "contained",
     onClick: handleSave,
-    disabled: (() => {
-      if (!selectedDimension) return true;
-      const dimensionItems = getDimensionItems();
-      const selectedItem = dimensionItems.find(item => item.key === selectedDimension);
-      if (!selectedItem) return true;
-      const isDate = isDateDimension(selectedItem.dimension);
-      return isDate ? !dateRangeFrom && !dateRangeTo : selectedFilterValues.length === 0;
-    })(),
+    disabled: !selectedDimension,
     sx: {
       height: "40px",
       fontFamily: "system-ui",
@@ -91538,13 +91507,7 @@ const Filters = ({
   }, "Cancel"), /*#__PURE__*/gn.createElement(Button, {
     variant: "contained",
     onClick: handleSaveFromDimension,
-    disabled: (() => {
-      if (!selectedExistingDimension) return true;
-      const dimensionData = existingDimensions.find(dim => dim.fullPath === selectedExistingDimension);
-      if (!dimensionData) return true;
-      const isDate = isDateDimension(dimensionData.dimension);
-      return isDate ? !dateRangeFrom && !dateRangeTo : selectedFilterValues.length === 0;
-    })(),
+    disabled: !selectedExistingDimension,
     sx: {
       height: "40px",
       fontFamily: "system-ui",
@@ -91818,7 +91781,6 @@ const Filters = ({
       variant: "contained",
       size: "small",
       onClick: () => handleSaveEditedFilter(fullPath),
-      disabled: isDate ? !dateRangeFrom && !dateRangeTo : selectedFilterValues.length === 0,
       sx: {
         textTransform: 'none',
         borderRadius: '6px',
@@ -93114,20 +93076,12 @@ const ReportBuilder = ({
     if (report.filters && Object.keys(report.filters).length > 0) {
       Object.entries(report.filters).forEach(([fullPath, filterData]) => {
         if (filterData.values) {
-          // Check if values is an object (date range) or array (regular filter)
-          if (Array.isArray(filterData.values)) {
-            // Regular filter - only add if array has values
-            if (filterData.values.length > 0) {
-              conditions.push({
-                [fullPath]: filterData.values
-              });
-            }
-          } else if (typeof filterData.values === "object") {
-            // Date range filter - add the object as-is
-            conditions.push({
-              [fullPath]: filterData.values
-            });
-          }
+          // Include the condition as-is regardless of whether the array/object
+          // has any entries - an explicitly saved (but empty) filter should
+          // still appear in the query.
+          conditions.push({
+            [fullPath]: filterData.values
+          });
         }
       });
     }
@@ -93931,6 +93885,7 @@ const Root = () => {
   const config = useConfig();
   const client = config.client;
   const merchants = config.merchants;
+  const organizations = config.organizations;
 
   //const test_token = config.test_token;
   const token = config.tokens[config.active_user];
@@ -93948,8 +93903,10 @@ const Root = () => {
     // client:"7774bcad-05dc-48cf-a52b-9a8a56168818",
     // client:"7774bcad-05dc-48cf-a52b-9a8a56168829" // this is some wrong client id for testing
     // client: undefined
-    client: client || "7774bcad-05dc-48cf-a52b-9a8a56168818",
-    merchants: merchants || []
+    //client: client || "7774bcad-05dc-48cf-a52b-9a8a56168818",
+    client: client || [],
+    merchants: merchants || [],
+    organizations: organizations || []
   };
 
   // Api.setBaseUrl(apiDefaults.base_url);
@@ -93988,8 +93945,9 @@ var tokens = {
   "serdar.kizilkurt@gmail.com": "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJXeFB6alpqaXJUcm5ienYwZW5iWHBhUjhoWklNQWRxb29FdEhaY0Nmbl9zIn0.eyJleHAiOjE3NjU5ODIzMjcsImlhdCI6MTc2NTk4MTQyNywianRpIjoiYjA4ZWMyMmYtN2IxMC00YzVjLWEwODgtNzA5MDhmNzJlNGIxIiwiaXNzIjoiaHR0cHM6Ly9pZHAubmV0Y2FwaXRhbC5wcm8vcmVhbG1zL25ldGNhcGl0YWwiLCJhdWQiOiJhY2NvdW50Iiwic3ViIjoiNjAzNGI5NzktNzkyNi00NjJlLTljYjQtYjJmZWMzYjNjYzhjIiwidHlwIjoiQmVhcmVyIiwiYXpwIjoiYXBwIiwic2lkIjoiMjczYzA0OTItYjQwZS00ZmIwLWEwYWItMTRmMDU5NzUzYTM2IiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyJodHRwOi8vbG9jYWxob3N0OjMxMDIiLCJodHRwczovL2FwcC5uZXRjYXBpdGFsLnBybyIsImh0dHBzOi8vZGV2Lm5ldGNhcGl0YWwucHJvIl0sInJlYWxtX2FjY2VzcyI6eyJyb2xlcyI6WyJkZWZhdWx0LXJvbGVzLW5ldGNhcGl0YWwiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJvcGVuaWQgZW1haWwgcHJvZmlsZSIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJuYW1lIjoiU2VyZGFyIFJlZFdvbGYiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJzZXJkYXIua2l6aWxrdXJ0QGdtYWlsLmNvbSIsImdpdmVuX25hbWUiOiJTZXJkYXIiLCJmYW1pbHlfbmFtZSI6IlJlZFdvbGYiLCJlbWFpbCI6InNlcmRhci5raXppbGt1cnRAZ21haWwuY29tIn0.mIrffBy6n4HmCnFJAX7Njl8fR-m-QQtsn2iGbyefXXK17lCP8b_lUlAvHHFaan7Te8OT8P8rHu9FgfSyPQkBMqZ0AVVf6VrhUmEO12wZx71Di59QNHjcZKfljNykPKLXXWEIWlulvScrLUsxuR5emufTJaxD9zU4fJzRh00vDCIuzIyl9o51asLmhNAtNnW8QUtT-rWOM6Fgh3pskP4yrGUe5dI17DpAYafcWgUNx86Qi9E09nzUE5IToKgXfQvVpPs7_ZwlcfOE95VNcO_pwRQQ85sJmFiUCg5_TWzNFJKoTui5barb74oBCP7OCJTb5yj5KeriL2ozg0e2IyVrHA"
 };
 var active_user = "s.kizilkurt@azerion.com";
-var client = "7774bcad-05dc-48cf-a52b-9a8a56168818";
+var client = [];
 var merchants = [];
+var organizations = [];
 var base_url_local = "http://localhost:8081";
 var base_url_prod = "https://dev-report-api.netcapital.pro";
 var base_url = "http://localhost:8081";
@@ -94001,6 +93959,7 @@ var config = {
   active_user: active_user,
   client: client,
   merchants: merchants,
+  organizations: organizations,
   base_url_local: base_url_local,
   base_url_prod: base_url_prod,
   base_url: base_url,

package/dist/default/cjs/index.cjs

@@ -4792,11 +4792,6 @@ const Filters = ({
 
     // Check if this is a date filter
     if (isDateDimension(existingFilter.dimension)) {
-      // For date filters, validate that at least one date is provided
-      if (!dateRangeFrom && !dateRangeTo) {
-        return; // Don't save if no dates provided
-      }
-
       // Update with new date range values (only include provided dates)
       const dateValues = {};
       if (dateRangeFrom) {
@@ -4813,11 +4808,6 @@ const Filters = ({
       // Save the updated filter
       onSaveFilter(fullPath, updatedFilter);
     } else {
-      // For regular filters, validate selected values
-      if (selectedFilterValues.length === 0) {
-        return; // Don't save if no values selected
-      }
-
       // Update with new values
       const updatedFilter = {
         ...existingFilter,
@@ -4991,13 +4981,6 @@ const Filters = ({
 
     // Check if this is a date filter
     const isDate = isDateDimension(selectedItem.dimension);
-
-    // Validate based on filter type
-    if (isDate) {
-      if (!dateRangeFrom && !dateRangeTo) return; // At least one date must be provided
-    } else {
-      if (selectedFilterValues.length === 0) return; // Regular filters must have values
-    }
     if (!selectedDimension) return;
 
     // Build the complete relation objects array
@@ -5072,13 +5055,6 @@ const Filters = ({
     // Check if this is a date filter
     const isDate = isDateDimension(dimensionData.dimension);
 
-    // Validate based on filter type
-    if (isDate) {
-      if (!dateRangeFrom && !dateRangeTo) return; // At least one date must be provided
-    } else {
-      if (selectedFilterValues.length === 0) return; // Regular filters must have values
-    }
-
     // Prepare filter values based on type
     let filterValues;
     if (isDate) {
@@ -5450,14 +5426,7 @@ const Filters = ({
   }, "Cancel"), /*#__PURE__*/React__namespace.default.createElement(material.Button, {
     variant: "contained",
     onClick: handleSave,
-    disabled: (() => {
-      if (!selectedDimension) return true;
-      const dimensionItems = getDimensionItems();
-      const selectedItem = dimensionItems.find(item => item.key === selectedDimension);
-      if (!selectedItem) return true;
-      const isDate = isDateDimension(selectedItem.dimension);
-      return isDate ? !dateRangeFrom && !dateRangeTo : selectedFilterValues.length === 0;
-    })(),
+    disabled: !selectedDimension,
     sx: {
       height: "40px",
       fontFamily: "system-ui",
@@ -5603,13 +5572,7 @@ const Filters = ({
   }, "Cancel"), /*#__PURE__*/React__namespace.default.createElement(material.Button, {
     variant: "contained",
     onClick: handleSaveFromDimension,
-    disabled: (() => {
-      if (!selectedExistingDimension) return true;
-      const dimensionData = existingDimensions.find(dim => dim.fullPath === selectedExistingDimension);
-      if (!dimensionData) return true;
-      const isDate = isDateDimension(dimensionData.dimension);
-      return isDate ? !dateRangeFrom && !dateRangeTo : selectedFilterValues.length === 0;
-    })(),
+    disabled: !selectedExistingDimension,
     sx: {
       height: "40px",
       fontFamily: "system-ui",
@@ -5883,7 +5846,6 @@ const Filters = ({
       variant: "contained",
       size: "small",
       onClick: () => handleSaveEditedFilter(fullPath),
-      disabled: isDate ? !dateRangeFrom && !dateRangeTo : selectedFilterValues.length === 0,
       sx: {
         textTransform: 'none',
         borderRadius: '6px',
@@ -7175,20 +7137,12 @@ const ReportBuilder = ({
     if (report.filters && Object.keys(report.filters).length > 0) {
       Object.entries(report.filters).forEach(([fullPath, filterData]) => {
         if (filterData.values) {
-          // Check if values is an object (date range) or array (regular filter)
-          if (Array.isArray(filterData.values)) {
-            // Regular filter - only add if array has values
-            if (filterData.values.length > 0) {
-              conditions.push({
-                [fullPath]: filterData.values
-              });
-            }
-          } else if (typeof filterData.values === "object") {
-            // Date range filter - add the object as-is
-            conditions.push({
-              [fullPath]: filterData.values
-            });
-          }
+          // Include the condition as-is regardless of whether the array/object
+          // has any entries - an explicitly saved (but empty) filter should
+          // still appear in the query.
+          conditions.push({
+            [fullPath]: filterData.values
+          });
         }
       });
     }

package/dist/default/esm/index.js

@@ -4711,11 +4711,6 @@ const Filters = ({
 
     // Check if this is a date filter
     if (isDateDimension(existingFilter.dimension)) {
-      // For date filters, validate that at least one date is provided
-      if (!dateRangeFrom && !dateRangeTo) {
-        return; // Don't save if no dates provided
-      }
-
       // Update with new date range values (only include provided dates)
       const dateValues = {};
       if (dateRangeFrom) {
@@ -4732,11 +4727,6 @@ const Filters = ({
       // Save the updated filter
       onSaveFilter(fullPath, updatedFilter);
     } else {
-      // For regular filters, validate selected values
-      if (selectedFilterValues.length === 0) {
-        return; // Don't save if no values selected
-      }
-
       // Update with new values
       const updatedFilter = {
         ...existingFilter,
@@ -4910,13 +4900,6 @@ const Filters = ({
 
     // Check if this is a date filter
     const isDate = isDateDimension(selectedItem.dimension);
-
-    // Validate based on filter type
-    if (isDate) {
-      if (!dateRangeFrom && !dateRangeTo) return; // At least one date must be provided
-    } else {
-      if (selectedFilterValues.length === 0) return; // Regular filters must have values
-    }
     if (!selectedDimension) return;
 
     // Build the complete relation objects array
@@ -4991,13 +4974,6 @@ const Filters = ({
     // Check if this is a date filter
     const isDate = isDateDimension(dimensionData.dimension);
 
-    // Validate based on filter type
-    if (isDate) {
-      if (!dateRangeFrom && !dateRangeTo) return; // At least one date must be provided
-    } else {
-      if (selectedFilterValues.length === 0) return; // Regular filters must have values
-    }
-
     // Prepare filter values based on type
     let filterValues;
     if (isDate) {
@@ -5369,14 +5345,7 @@ const Filters = ({
   }, "Cancel"), /*#__PURE__*/React__default.createElement(Button, {
     variant: "contained",
     onClick: handleSave,
-    disabled: (() => {
-      if (!selectedDimension) return true;
-      const dimensionItems = getDimensionItems();
-      const selectedItem = dimensionItems.find(item => item.key === selectedDimension);
-      if (!selectedItem) return true;
-      const isDate = isDateDimension(selectedItem.dimension);
-      return isDate ? !dateRangeFrom && !dateRangeTo : selectedFilterValues.length === 0;
-    })(),
+    disabled: !selectedDimension,
     sx: {
       height: "40px",
       fontFamily: "system-ui",
@@ -5522,13 +5491,7 @@ const Filters = ({
   }, "Cancel"), /*#__PURE__*/React__default.createElement(Button, {
     variant: "contained",
     onClick: handleSaveFromDimension,
-    disabled: (() => {
-      if (!selectedExistingDimension) return true;
-      const dimensionData = existingDimensions.find(dim => dim.fullPath === selectedExistingDimension);
-      if (!dimensionData) return true;
-      const isDate = isDateDimension(dimensionData.dimension);
-      return isDate ? !dateRangeFrom && !dateRangeTo : selectedFilterValues.length === 0;
-    })(),
+    disabled: !selectedExistingDimension,
     sx: {
       height: "40px",
       fontFamily: "system-ui",
@@ -5802,7 +5765,6 @@ const Filters = ({
       variant: "contained",
       size: "small",
       onClick: () => handleSaveEditedFilter(fullPath),
-      disabled: isDate ? !dateRangeFrom && !dateRangeTo : selectedFilterValues.length === 0,
       sx: {
         textTransform: 'none',
         borderRadius: '6px',
@@ -7094,20 +7056,12 @@ const ReportBuilder = ({
     if (report.filters && Object.keys(report.filters).length > 0) {
       Object.entries(report.filters).forEach(([fullPath, filterData]) => {
         if (filterData.values) {
-          // Check if values is an object (date range) or array (regular filter)
-          if (Array.isArray(filterData.values)) {
-            // Regular filter - only add if array has values
-            if (filterData.values.length > 0) {
-              conditions.push({
-                [fullPath]: filterData.values
-              });
-            }
-          } else if (typeof filterData.values === "object") {
-            // Date range filter - add the object as-is
-            conditions.push({
-              [fullPath]: filterData.values
-            });
-          }
+          // Include the condition as-is regardless of whether the array/object
+          // has any entries - an explicitly saved (but empty) filter should
+          // still appear in the query.
+          conditions.push({
+            [fullPath]: filterData.values
+          });
         }
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bygd/nc-report-ui",
-	"version": "0.1.44",
+	"version": "0.1.45",
 	"files": [
 		"dist/*",
 		"fnet/input.yaml",