datajunction-ui 0.0.1-a84.dev1 → 0.0.1-a84.dev2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datajunction-ui",
-  "version": "0.0.1-a84.dev1",
+  "version": "0.0.1-a84.dev2",
   "description": "DataJunction Metrics Platform UI",
   "module": "src/index.tsx",
   "repository": {

package/src/app/pages/NodePage/AddMaterializationPopover.jsx

@@ -12,6 +12,8 @@ export default function AddMaterializationPopover({ node, onSubmit }) {
   const [options, setOptions] = useState([]);
   const [jobs, setJobs] = useState([]);
 
+  const timePartitionColumns = node.columns.filter(col => col.partition);
+
   const ref = useRef(null);
 
   useEffect(() => {
@@ -42,13 +44,23 @@ export default function AddMaterializationPopover({ node, onSubmit }) {
     if (!values.job_type) {
       values.job_type = 'spark_sql';
     }
-    const { status, json } = await djClient.materialize(
-      values.node,
-      values.job_type,
-      values.strategy,
-      values.schedule,
-      config,
-    );
+    const { status, json } = (
+      values.job_type === 'druid_cube' ?
+      await djClient.materializeCube(
+        values.node,
+        values.job_type,
+        values.strategy,
+        values.schedule,
+        values.lookback_window,
+      ) :
+      await djClient.materialize(
+        values.node,
+        values.job_type,
+        values.strategy,
+        values.schedule,
+        config,
+      )
+  );
     if (status === 200 || status === 201) {
       setStatus({ success: json.message });
       window.location.reload();
@@ -99,8 +111,8 @@ export default function AddMaterializationPopover({ node, onSubmit }) {
           initialValues={{
             node: node?.name,
             job_type:
-              node?.type === 'cube' ? 'druid_metrics_cube' : 'spark_sql',
-            strategy: 'full',
+              node?.type === 'cube' ? 'druid_cube' : 'spark_sql',
+            strategy: timePartitionColumns.length == 1 ? 'incremental_time' : 'full',
             schedule: '@daily',
             lookback_window: '1 DAY',
             spark_config: {
@@ -121,21 +133,21 @@ export default function AddMaterializationPopover({ node, onSubmit }) {
 
                     <Field as="select" name="job_type">
                       <>
-                        <option
+                        {/* <option
                           key={'druid_measures_cube'}
                           value={'druid_measures_cube'}
                         >
                           Druid Measures Cube (Pre-Agg Cube)
-                        </option>
+                        </option> */}
                         <option
-                          key={'druid_metrics_cube'}
-                          value={'druid_metrics_cube'}
+                          key={'druid_measures_cube'}
+                          value={'druid_measures_cube'}
                         >
-                          Druid Metrics Cube (Post-Agg Cube)
+                          Druid
                         </option>
-                        <option key={'spark_sql'} value={'spark_sql'}>
+                        {/* <option key={'spark_sql'} value={'spark_sql'}>
                           Iceberg Table
-                        </option>
+                        </option> */}
                       </>
                     </Field>
                     <br />
@@ -150,6 +162,7 @@ export default function AddMaterializationPopover({ node, onSubmit }) {
                   value={node?.name}
                   readOnly={true}
                 />
+                {console.log('timePartitionColumns.length', timePartitionColumns.length)}
                 <span data-testid="edit-partition">
                   <label htmlFor="strategy">Strategy</label>
                   <Field as="select" name="strategy">

package/src/app/pages/NodePage/NodeInfoTab.jsx

@@ -70,7 +70,7 @@ export default function NodeInfoTab({ node }) {
     );
 
   const metricQueryDiv =
-    node.type === 'metric' ? (
+    node?.type === 'metric' ? (
       <div className="list-group-item d-flex">
         <div className="gap-2 w-100 justify-content-between py-3">
           <div style={{ marginBottom: '30px' }}>

package/src/app/services/DJService.js

@@ -980,6 +980,25 @@ export const DataJunctionAPI = {
     );
     return { status: response.status, json: await response.json() };
   },
+  materializeCube: async function (nodeName, jobType, strategy, schedule, lookbackWindow) {
+    const response = await fetch(
+      `${DJ_URL}/nodes/${nodeName}/materialization`,
+      {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          job: jobType,
+          strategy: strategy,
+          schedule: schedule,
+          lookback_window: lookbackWindow,
+        }),
+        credentials: 'include',
+      },
+    );
+    return { status: response.status, json: await response.json() };
+  },
   runBackfill: async function (nodeName, materializationName, partitionValues) {
     const response = await fetch(
       `${DJ_URL}/nodes/${nodeName}/materializations/${materializationName}/backfill`,