Skip to content

Commit d31e705

Browse files
authored
Merge branch 'dev' into fix/os-dependency
2 parents b6098dc + 2795baf commit d31e705

File tree

8 files changed

+13
-12
lines changed

8 files changed

+13
-12
lines changed

apps/api/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@swc/core": "^1.3.95",
8787
"@types/bcrypt": "^5.0.1",
8888
"@types/express": "^4.17.21",
89-
"@types/jest": "^29.5.6",
89+
"@types/jest": "^29.5.12",
9090
"@types/node": "20.8.8",
9191
"@types/nodemailer": "^6.4.13",
9292
"@types/supertest": "^2.0.15",

apps/web/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"@testing-library/jest-dom": "^6.1.4",
8282
"@testing-library/react": "^14.0.0",
8383
"@testing-library/user-event": "^14.5.1",
84-
"@types/jest": "^29.5.6",
84+
"@types/jest": "^29.5.12",
8585
"@types/node": "20.8.7",
8686
"@types/react": "^18.2.55",
8787
"@types/react-beautiful-dnd": "^13.1.6",

apps/web/src/components/etc/TableLoadingRow/TableLoadingRow.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const TableLoadingRow: React.FC<IProps> = ({ colSpan }) => {
2222
<tr>
2323
<td colSpan={colSpan} style={{ padding: 0, height: 0 }}>
2424
<div className="relative w-full rounded bg-gray-200">
25-
<div className="tabel-loading relative top-0 h-1 w-full rounded" />
25+
<div className="table-loading relative top-0 h-1 w-full rounded" />
2626
</div>
2727
</td>
2828
</tr>

apps/web/src/containers/tables/IssueTable/IssueTable.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import type { IssueTrackerType } from '@/types/issue-tracker.type';
6161
import type { IssueType } from '@/types/issue.type';
6262
import { FeedbackTableInIssue } from '../FeedbackTable';
6363
import IssueSettingPopover from './IssueSettingPopover';
64-
import IssueTabelSelectBox from './IssueTabelSelectBox';
64+
import IssueTableSelectBox from './IssueTableSelectBox';
6565
import { TableRow } from './TableRow';
6666
import TicketLink from './TicketLink';
6767

@@ -348,7 +348,7 @@ const IssueTable: React.FC<IProps> = ({ projectId }) => {
348348

349349
return (
350350
<div className="flex flex-col gap-2">
351-
<IssueTabelSelectBox
351+
<IssueTableSelectBox
352352
currentIssueKey={currentIssueKey}
353353
issueCountData={issueCountData}
354354
onChangeOption={(status) => setQuery({ ...query, status })}

apps/web/src/containers/tables/IssueTable/IssueTabelSelectBox/IssueTabelSelectBox.tsx apps/web/src/containers/tables/IssueTable/IssueTableSelectBox/IssueTableSelectBox.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ interface IProps extends React.PropsWithChildren {
2424
issueCountData: { key: string; count: number }[] | undefined;
2525
}
2626

27-
const IssueTabelSelectBox: React.FC<IProps> = (props) => {
27+
const IssueTableSelectBox: React.FC<IProps> = (props) => {
2828
const { currentIssueKey, onChangeOption, issueCountData } = props;
2929

3030
const { t } = useTranslation();
@@ -62,4 +62,4 @@ const IssueTabelSelectBox: React.FC<IProps> = (props) => {
6262
);
6363
};
6464

65-
export default IssueTabelSelectBox;
65+
export default IssueTableSelectBox;

apps/web/src/containers/tables/IssueTable/IssueTabelSelectBox/index.ts apps/web/src/containers/tables/IssueTable/IssueTableSelectBox/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
* License for the specific language governing permissions and limitations
1414
* under the License.
1515
*/
16-
export { default } from './IssueTabelSelectBox';
16+
export { default } from './IssueTableSelectBox';

apps/web/src/pages/_app.css

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
@tailwind utilities;
44

55
@layer components {
6-
.tabel-loading {
6+
.table-loading {
77
position: relative;
88
overflow: hidden;
99
@apply bg-blue-primary;
1010
}
1111

12-
.tabel-loading::after {
12+
.table-loading::after {
1313
position: absolute;
1414
top: 0;
1515
right: 0;
@@ -22,12 +22,12 @@
2222
rgba(233, 233, 233, 0.9) 50%,
2323
rgba(233, 233, 233, 0.8) 100%
2424
);
25-
animation: tabel-loading 1s ease-out infinite;
25+
animation: table-loading 1s ease-out infinite;
2626
content: '';
2727
}
2828
}
2929

30-
@keyframes tabel-loading {
30+
@keyframes table-loading {
3131
100% {
3232
transform: translateX(0%);
3333
opacity: 0;

yarn.lock

+1
Original file line numberDiff line numberDiff line change
@@ -20868,3 +20868,4 @@ __metadata:
2086820868
checksum: 10c0/aee26f11facebb39b016e89539f72a72c2c00151208907fc909c3cedd455728240e09e01d98ebd3b63a2a3518a5917eac5de6c853743ca55a1655296d750bb48
2086920869
languageName: node
2087020870
linkType: hard
20871+

0 commit comments

Comments
 (0)