From d02a5ef6a656ea4fe8498e6372dc10aaea86e850 Mon Sep 17 00:00:00 2001
From: Awais Ansari <79941147+awais-ansari@users.noreply.github.com>
Date: Mon, 7 Feb 2022 15:06:11 +0500
Subject: [PATCH] Revert "feat: integrate feeder package"
---
.env | 1 -
.env.development | 1 -
.env.test | 1 -
package-lock.json | 5 -
package.json | 1 -
src/components/Feedback/constants.js | 2 -
src/components/Feedback/feeder.scss | 103 ------------------
src/components/Feedback/index.jsx | 40 -------
src/components/Feedback/messages.js | 16 ---
.../discussions-home/DiscussionsHome.test.jsx | 15 +--
.../posts/post-actions-bar/PostActionsBar.jsx | 4 -
.../post-actions-bar/PostActionsBar.test.jsx | 66 -----------
src/index.jsx | 1 -
13 files changed, 3 insertions(+), 253 deletions(-)
delete mode 100644 src/components/Feedback/constants.js
delete mode 100644 src/components/Feedback/feeder.scss
delete mode 100644 src/components/Feedback/index.jsx
delete mode 100644 src/components/Feedback/messages.js
delete mode 100644 src/discussions/posts/post-actions-bar/PostActionsBar.test.jsx
diff --git a/.env b/.env
index 2edd8e4a..9fc7c719 100644
--- a/.env
+++ b/.env
@@ -19,4 +19,3 @@ REFRESH_ACCESS_TOKEN_ENDPOINT=''
SEGMENT_KEY=''
SITE_NAME=''
USER_INFO_COOKIE_NAME=''
-FEEDER_PROJECT_ID=''
diff --git a/.env.development b/.env.development
index 59b14cfc..5266dd5d 100644
--- a/.env.development
+++ b/.env.development
@@ -20,4 +20,3 @@ REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
SEGMENT_KEY=''
SITE_NAME=localhost
USER_INFO_COOKIE_NAME='edx-user-info'
-FEEDER_PROJECT_ID=''
diff --git a/.env.test b/.env.test
index 065e8ac4..e6a9bc01 100644
--- a/.env.test
+++ b/.env.test
@@ -18,4 +18,3 @@ REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
SEGMENT_KEY=''
SITE_NAME=localhost
USER_INFO_COOKIE_NAME='edx-user-info'
-FEEDER_PROJECT_ID=''
diff --git a/package-lock.json b/package-lock.json
index ffb4bc6e..603be7a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7808,11 +7808,6 @@
"integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q==",
"dev": true
},
- "feeder-react-feedback": {
- "version": "0.0.6",
- "resolved": "https://registry.npmjs.org/feeder-react-feedback/-/feeder-react-feedback-0.0.6.tgz",
- "integrity": "sha512-BdilgLncuOdoFFC0Da3wYMIYODSxZaH3vUS4662QUTzKOGrGrc63yDywRFw2x4b30Kie3kwD4z3rXcaTznq7Mg=="
- },
"figures": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
diff --git a/package.json b/package.json
index 8ecac840..d552dc26 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,6 @@
"babel-polyfill": "6.26.0",
"classnames": "2.3.1",
"core-js": "3.19.1",
- "feeder-react-feedback": "0.0.6",
"formik": "2.2.9",
"lodash.snakecase": "4.1.1",
"prop-types": "15.7.2",
diff --git a/src/components/Feedback/constants.js b/src/components/Feedback/constants.js
deleted file mode 100644
index 2d12c187..00000000
--- a/src/components/Feedback/constants.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const FeedbackTypes = ['Review', 'Bug', 'Idea'];
-export const primaryColor = '#00262b';
diff --git a/src/components/Feedback/feeder.scss b/src/components/Feedback/feeder.scss
deleted file mode 100644
index 5dd44fab..00000000
--- a/src/components/Feedback/feeder.scss
+++ /dev/null
@@ -1,103 +0,0 @@
-@import "feeder-react-feedback/dist/feeder-react-feedback.css";
-
-.frf-feedback-container {
- position: unset;
- bottom: unset;
- z-index: unset;
- width: unset;
- right: unset;
-}
-
-#feedbackEmail {
- display: none;
-}
-
-div[for="feedbackEmail"] {
- display: none;
-}
-
-.frf-trigger-button {
- position: unset;
- box-shadow: unset;
-}
-
-.frf-feedback-icon::after {
- content: "Give Feedback" !important;
- margin-left: 8px !important;
- font-size: unset !important;
-}
-
-.frf-feedback-icon-open:after {
- content: "Close" !important;
- font-size: inherit !important;
-}
-
-.frf-modal-container {
- right: unset;
- bottom: unset;
-}
-
-.frf-dialog-enter-active {
- animation-name: unset;
- animation-duration: unset;
- opacity: unset;
- transition: unset;
-}
-
-.frf-dialog-enter {
- opacity: unset;
-}
-
-.frf-dialog-exit-active {
- animation-name: unset;
- animation-duration: unset;
- opacity: unset;
- transition: unset;
-}
-
-.frf-dialog-exit {
- opacity: 0;
-}
-
-.frf-water {
- display: none;
-}
-
-@media (hover: hover) {
- .frf-trigger-button {
- transition: unset;
-
- &:hover {
- .frf-feedback-icon:after {
- content: unset;
- margin-left: unset;
- font-size: unset;
- opacity: unset;
- transition: unset;
- }
-
- .frf-feedback-icon-open:after {
- content: unset;
- font-size: unset;
- opacity: unset;
- transition: unset;
- }
- }
-
- .frf-feedback-icon:after {
- content: unset;
- padding-left: unset;
- font-size: unset;
- opacity: unset;
- transition: unset;
- }
-
- .frf-feedback-icon-open:after {
- content: unset;
- padding-left: unset;
- font-size: unset;
- opacity: unset;
- transition: unset;
- }
- }
-}
diff --git a/src/components/Feedback/index.jsx b/src/components/Feedback/index.jsx
deleted file mode 100644
index d202bcfe..00000000
--- a/src/components/Feedback/index.jsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-
-import Feedback from 'feeder-react-feedback';
-
-import { ensureConfig, getConfig } from '@edx/frontend-platform';
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-
-import { FeedbackTypes, primaryColor } from './constants';
-import messages from './messages';
-
-import './feeder.scss';
-
-ensureConfig(['FEEDER_PROJECT_ID'], 'Feedback');
-
-const Index = ({ intl, ...props }) => {
- const { email } = getAuthenticatedUser();
- const projectId = getConfig().FEEDER_PROJECT_ID;
-
- return (
- projectId && (
-
- )
- );
-};
-
-Index.propTypes = {
- intl: intlShape.isRequired,
-};
-
-export default injectIntl(Index);
diff --git a/src/components/Feedback/messages.js b/src/components/Feedback/messages.js
deleted file mode 100644
index 250858ed..00000000
--- a/src/components/Feedback/messages.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
- submitButton: {
- id: 'feeder.submit.button',
- defaultMessage: 'Send Feedback',
- description: 'Alt text for feedback submission button.',
- },
- postSubmitButton: {
- id: 'feeder.post.submit.button',
- defaultMessage: 'Thank You For The Feedback!',
- description: 'Alt text for feedback post submission button',
- },
-});
-
-export default messages;
diff --git a/src/discussions/discussions-home/DiscussionsHome.test.jsx b/src/discussions/discussions-home/DiscussionsHome.test.jsx
index a57da1bf..69317335 100644
--- a/src/discussions/discussions-home/DiscussionsHome.test.jsx
+++ b/src/discussions/discussions-home/DiscussionsHome.test.jsx
@@ -3,7 +3,7 @@ import { IntlProvider } from 'react-intl';
import { Context as ResponsiveContext } from 'react-responsive';
import { MemoryRouter } from 'react-router';
-import { getConfig, initializeMockApp, setConfig } from '@edx/frontend-platform';
+import { initializeMockApp } from '@edx/frontend-platform';
import { AppProvider } from '@edx/frontend-platform/react';
import { initializeStore } from '../../store';
@@ -29,16 +29,10 @@ function renderComponent(location = `/${courseId}/`) {
describe('DiscussionsHome', () => {
beforeEach(async () => {
- setConfig({
- ...getConfig(),
- FEEDER_PROJECT_ID: 'test-id',
- });
-
initializeMockApp({
authenticatedUser: {
userId: 3,
username: 'abc123',
- email: 'abc123@example.com',
administrator: true,
roles: [],
},
@@ -56,7 +50,7 @@ describe('DiscussionsHome', () => {
await screen.findByTestId('topics-view');
});
- test('full view should show header, footer and feedback button and hide close button', async () => {
+ test('full view should show header and footer and hide close button', async () => {
renderComponent(`/${courseId}/topics`);
expect(screen.queryByText(navigationBarMessages.allTopics.defaultMessage))
.toBeInTheDocument();
@@ -71,11 +65,9 @@ describe('DiscussionsHome', () => {
// Footer should be visible
expect(screen.queryByRole('contentinfo'))
.toBeInTheDocument();
-
- expect(screen.queryByTestId('feedback').childElementCount).toEqual(1);
});
- test('in-context view should hide header and footer and show close and feedback button', async () => {
+ test('in-context view should hide header and footer and show close button', async () => {
renderComponent(`/${courseId}/topics?inContext`);
expect(screen.queryByText(navigationBarMessages.allTopics.defaultMessage))
@@ -93,6 +85,5 @@ describe('DiscussionsHome', () => {
expect(screen.queryByRole('contentinfo'))
.not
.toBeInTheDocument();
- expect(screen.queryByTestId('feedback').childElementCount).toEqual(1);
});
});
diff --git a/src/discussions/posts/post-actions-bar/PostActionsBar.jsx b/src/discussions/posts/post-actions-bar/PostActionsBar.jsx
index 50f2336a..4510953c 100644
--- a/src/discussions/posts/post-actions-bar/PostActionsBar.jsx
+++ b/src/discussions/posts/post-actions-bar/PostActionsBar.jsx
@@ -11,7 +11,6 @@ import {
} from '@edx/paragon';
import { Close } from '@edx/paragon/icons';
-import Feedback from '../../../components/Feedback';
import { Routes } from '../../../data/constants';
import { DiscussionContext } from '../../common/context';
import { discussionsPath } from '../../utils';
@@ -30,9 +29,6 @@ function PostActionsBar({
const handleCloseInContext = () => null;
return (
-
-
-
{!inContext && (
<>
-
-
-
-
-
- ,
- );
-}
-
-describe.each([
- { inContext: false },
- { inContext: true },
-])('PostActionsBar', ({ inContext }) => {
- beforeEach(async () => {
- setConfig({
- ...getConfig(),
- FEEDER_PROJECT_ID: 'test-id',
- });
-
- initializeMockApp({
- authenticatedUser: {
- userId: 3,
- username: 'abc123',
- email: 'abc123@example.com',
- administrator: true,
- roles: [],
- },
- });
-
- store = initializeStore();
- });
-
- test(`'full view should show feedback, add post, ${inContext ? 'close button and title and hide searchbar'
- : 'searchbar and hide title and close button'} when inContext is ${inContext}`, () => {
- renderComponent(inContext);
-
- expect(screen.queryByTestId('feedback').childElementCount).toEqual(1);
- expect(screen.queryByRole('button', { name: 'Add a post' })).toBeInTheDocument();
-
- if (inContext) {
- expect(screen.queryByPlaceholderText(messages.searchAllPosts.defaultMessage)).not.toBeInTheDocument();
- expect(screen.queryByText(messages.title.defaultMessage)).toBeInTheDocument();
- expect(screen.queryByRole('button', { name: 'Close' })).toBeInTheDocument();
- } else {
- expect(screen.queryByPlaceholderText(messages.searchAllPosts.defaultMessage)).toBeInTheDocument();
- expect(screen.queryByText(messages.title.defaultMessage)).not.toBeInTheDocument();
- expect(screen.queryByRole('button', { name: 'Close' })).not.toBeInTheDocument();
- }
- });
-});
diff --git a/src/index.jsx b/src/index.jsx
index 4a40955a..e5469974 100755
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -42,7 +42,6 @@ initialize({
config() {
mergeConfig({
POST_MARK_AS_READ_DELAY: process.env.POST_MARK_AS_READ_DELAY || 2000,
- FEEDER_PROJECT_ID: process.env.FEEDER_PROJECT_ID || '',
});
},
},