datastake-daf 0.6.169 → 0.6.170

package/dist/components/index.js

@@ -12398,25 +12398,26 @@ function Loading(_ref) {
 const {
   Paragraph
 } = antd.Typography;
-const useHeader = ({
-  title = '',
-  tooltip = '',
-  supportText = '',
-  tags = [],
-  actionButtons: _actionButtons = [],
-  titleTooltip,
-  className,
-  addedHeader = null,
-  addedHeaderFirst,
-  extraButtons: _extraButtons = [],
-  onDownload,
-  downloadDisabled,
-  goBackTo,
-  loading,
-  renderExtraComponents,
-  app = '',
-  isViewMode = false
-}) => {
+const useHeader = _ref => {
+  let {
+    title = '',
+    tooltip = '',
+    supportText = '',
+    tags = [],
+    actionButtons: _actionButtons = [],
+    titleTooltip,
+    className,
+    addedHeader = null,
+    addedHeaderFirst,
+    extraButtons: _extraButtons = [],
+    onDownload,
+    downloadDisabled,
+    goBackTo,
+    loading,
+    renderExtraComponents,
+    app = '',
+    isViewMode = false
+  } = _ref;
   const downloadButtonAction = app && app === 'sbg' && isViewMode ? null : {
     onClick: onDownload,
     disabled: downloadDisabled,
@@ -12442,9 +12443,9 @@ const useHeader = ({
   const buttonCont = React.useRef();
   const [mainContWidth, setMainContWidth] = React.useState(600);
   const [buttonContWidth, setButtonContWidth] = React.useState(0);
-  const hasSupportText = !!supportText?.length;
-  const hasTags = !!tags?.length;
-  const hasButtons = !!(actionButtons?.length || extraButtons?.length);
+  const hasSupportText = !!(supportText !== null && supportText !== void 0 && supportText.length);
+  const hasTags = !!(tags !== null && tags !== void 0 && tags.length);
+  const hasButtons = !!(actionButtons !== null && actionButtons !== void 0 && actionButtons.length || extraButtons !== null && extraButtons !== void 0 && extraButtons.length);
   React.useEffect(() => {
     const mainContObserver = new ResizeObserver(entries => {
       const _mainEntry = entries[0];
@@ -18244,12 +18245,6 @@ function Filters({
             })
           })]
         });
-      // case "slider":
-      //   return (
-      //     <div className="form-row">
-      //       <label>{filter.label}</label>
-      //     </div>
-      //   );
       default:
         return null;
     }
@@ -20481,18 +20476,15 @@ const SDGList = dt.ul`
     justify-content: center;
     background: var(--base-gray-30);
     color: var(--base-gray-90);
-    border-radius: 8px;
-    border: 1px solid var(--base-gray-30);
   }
 `;
 
 const GAP_BETWEEN_SDGS = 4;
-function SDGIcons(_ref) {
-  let {
-    sdgList = [],
-    t = str => str,
-    iconSize = 24
-  } = _ref;
+function SDGIcons({
+  sdgList = [],
+  t = str => str,
+  iconSize = 24
+}) {
   const containerRef = React__default["default"].useRef(null);
   const [width, setWidth] = React__default["default"].useState(0);
   React__default["default"].useEffect(() => {
@@ -20533,10 +20525,10 @@ function SDGIcons(_ref) {
       children: [visibleSdgs.map((sdg, index) => /*#__PURE__*/jsxRuntime.jsx("li", {
         className: "project-widget-item",
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-          title: t("SDGS::".concat(sdg)),
+          title: t(`SDGS::${sdg}`),
           children: /*#__PURE__*/jsxRuntime.jsx("div", {
             style: {
-              backgroundImage: "url(".concat(SDG_IMAGES[sdg].img, ")"),
+              backgroundImage: `url(${SDG_IMAGES[sdg].img})`,
               height: iconSize,
               width: iconSize
             },
@@ -20555,25 +20547,21 @@ function SDGIcons(_ref) {
               maxWidth: 200
             },
             children: sdgList.slice(visibleSdgs.length).map((sdg, idx) => /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-              title: t("SDGS::".concat(sdg)),
+              title: t(`SDGS::${sdg}`),
               children: /*#__PURE__*/jsxRuntime.jsx("div", {
                 style: {
                   width: iconSize,
                   height: iconSize,
-                  backgroundImage: "url(".concat(SDG_IMAGES[sdg].img, ")"),
+                  backgroundImage: `url(${SDG_IMAGES[sdg].img})`,
                   backgroundSize: "cover",
                   borderRadius: 4
                 },
-                title: t("SDGS::".concat(sdg))
+                title: t(`SDGS::${sdg}`)
               })
             }, idx))
           }),
           children: /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: "sdg-item-image sdg-item-more",
-            style: {
-              height: iconSize,
-              width: iconSize
-            },
             children: ["+", hiddenCount]
           })
         })
@@ -60236,7 +60224,6 @@ exports.ProjectVisualisationSelect = CustomSelect;
 exports.ProjectWidget = ProjectWidget;
 exports.RadarChart = RadarChart;
 exports.RadialBarChart = RadialBarChart;
-exports.SDGIcons = SDGIcons;
 exports.SDGWidget = SDGWidget;
 exports.SearchFilters = SearchFilters;
 exports.Segment = Segment;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.169",
+	"version": "0.6.170",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/EditForm/_index.scss

@@ -164,7 +164,7 @@
       flex-direction: column;
       overflow-y: auto;
       height: 100%; // Ensure content takes full height
-      padding: 20px 20px 20px 20px; // Add bottom padding for better scrolling
+      padding: 20px 20px 60px 20px; // Increased bottom padding for better scrolling
 
       &.risk-template.no-padding {
         padding: 0;
@@ -354,7 +354,7 @@
       padding-top: var(--size-lg);
       overflow: auto;
       flex-direction: column;
-      padding: 20px 100px 0 100px;
+      padding: 20px 100px 60px 100px; // Added bottom padding for better scrolling
       &.has-section {
         width: calc(100% - 200px);
       }
@@ -1229,7 +1229,7 @@
       padding-top: var(--size-lg);
       overflow: auto;
       flex-direction: column;
-      padding: var(--size-lg) var(--size-lg) 0 var(--size-lg);
+      padding: var(--size-lg) var(--size-lg) 60px var(--size-lg); // Added bottom padding for better scrolling
 
       .main-form {
         min-width: 400px;

package/src/@daf/core/components/Filters/FloatingFilters/index.js

@@ -4,48 +4,42 @@ import { Fragment, useState } from "react";
 import Style from "./style.js";
 
 export default function Filters({ t, filtersConfig, onFilterChange }) {
-  const [opened, setOpened] = useState(false);
+	const [opened, setOpened] = useState(false);
 
-  const renderFilter = (filter) => {
-    switch (filter.type) {
-      case "select":
-        return (
-          <div className="form-row">
-            <label>{filter.label}</label>
-            <Select
-              allowClear
-              placeholder={filter.placeholder}
-              value={filter.value}
-              options={filter.options}
-              onChange={(c) => onFilterChange({ [filter.key]: c })}
-            />
-          </div>
-        );
-      // case "slider":
-      //   return (
-      //     <div className="form-row">
-      //       <label>{filter.label}</label>
-      //     </div>
-      //   );
-      default:
-        return null;
-    }
-  };
+	const renderFilter = (filter) => {
+		switch (filter.type) {
+			case "select":
+				return (
+					<div className="form-row">
+						<label>{filter.label}</label>
+						<Select
+							allowClear
+							placeholder={filter.placeholder}
+							value={filter.value}
+							options={filter.options}
+							onChange={(c) => onFilterChange({ [filter.key]: c })}
+						/>
+					</div>
+				);
+			default:
+				return null;
+		}
+	};
 
-  return (
-    <Style>
-      <Button onClick={() => setOpened((p) => !p)}>
-        {t("Filter")}
-        <CustomIcon width={16} height={16} name="Filter" />
-      </Button>
+	return (
+		<Style>
+			<Button onClick={() => setOpened((p) => !p)}>
+				{t("Filter")}
+				<CustomIcon width={16} height={16} name="Filter" />
+			</Button>
 
-      {opened ? (
-        <div className="filters">
-          {filtersConfig?.map((filter) => (
-            <Fragment key={filter.key}>{renderFilter(filter)}</Fragment>
-          ))}
-        </div>
-      ) : null}
-    </Style>
-  );
+			{opened ? (
+				<div className="filters">
+					{filtersConfig?.map((filter) => (
+						<Fragment key={filter.key}>{renderFilter(filter)}</Fragment>
+					))}
+				</div>
+			) : null}
+		</Style>
+	);
 }

package/src/@daf/core/components/UI/SDGIcon/index.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { Tooltip, Popover } from "antd";
-import { SDG_IMAGES } from "../../../../../constants/SDGs.js";
-import { SDGList } from "./styles.js";
+import { SDG_IMAGES } from "../../../../../constants/SDGs";
+import { SDGList } from "./styles";
 
 const GAP_BETWEEN_SDGS = 4;
 
@@ -90,15 +90,7 @@ export default function SDGIcons({
                 </div>
               }
             >
-              <div
-                className="sdg-item-image sdg-item-more"
-                style={{
-                  height: iconSize,
-                  width: iconSize,
-                }}
-              >
-                +{hiddenCount}
-              </div>
+              <div className="sdg-item-image sdg-item-more">+{hiddenCount}</div>
             </Popover>
           </li>
         )}

package/src/@daf/core/components/UI/SDGIcon/styles.js

@@ -22,7 +22,5 @@ export const SDGList = styled.ul`
     justify-content: center;
     background: var(--base-gray-30);
     color: var(--base-gray-90);
-    border-radius: 8px;
-    border: 1px solid var(--base-gray-30);
   }
 `;

package/src/@daf/core/components/ViewForm/_index.scss

@@ -231,7 +231,7 @@
       display: flex;
       flex-direction: column;
       overflow-y: auto;
-      padding: var(--size-lg) var(--size-lg) 0 var(--size-lg);
+      padding: var(--size-lg) var(--size-lg) 60px var(--size-lg); // Added bottom padding for better scrolling
 
       &.no-padding {
         padding: 0px;

package/src/index.js

@@ -23,6 +23,7 @@ export { default as Badge } from "./@daf/core/components/Badge/index.jsx";
 // Icons
 export { default as GetIcon } from "./@daf/core/components/Icon/index.jsx";
 export { default as CustomIcon } from "./@daf/core/components/Icon/CustomIcon.jsx";
+
 // Filters
 export {
   default as SelectFilters,
@@ -161,6 +162,3 @@ export { default as InformationChannelsSubject } from "./@daf/core/components/Sc
 export { default as InformationChannelsView } from "./@daf/core/components/Screens/InformationChannels/InformationChannel/index.js";
 export { default as InformationChannelsDataPoint } from "./@daf/core/components/Screens/InformationChannels/DataPoint/index.js";
 export { InformationChannelProvider } from "./@daf/core/components/Screens/InformationChannels/context/index.js";
-
-// UI
-export { default as SDGIcons } from "./@daf/core/components/UI/SDGIcon/index.jsx";

package/.env

@@ -1,8 +0,0 @@
-REACT_APP_API_KEY=
-REACT_APP_AUTH_DOMAIN=
-REACT_APP_PROJECT_ID=
-REACT_APP_STORAGE_BUCKED=
-REACT_APP_SENDER_ID=
-REACT_APP_APP_ID=
-REACT_APP_MEASUREMENT_ID=
-REACT_APP_VAPID_KEY=

package/.vscode/settings.json

@@ -1,13 +0,0 @@
-{
-	"cSpell.words": ["cukura"],
-	"files.autoSave": "afterDelay",
-	"editor.wordWrap": "on",
-	"editor.autoClosingBrackets": "always",
-	"editor.autoClosingComments": "always",
-	"editor.autoClosingQuotes": "always",
-	"editor.defaultFormatter": "esbenp.prettier-vscode",
-	"editor.formatOnPaste": true,
-	"editor.formatOnSave": true,
-	"notebook.defaultFormatter": "esbenp.prettier-vscode",
-	"javascript.format.semicolons": "insert"
-}

package/src/@daf/core/components/Filters/FloatingFilters/FloatingFilters.stories.jsx

@@ -1,64 +0,0 @@
-import SearchFilters from "./index";
-import ThemeLayout from "../../ThemeLayout";
-
-export default {
-  title: "Core/Filters/FloatingFilters",
-  component: SearchFilters,
-  tags: ["autodocs"],
-  decorators: [
-    (Story) => (
-      <ThemeLayout>
-        <Story />
-      </ThemeLayout>
-    ),
-  ],
-};
-
-export const Primary = {
-  name: "Search Filters",
-  args: {
-    t: (key) => key,
-    filtersConfig: [
-      {
-        type: "select",
-        label: "Category",
-        placeholder: "Select a category",
-        key: "category",
-        options: [
-          { label: "Books", value: "books" },
-          { label: "Electronics", value: "electronics" },
-          { label: "Clothing", value: "clothing" },
-        ],
-        value: null,
-      },
-      {
-        type: "select",
-        label: "Price Range",
-        placeholder: "Select a price range",
-        key: "priceRange",
-        options: [
-          { label: "$0 - $50", value: "0-50" },
-          { label: "$51 - $100", value: "51-100" },
-          { label: "$101 - $200", value: "101-200" },
-        ],
-        value: null,
-      },
-      {
-        type: "slider",
-        label: "Rating",
-        key: "rating",
-        min: 1,
-        max: 5,
-        value: 3,
-      },
-    ],
-    onFilterChange: (changedFilter) => {
-      console.log("Filter changed:", changedFilter);
-    },
-  },
-  render: (args) => (
-    <div style={{ position: "relative", height: "400px" }}>
-      <SearchFilters {...args} />
-    </div>
-  ),
-};