Merge pull request #2 from ts-tech-repo/master-bootstrap

ts-tech-repo · web-flow · commit 92797a8e217d · 2025-05-28T16:59:16.000+05:30
Bootstrap version change
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@redux-beacon/segment": "^1.1.0",
     "@reduxjs/toolkit": "^1.6.1",
+    "@testing-library/dom": "^10.4.0",
     "@testing-library/user-event": "^14.0.0",
     "@zip.js/zip.js": "^2.4.6",
     "axios": "^0.27.0",
@@ -49,8 +50,10 @@
     "font-awesome": "4.7.0",
     "history": "5.3.0",
     "html-react-parser": "^1.3.0",
+    "jquery": "^3.7.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.3",
+    "popper.js": "^1.16.1",
     "prop-types": "15.8.1",
     "query-string": "7.1.3",
     "react": "^17.0.2",
@@ -69,6 +72,8 @@
     "redux-thunk": "2.4.2",
     "regenerator-runtime": "^0.14.0",
     "reselect": "^4.0.0",
+    "ts-paragon": "^20.18.13",
+    "typescript": "^4.9.5",
     "util": "^0.12.4",
     "whatwg-fetch": "^3.6.2"
   },
diff --git a/src/App.scss b/src/App.scss
@@ -1,7 +1,7 @@
 // frontend-app-*/src/index.scss
 @import "~@edx/brand/paragon/fonts";
 @import "~@edx/brand/paragon/variables";
-@import "~@edx/paragon/scss/core/core";
+@import "~ts-paragon/styles/scss/core/core";
 @import "~@edx/brand/paragon/overrides";
 
 $fa-font-path: "~font-awesome/fonts";
diff --git a/src/components/ConfirmModal.jsx b/src/components/ConfirmModal.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { AlertModal, ActionRow, Button } from '@edx/paragon';
+import { AlertModal, ActionRow, Button } from 'ts-paragon';
 import { nullMethod } from 'hooks';
 
 export const ConfirmModal = ({
diff --git a/src/components/DemoAlert/index.jsx b/src/components/DemoAlert/index.jsx
@@ -6,7 +6,7 @@ import {
   ActionRow,
   AlertModal,
   Button,
-} from '@edx/paragon';
+} from 'ts-paragon';
 
 import messages from './messages';
 
diff --git a/src/components/FilePreview/Banners/ErrorBanner.jsx b/src/components/FilePreview/Banners/ErrorBanner.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { Alert, Button } from '@edx/paragon';
-import { Info } from '@edx/paragon/icons';
+import { Alert, Button } from 'ts-paragon';
+import { Info } from 'ts-paragon/icons';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
 const messageShape = PropTypes.shape({
diff --git a/src/components/FilePreview/Banners/LoadingBanner.jsx b/src/components/FilePreview/Banners/LoadingBanner.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Alert, Spinner } from '@edx/paragon';
+import { Alert, Spinner } from 'ts-paragon';
 
 export const LoadingBanner = () => (
   <Alert variant="info">
diff --git a/src/components/FilePreview/BaseRenderers/PDFRenderer.jsx b/src/components/FilePreview/BaseRenderers/PDFRenderer.jsx
@@ -4,8 +4,8 @@ import PropTypes from 'prop-types';
 import { pdfjs, Document, Page } from 'react-pdf';
 import {
   Icon, Form, ActionRow, IconButton,
-} from '@edx/paragon';
-import { ChevronLeft, ChevronRight } from '@edx/paragon/icons';
+} from 'ts-paragon';
+import { ChevronLeft, ChevronRight } from 'ts-paragon/icons';
 import pdfjsWorker from 'react-pdf/dist/esm/pdf.worker.entry';
 
 import 'react-pdf/dist/esm/Page/AnnotationLayer.css';
diff --git a/src/components/FilePreview/FileCard.jsx b/src/components/FilePreview/FileCard.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { Card, Collapsible } from '@edx/paragon';
+import { Card, Collapsible } from 'ts-paragon';
 import FilePopoverContent from 'components/FilePopoverContent';
 import FileInfo from './FileInfo';
 
diff --git a/src/components/FilePreview/FileCard.scss b/src/components/FilePreview/FileCard.scss
@@ -1,4 +1,4 @@
-@import "@edx/paragon/scss/core/core";
+@import "ts-paragon/styles/scss/core/core";
 
 .file-card {
   margin: map-get($spacers, 1) 0;
diff --git a/src/components/FilePreview/FileCard.test.jsx b/src/components/FilePreview/FileCard.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { Collapsible } from '@edx/paragon';
+import { Collapsible } from 'ts-paragon';
 
 import FilePopoverContent from 'components/FilePopoverContent';
 import FileInfo from './FileInfo';
diff --git a/src/components/FilePreview/FileInfo.jsx b/src/components/FilePreview/FileInfo.jsx
@@ -5,8 +5,8 @@ import {
   Button,
   OverlayTrigger,
   Popover,
-} from '@edx/paragon';
-import { InfoOutline } from '@edx/paragon/icons';
+} from 'ts-paragon';
+import { InfoOutline } from 'ts-paragon/icons';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 import { nullMethod } from 'hooks';
 import messages from './messages';
diff --git a/src/components/FilePreview/FileInfo.test.jsx b/src/components/FilePreview/FileInfo.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { Popover } from '@edx/paragon';
+import { Popover } from 'ts-paragon';
 
 import FileInfo from './FileInfo';
 
diff --git a/src/components/InfoPopover/index.jsx b/src/components/InfoPopover/index.jsx
@@ -6,8 +6,8 @@ import {
   Popover,
   Icon,
   IconButton,
-} from '@edx/paragon';
-import { InfoOutline } from '@edx/paragon/icons';
+} from 'ts-paragon';
+import { InfoOutline } from 'ts-paragon/icons';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import { nullMethod } from 'hooks';
diff --git a/src/components/LoadingMessage.jsx b/src/components/LoadingMessage.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { Spinner } from '@edx/paragon';
+import { Spinner } from 'ts-paragon';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
 /**
diff --git a/src/components/StatusBadge.jsx b/src/components/StatusBadge.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { Badge } from '@edx/paragon';
+import { Badge } from 'ts-paragon';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
 import { StrictDict } from 'utils';
diff --git a/src/containers/CTA/index.jsx b/src/containers/CTA/index.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
-import { PageBanner, Hyperlink } from '@edx/paragon';
+import { PageBanner, Hyperlink } from 'ts-paragon';
 
 import messages from './messages';
 
diff --git a/src/containers/CriterionContainer/CriterionFeedback.jsx b/src/containers/CriterionContainer/CriterionFeedback.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
-import { Form } from '@edx/paragon';
+import { Form } from 'ts-paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import { feedbackRequirement } from 'data/services/lms/constants';
diff --git a/src/containers/CriterionContainer/RadioCriterion.jsx b/src/containers/CriterionContainer/RadioCriterion.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
-import { Form } from '@edx/paragon';
+import { Form } from 'ts-paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import { actions, selectors } from 'data/redux';
diff --git a/src/containers/CriterionContainer/ReviewCriterion.jsx b/src/containers/CriterionContainer/ReviewCriterion.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
-import { Form, FormControlFeedback } from '@edx/paragon';
+import { Form, FormControlFeedback } from 'ts-paragon';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
 import { selectors } from 'data/redux';
diff --git a/src/containers/CriterionContainer/index.jsx b/src/containers/CriterionContainer/index.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
-import { Form } from '@edx/paragon';
+import { Form } from 'ts-paragon';
 
 import { selectors } from 'data/redux';
 import { gradeStatuses } from 'data/services/lms/constants';
diff --git a/src/containers/DemoWarning/index.jsx b/src/containers/DemoWarning/index.jsx
@@ -3,8 +3,8 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
-import { Alert } from '@edx/paragon';
-import { Info } from '@edx/paragon/icons';
+import { Alert } from 'ts-paragon';
+import { Info } from 'ts-paragon/icons';
 
 import { selectors } from 'data/redux';
 import messages from './messages';
diff --git a/src/containers/ListView/EmptySubmission.jsx b/src/containers/ListView/EmptySubmission.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
-import { Hyperlink, Button } from '@edx/paragon';
+import { Hyperlink, Button } from 'ts-paragon';
 
 import urls from 'data/services/lms/urls';
 import emptyStateSVG from './assets/empty-state.svg';
diff --git a/src/containers/ListView/EmptySubmission.test.jsx b/src/containers/ListView/EmptySubmission.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { Hyperlink } from '@edx/paragon';
+import { Hyperlink } from 'ts-paragon';
 
 import urls from 'data/services/lms/urls';
 
diff --git a/src/containers/ListView/FilterStatusComponent.jsx b/src/containers/ListView/FilterStatusComponent.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Button, DataTableContext } from '@edx/paragon';
+import { Button, DataTableContext } from 'ts-paragon';
 
 import * as module from './FilterStatusComponent';
 
diff --git a/src/containers/ListView/ListError.jsx b/src/containers/ListView/ListError.jsx
@@ -6,8 +6,8 @@ import {
   Alert,
   Button,
   Hyperlink,
-} from '@edx/paragon';
-import { Info } from '@edx/paragon/icons';
+} from 'ts-paragon';
+import { Info } from 'ts-paragon/icons';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
 import urls from 'data/services/lms/urls';
diff --git a/src/containers/ListView/ListView.scss b/src/containers/ListView/ListView.scss
@@ -1,4 +1,4 @@
-@import "@edx/paragon/scss/core/core";
+@import "ts-paragon/styles/scss/core/core";
 
 span.pgn__icon.breadcrumb-arrow {
   width: 16px !important;
diff --git a/src/containers/ListView/ListViewBreadcrumb.jsx b/src/containers/ListView/ListViewBreadcrumb.jsx
@@ -2,8 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
-import { ArrowBack, Launch } from '@edx/paragon/icons';
-import { Hyperlink, Icon } from '@edx/paragon';
+import { ArrowBack, Launch } from 'ts-paragon/icons';
+import { Hyperlink, Icon } from 'ts-paragon';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
 import { selectors } from 'data/redux';
diff --git a/src/containers/ListView/ListViewBreadcrumb.test.jsx b/src/containers/ListView/ListViewBreadcrumb.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { Hyperlink } from '@edx/paragon';
+import { Hyperlink } from 'ts-paragon';
 
 import * as constants from 'data/constants/app';
 import urls from 'data/services/lms/urls';
diff --git a/src/containers/ListView/SelectedBulkAction.jsx b/src/containers/ListView/SelectedBulkAction.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Button } from '@edx/paragon';
+import { Button } from 'ts-paragon';
 
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
diff --git a/src/containers/ListView/SubmissionsTable.jsx b/src/containers/ListView/SubmissionsTable.jsx
@@ -7,7 +7,7 @@ import {
   DataTable,
   TextFilter,
   MultiSelectDropdownFilter,
-} from '@edx/paragon';
+} from 'ts-paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import { gradingStatuses, submissionFields } from 'data/services/lms/constants';
diff --git a/src/containers/ListView/SubmissionsTable.test.jsx b/src/containers/ListView/SubmissionsTable.test.jsx
@@ -5,7 +5,7 @@ import {
   DataTable,
   MultiSelectDropdownFilter,
   TextFilter,
-} from '@edx/paragon';
+} from 'ts-paragon';
 
 import { selectors, thunkActions } from 'data/redux';
 import { gradingStatuses as statuses, submissionFields } from 'data/services/lms/constants';
diff --git a/src/containers/ListView/TableAction.jsx b/src/containers/ListView/TableAction.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Button } from '@edx/paragon';
+import { Button } from 'ts-paragon';
 
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
diff --git a/src/containers/ListView/index.jsx b/src/containers/ListView/index.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
-import { Container, Spinner } from '@edx/paragon';
+import { Container, Spinner } from 'ts-paragon';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
 import { selectors, thunkActions } from 'data/redux';
diff --git a/src/containers/ListView/index.test.jsx b/src/containers/ListView/index.test.jsx
@@ -34,7 +34,7 @@ jest.mock('data/redux', () => ({
   },
 }));
 
-jest.mock('@edx/paragon', () => ({
+jest.mock('ts-paragon', () => ({
   Container: 'Container',
   Spinner: 'Spinner',
 }));
diff --git a/src/containers/ResponseDisplay/FileDownload.jsx b/src/containers/ResponseDisplay/FileDownload.jsx
@@ -6,7 +6,7 @@ import { FormattedMessage } from '@edx/frontend-platform/i18n';
 import {
   StatefulButton,
   Icon,
-} from '@edx/paragon';
+} from 'ts-paragon';
 
 import { RequestKeys, RequestStates } from 'data/constants/requests';
 import { selectors, thunkActions } from 'data/redux';
diff --git a/src/containers/ResponseDisplay/ResponseDisplay.scss b/src/containers/ResponseDisplay/ResponseDisplay.scss
@@ -1,4 +1,4 @@
-@import "@edx/paragon/scss/core/core";
+@import "ts-paragon/styles/scss/core/core";
 
 .response-display {
   padding: map-get($spacers, 0);
diff --git a/src/containers/ResponseDisplay/SubmissionFiles.jsx b/src/containers/ResponseDisplay/SubmissionFiles.jsx
@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 
 import {
   Card, Collapsible, Icon, DataTable, Button,
-} from '@edx/paragon';
-import { ArrowDropDown, ArrowDropUp, WarningFilled } from '@edx/paragon/icons';
+} from 'ts-paragon';
+import { ArrowDropDown, ArrowDropUp, WarningFilled } from 'ts-paragon/icons';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import { downloadAllLimit, downloadSingleLimit } from 'data/constants/files';
diff --git a/src/containers/ResponseDisplay/index.jsx b/src/containers/ResponseDisplay/index.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
-import { Card } from '@edx/paragon';
+import { Card } from 'ts-paragon';
 
 import createDOMPurify from 'dompurify';
 
diff --git a/src/containers/ReviewActions/ReviewActions.scss b/src/containers/ReviewActions/ReviewActions.scss
@@ -1,4 +1,4 @@
-@import "@edx/paragon/scss/core/core";
+@import "ts-paragon/styles/scss/core/core";
 
 // action reviews
 .review-actions {
diff --git a/src/containers/ReviewActions/components/StartGradingButton/hooks.js b/src/containers/ReviewActions/components/StartGradingButton/hooks.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 
-import { Cancel, Highlight } from '@edx/paragon/icons';
+import { Cancel, Highlight } from 'ts-paragon/icons';
 
 import { selectors, thunkActions } from 'data/redux';
 import { RequestKeys } from 'data/constants/requests';
diff --git a/src/containers/ReviewActions/components/StartGradingButton/index.jsx b/src/containers/ReviewActions/components/StartGradingButton/index.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useDispatch } from 'react-redux';
 
-import { Button } from '@edx/paragon';
+import { Button } from 'ts-paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import StopGradingConfirmModal from '../StopGradingConfirmModal';
diff --git a/src/containers/ReviewActions/components/SubmissionNavigation.jsx b/src/containers/ReviewActions/components/SubmissionNavigation.jsx
@@ -2,8 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
-import { Icon, IconButton } from '@edx/paragon';
-import { ChevronLeft, ChevronRight } from '@edx/paragon/icons';
+import { Icon, IconButton } from 'ts-paragon';
+import { ChevronLeft, ChevronRight } from 'ts-paragon/icons';
 import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import { selectors, thunkActions } from 'data/redux';
diff --git a/src/containers/ReviewActions/index.jsx b/src/containers/ReviewActions/index.jsx
diff --git a/src/containers/ReviewModal/ReviewContent.jsx b/src/containers/ReviewModal/ReviewContent.jsx
diff --git a/src/containers/ReviewModal/ReviewErrors/ReviewError.jsx b/src/containers/ReviewModal/ReviewErrors/ReviewError.jsx
diff --git a/src/containers/ReviewModal/ReviewErrors/ReviewError.test.jsx b/src/containers/ReviewModal/ReviewErrors/ReviewError.test.jsx
diff --git a/src/containers/ReviewModal/ReviewModal.scss b/src/containers/ReviewModal/ReviewModal.scss
diff --git a/src/containers/ReviewModal/index.jsx b/src/containers/ReviewModal/index.jsx
diff --git a/src/containers/Rubric/Rubric.scss b/src/containers/Rubric/Rubric.scss
diff --git a/src/containers/Rubric/RubricFeedback.jsx b/src/containers/Rubric/RubricFeedback.jsx
diff --git a/src/containers/Rubric/index.jsx b/src/containers/Rubric/index.jsx
diff --git a/src/i18n/index.js b/src/i18n/index.js
diff --git a/src/setupTest.js b/src/setupTest.js
diff --git a/src/test/app.test.jsx b/src/test/app.test.jsx

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@import "@edx/paragon/scss/core/core";`
	`1`	`+@import "ts-paragon/styles/scss/core/core";`
`2`	`2`
`3`	`3`	`.file-card {`
`4`	`4`	`margin: map-get($spacers, 1) 0;`