Merge branch 'master' into PLATE-838

HumanSignal · Jan 31, 2024 · 7cee29b · 7cee29b
2 parents 2b5743a + 0df716f
commit 7cee29b
Show file tree

Hide file tree

Showing 15 changed files with 120 additions and 42 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
       run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
     - name: Configure yarn cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
         key: ${{ env.CACHE_NAME_PREFIX }}-${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/yarn.lock') }}

diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
@@ -42,7 +42,7 @@ jobs:
         run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
       - name: Configure yarn cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
           key: ${{ env.CACHE_NAME_PREFIX }}-${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/yarn.lock') }}

diff --git a/.github/workflows/git-command.yml b/.github/workflows/git-command.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: hmarr/[email protected]
 
       - name: Add Workflow link to command comment
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           token: ${{ secrets.GIT_PAT }}
           repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
@@ -50,7 +50,7 @@ jobs:
           echo "merge_conflict=$(git merge-tree $(git merge-base HEAD origin/$SLASH_COMMAND_ARG_BRANCH) origin/$SLASH_COMMAND_ARG_BRANCH HEAD | grep '<<')" >> $GITHUB_OUTPUT
 
       - name: Add reaction to command comment on merge conflict
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         if: ${{ steps.check-conflict.outputs.merge_conflict }}
         with:
           token: ${{ secrets.GIT_PAT }}
@@ -81,7 +81,7 @@ jobs:
 
       - name: Add reaction to command comment on nothing to do
         if: ${{ !steps.check-conflict.outputs.merge_conflict && steps.commit_and_push.outputs.changes == 'no' }}
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           token: ${{ secrets.GIT_PAT }}
           repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
@@ -92,7 +92,7 @@ jobs:
 
       - name: Add reaction to command comment on success
         if: ${{ !steps.check-conflict.outputs.merge_conflict && steps.commit_and_push.outputs.changes == 'yes' }}
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           token: ${{ secrets.GIT_PAT }}
           repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
@@ -103,7 +103,7 @@ jobs:
           reactions: "+1"
 
       - name: Add reaction to command comment on failure
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         if: failure()
         with:
           token: ${{ secrets.GIT_PAT }}
@@ -119,7 +119,7 @@ jobs:
     timeout-minutes: 1
     steps:
       - name: Update comment
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           token: ${{ secrets.GIT_PAT }}
           repository: ${{ github.event.client_payload.github.payload.repository.full_name }}

diff --git a/.github/workflows/help-command.yml b/.github/workflows/help-command.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - name: Update comment if empty
         if: ${{ github.event.client_payload.slash_command.args.all == '' }}
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           token: ${{ secrets.GIT_PAT }}
           repository: ${{ github.event.client_payload.github.payload.repository.full_name }}

diff --git a/.github/workflows/jira-command.yml b/.github/workflows/jira-command.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: hmarr/[email protected]
 
       - name: Add Workflow link to command comment
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           token: ${{ secrets.GIT_PAT }}
           repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
@@ -64,7 +64,7 @@ jobs:
           type: ${{ github.event.client_payload.slash_command.args.unnamed.arg2 || 'task' }}
 
       - name: Add reaction to command comment on success
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           token: ${{ secrets.GIT_PAT }}
           repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
@@ -74,7 +74,7 @@ jobs:
           reactions: "+1"
 
       - name: Add reaction to command comment on failure
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         if: failure()
         with:
           token: ${{ secrets.GIT_PAT }}
@@ -91,7 +91,7 @@ jobs:
     timeout-minutes: 1
     steps:
       - name: Update comment
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           token: ${{ secrets.GIT_PAT }}
           repository: ${{ github.event.client_payload.github.payload.repository.full_name }}

diff --git a/.github/workflows/slash-command-dispatch.yml b/.github/workflows/slash-command-dispatch.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: Edit comment with error message
         if: ${{ steps.determine_command.outputs.command_state == 'unknown' }}
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v4
         with:
           comment-id: ${{ github.event.comment.id }}
           body: |

diff --git a/src/components/CellViews/DateTimeCell.js b/src/components/CellViews/DateTimeCell.js
@@ -1,12 +1,12 @@
 import { format, isValid } from "date-fns";
+export const dateTimeFormat = "MMM dd yyyy, HH:mm:ss";
 
 export const DateTimeCell = (column) => {
   const date = new Date(column.value);
-  const dateFormat = "MMM dd yyyy, HH:mm:ss";
 
   return column.value ? (
     <div style={{ whiteSpace: "nowrap" }}>
-      {isValid(date) ? format(date, dateFormat) : ""}
+      {isValid(date) ? format(date, dateTimeFormat) : ""}
     </div>
   ) : (
     ""

diff --git a/src/components/CellViews/ProjectCell.js b/src/components/CellViews/ProjectCell.js
@@ -0,0 +1,45 @@
+import { getRoot } from "mobx-state-tree";
+import { Fragment } from "react";
+
+const ProjectLink = ({ project }) => {
+  const projectID = project.id;
+  const onClick = (e) => {
+    e.stopPropagation();
+
+  };
+
+  return (
+    <a href={`/projects/${projectID}/data`} onClick={onClick}>
+      {project.title}
+    </a>
+  );
+};
+
+export const ProjectCell = (cell) => {
+  const { original, value } = cell;
+  const root = getRoot(original);
+  const projectList = value
+    .map(projectRef => root.taskStore.associatedList.find(proj => proj.id === projectRef.project_id))
+    .filter(Boolean);
+
+  return (
+    <div
+      style={{
+        maxHeight: "100%",
+        overflow: "hidden",
+        fontSize: 12,
+        lineHeight: "16px",
+      }}
+    >
+      {projectList && (
+        projectList
+          .map((projectRef, index) => (
+            <Fragment key={projectRef.project_id}>
+              {index > 0 && ", "}
+              <ProjectLink project={projectRef} />
+            </Fragment>
+          ))
+      )}
+    </div>
+  );
+};
diff --git a/src/components/CellViews/StringCell.js b/src/components/CellViews/StringCell.js
@@ -1,24 +1,31 @@
-const valueToString = (value) => {
+import { format, isValid } from "date-fns";
+import { dateTimeFormat } from "./DateTimeCell";
+
+export const valueToString = (value) => {
   if (typeof value === "string") return value;
+  /* if undefined or null we'll treat it as empty string */
+  if (value === undefined || value === null) return "";
+  if (value instanceof Date && isValid(value)) return format(value, dateTimeFormat);
 
   try {
+    /* JSON.stringify will handle JSON and non-strings, non-null, non-undefined */
     return JSON.stringify(value);
   } catch {
-    return value.toString();
+    return 'Error: Invalid JSON';
   }
 };
 
 export const StringCell = ({ value }) => {
+  const style = {
+    maxHeight: "100%",
+    overflow: "hidden",
+    fontSize: 12,
+    lineHeight: "16px",
+  };
+
   return (
-    <div
-      style={{
-        maxHeight: "100%",
-        overflow: "hidden",
-        fontSize: 12,
-        lineHeight: "16px",
-      }}
-    >
-      {value ? valueToString(value) : ""}
+    <div style={style}>
+      {valueToString(value)}
     </div>
   );
 };
diff --git a/src/components/CellViews/index.js b/src/components/CellViews/index.js
@@ -13,3 +13,5 @@ export { NumberCell as Number } from "./NumberCell";
 export { StringCell as String } from "./StringCell";
 export { StringCell as Text } from "./StringCell";
 export { VideoCell as Video } from "./VideoCell";
+export { ProjectCell as Project } from './ProjectCell';
+
diff --git a/src/components/Common/Table/TableHead/TableHead.js b/src/components/Common/Table/TableHead/TableHead.js
@@ -18,6 +18,7 @@ import { TableContext, TableElem } from "../TableContext";
 import { getStyle } from "../utils";
 import "./TableHead.styl";
 import { FF_DEV_2984, FF_DEV_3873, FF_LOPS_E_10, isFF } from "../../../../utils/feature-flags";
+import { getRoot } from "mobx-state-tree";
 
 const { Block, Elem } = BemWithSpecifiContext();
 
@@ -120,9 +121,11 @@ const ColumnRenderer = observer(
       );
     }
 
+    const root = getRoot(column.original);
+    const isDE = root.SDK.type === "DE";
     const canOrder = sortingEnabled && column.original?.canOrder;
     const Decoration = decoration?.get?.(column);
-    const extra = columnHeaderExtra
+    const extra = !isDE && columnHeaderExtra
       ? columnHeaderExtra(column, Decoration)
       : null;
     const content = Decoration?.content
@@ -158,7 +161,7 @@ const ColumnRenderer = observer(
           onResizeFinished={(width) => onResize?.(column, width)}
           onReset={() => onReset?.(column)}
         >
-          {column.parent ? (
+          {!isDE && column.parent ? (
             <DropdownWrapper
               column={column}
               cellViews={cellViews}

diff --git a/src/components/Common/TableOld/TableHead/TableHead.js b/src/components/Common/TableOld/TableHead/TableHead.js
@@ -18,6 +18,7 @@ import { TableContext, TableElem } from "../TableContext";
 import { getStyle } from "../utils";
 import "./TableHead.styl";
 import { FF_DEV_2984, FF_DEV_3873, isFF } from "../../../../utils/feature-flags";
+import { getRoot } from "mobx-state-tree";
 
 const { Block, Elem } = BemWithSpecifiContext();
 
@@ -110,9 +111,11 @@ const ColumnRenderer = observer(
       );
     }
 
+    const root = getRoot(column.original);
+    const isDE = root.SDK.type === "DE";
     const canOrder = sortingEnabled && column.original?.canOrder;
     const Decoration = decoration?.get?.(column);
-    const extra = columnHeaderExtra
+    const extra = !isDE && columnHeaderExtra
       ? columnHeaderExtra(column, Decoration)
       : null;
     const content = Decoration?.content
@@ -148,7 +151,7 @@ const ColumnRenderer = observer(
           onResizeFinished={(width) => onResize?.(column, width)}
           onReset={() => onReset?.(column)}
         >
-          {column.parent ? (
+          {!isDE && column.parent ? (
             <DropdownWrapper
               column={column}
               cellViews={cellViews}

diff --git a/src/components/MainView/DataView/DataView.js b/src/components/MainView/DataView/DataView.js
@@ -248,9 +248,13 @@ export const DataView = injector(
           },
         },
         {
-          resolver: (col) => col.type === "Image",
+          resolver: (col) => col.type === "Image" && col.original && getRoot(col.original)?.SDK?.type !== 'DE',
           style: { width: 150, justifyContent: "center" },
         },
+        {
+          resolver: (col) => col.type === "Image" && col.original && getRoot(col.original)?.SDK?.type === 'DE',
+          style: { width: 150 },
+        },
         {
           resolver: (col) => ["Date", "Datetime"].includes(col.type),
           style: { width: 240 },

diff --git a/src/components/MainView/DataViewOld/Table.js b/src/components/MainView/DataViewOld/Table.js
@@ -125,7 +125,7 @@ export const DataView = injector(
         } else if (e.metaKey || e.ctrlKey) {
           window.open(`./?task=${itemID}`, "_blank");
         } else {
-          if (isFF(FF_OPTIC_2)) await store._sdk.lsf?.saveDraft();
+          if (isFF(FF_OPTIC_2)) store._sdk.lsf?.saveDraft();
           getRoot(view).startLabeling(item);
         }
       },
@@ -247,9 +247,13 @@ export const DataView = injector(
           },
         },
         {
-          resolver: (col) => col.type === "Image",
+          resolver: (col) => col.type === "Image" && col.original && getRoot(col.original)?.SDK?.type !== 'DE',
           style: { width: 150, justifyContent: "center" },
         },
+        {
+          resolver: (col) => col.type === "Image" && col.original && getRoot(col.original)?.SDK?.type === 'DE',
+          style: { width: 150 },
+        },
         {
           resolver: (col) => ["Date", "Datetime"].includes(col.type),
           style: { width: 240 },