Skip to content

Commit

Permalink
Merge branch 'refs/heads/develop' into gr-DCJ-659-ecm-for-era-commons
Browse files Browse the repository at this point in the history
  • Loading branch information
rushtong committed Dec 4, 2024
2 parents beb9569 + 3ec86ff commit 489cf7a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 20 deletions.
20 changes: 3 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"ajv": "8.17.1",
"ajv-formats": "3.0.1",
"axios": "1.7.8",
"dayjs": "1.11.3",
"dompurify": "3.2.2",
"js-file-download": "0.4.12",
"lodash": "4.17.21",
"mixin-deep": "2.0.1",
"moment": "2.30.1",
"noty": "3.2.0-beta",
"oidc-client-ts": "3.1.0",
"query-string": "9.1.1",
Expand Down
4 changes: 2 additions & 2 deletions src/components/library_card_table/LibraryCardTable.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import moment from 'moment';
import dayjs from 'dayjs';
import React, { useState, useEffect, useRef, useCallback } from 'react';
import ReactTooltip from 'react-tooltip';
import { Notifications, searchOnFilteredList, calcTablePageCount, calcVisibleWindow, getSearchFilterFunctions} from '../../libs/utils';
Expand Down Expand Up @@ -77,7 +77,7 @@ const eraCommonsCell = (eraCommonsId, id) => {

const createDateCell = (createDate, id) => {
return {
data: !isNil(createDate) ? moment(createDate).format('YYYY-MM-DD') : '- -',
data: !isNil(createDate) ? dayjs(createDate).format('YYYY-MM-DD') : '- -',
id,
style: { width: styles.cellWidths.createDate },
label: 'create-date',
Expand Down

0 comments on commit 489cf7a

Please sign in to comment.