📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
added ability to reset project
Blue Moused0cfa4c844f8
diff --git a/public/locales/en.json b/public/locales/en.jsonindex 9933dea30..86979ed04 100644--- a/public/locales/en.json+++ b/public/locales/en.json@@ -477,8 +477,13 @@"publicHint": "By checking this, anyone on the internet (including Google) would be able to see this project's Dashboard.\nOnly project's administrator can edit the settings.","createHint": "*you will be able to set up your project more thoroughly after you have created it","delete": "Delete project",+ "reset": "Reset project","qDelete": "Delete the project?",+ "qReset": "Reset the project?","deleteHint": "By pressing 'Delete project' you understand, that this action is irreversible.\nThe project and all the data related to it will be deleted from our servers.",+ "resetHint": "By pressing 'Reset project' you understand, that this action is irreversible.\nThe project's pageviews and custom events will be removed from our servers, but the project identifier and other configuration will be retained.",+ "deleted": "The project has been deleted",+ "resetted": "The project has been resetted","noPeople": "No people have been added to this project yet.","removeMember": "Remove member","removeConfirm": "Are you sure you want to stop sharing your project with this user?",diff --git a/src/api/index.js b/src/api/index.jsindex 57de8c1c3..3f115bb03 100644--- a/src/api/index.js+++ b/src/api/index.js@@ -228,6 +228,17 @@ export const deleteProject = (id) =>: error.response.data.message})+export const resetProject = (id) =>+ api+ .delete(`/project/reset/${id}`)+ .then((response) => response.data)+ .catch((error) => {+ debug('%s', error)+ throw _isEmpty(error.response.data?.message)+ ? error.response.data+ : error.response.data.message+ })+export const getProjectData = (pid,tb = 'hour',diff --git a/src/pages/Project/Settings/ProjectSettings.container.jsx b/src/pages/Project/Settings/ProjectSettings.container.jsxindex f61a48b25..1cdfdf681 100644--- a/src/pages/Project/Settings/ProjectSettings.container.jsx+++ b/src/pages/Project/Settings/ProjectSettings.container.jsx@@ -24,8 +24,8 @@ const mapDispatchToProps = (dispatch) => ({newProject: (message) => {dispatch(alertsActions.newProject(message))},- projectDeleted: () => {- dispatch(alertsActions.projectDeleted('The project has been deleted'))+ projectDeleted: (message) => {+ dispatch(alertsActions.projectDeleted(message))},deleteProjectFailed: (message) => {dispatch(errorsActions.deleteProjectFailed(message))@@ -40,6 +40,9 @@ const mapDispatchToProps = (dispatch) => ({removeProject: (pid, shared) => {dispatch(UIActions.removeProject(pid, shared))},+ deleteProjectCache: (pid) => {+ dispatch(UIActions.deleteProjectCache(pid))+ },showError: (message) => {dispatch(errorsActions.genericError(message))},diff --git a/src/pages/Project/Settings/ProjectSettings.jsx b/src/pages/Project/Settings/ProjectSettings.jsxindex 008e1f5e6..f6b6a79b6 100644--- a/src/pages/Project/Settings/ProjectSettings.jsx+++ b/src/pages/Project/Settings/ProjectSettings.jsx@@ -16,12 +16,14 @@ import _keys from 'lodash/keys'import _map from 'lodash/map'import _includes from 'lodash/includes'import PropTypes from 'prop-types'-import { ExclamationIcon } from '@heroicons/react/outline'+import { ExclamationIcon, TrashIcon } from '@heroicons/react/outline'import Title from 'components/Title'import { withAuthentication, auth } from 'hoc/protected'import { isSelfhosted } from 'redux/constants'-import { createProject, updateProject, deleteProject } from 'api'+import {+ createProject, updateProject, deleteProject, resetProject,+} from 'api'import Input from 'ui/Input'import Button from 'ui/Button'import Checkbox from 'ui/Checkbox'@@ -39,6 +41,7 @@ const MAX_IPBLACKLIST_LENGTH = 300const ProjectSettings = ({updateProjectFailed, createNewProjectFailed, newProject, projectDeleted, deleteProjectFailed,loadProjects, isLoading, projects, showError, removeProject, user, isSharedProject, sharedProjects,+ deleteProjectCache,}) => {const { t } = useTranslation('common')const { pathname } = useLocation()@@ -56,7 +59,9 @@ const ProjectSettings = ({const [errors, setErrors] = useState({})const [beenSubmitted, setBeenSubmitted] = useState(false)const [showDelete, setShowDelete] = useState(false)+ const [showReset, setShowReset] = useState(false)const [projectDeleting, setProjectDeleting] = useState(false)+ const [projectResetting, setProjectResetting] = useState(false)const [projectSaving, setProjectSaving] = useState(false)useEffect(() => {@@ -127,7 +132,7 @@ const ProjectSettings = ({try {await deleteProject(id)removeProject(id, isSharedProject)- projectDeleted()+ projectDeleted(t('project.settings.deleted'))history.push(routes.dashboard)} catch (e) {deleteProjectFailed(e)@@ -137,6 +142,23 @@ const ProjectSettings = ({}}+ const onReset = async () => {+ setShowReset(false)+ if (!projectResetting) {+ setProjectResetting(true)+ try {+ await resetProject(id)+ deleteProjectCache(id)+ projectDeleted(t('project.settings.resetted'))+ history.push(routes.dashboard)+ } catch (e) {+ deleteProjectFailed(e)+ } finally {+ setProjectResetting(false)+ }+ }+ }+const validate = () => {const allErrors = {}@@ -281,10 +303,16 @@ const ProjectSettings = ({</Button></div>{!project.shared && (- <Button onClick={() => !projectDeleting && setShowDelete(true)} loading={projectDeleting} danger semiSmall>- <ExclamationIcon className='w-5 h-5 mr-1' />- {t('project.settings.delete')}- </Button>+ <div>+ <Button onClick={() => !projectResetting && setShowReset(true)} loading={projectDeleting} semiDanger semiSmall>+ <TrashIcon className='w-5 h-5 mr-1' />+ {t('project.settings.reset')}+ </Button>+ <Button className='ml-2' onClick={() => !projectDeleting && setShowDelete(true)} loading={projectDeleting} danger semiSmall>+ <ExclamationIcon className='w-5 h-5 mr-1' />+ {t('project.settings.delete')}+ </Button>+ </div>)}</div><hr className='mt-5' />@@ -322,6 +350,17 @@ const ProjectSettings = ({type='error'isOpened={showDelete}/>+ <Modal+ onClose={() => setShowReset(false)}+ onSubmit={onReset}+ submitText={t('project.settings.reset')}+ closeText={t('common.close')}+ title={t('project.settings.qReset')}+ message={t('project.settings.resetHint')}+ submitType='danger'+ type='error'+ isOpened={showReset}+ /></div></Title>)@@ -339,6 +378,7 @@ ProjectSettings.propTypes = {isLoading: PropTypes.bool.isRequired,user: PropTypes.object.isRequired,isSharedProject: PropTypes.bool.isRequired,+ deleteProjectCache: PropTypes.func.isRequired,}export default memo(withAuthentication(ProjectSettings, auth.authenticated))diff --git a/src/ui/Button.jsx b/src/ui/Button.jsxindex b4d067833..91720648c 100644--- a/src/ui/Button.jsx+++ b/src/ui/Button.jsx@@ -6,7 +6,7 @@ import PropTypes from 'prop-types'import Spin from './icons/Spin'const Button = ({- text, children, primary, secondary, danger, onClick, white, small, regular, large, giant, type, className, loading, semiSmall,+ text, children, primary, secondary, danger, onClick, white, small, regular, large, giant, type, className, loading, semiSmall, semiDanger,}) => (<buttontype={type}@@ -16,6 +16,7 @@ const Button = ({'text-indigo-700 bg-indigo-100 hover:bg-indigo-200 border-transparent': secondary,'text-gray-700 bg-white hover:bg-gray-50 border-transparent': white,'text-white bg-red-500 hover:bg-red-600 border-transparent': danger,+ 'text-red-500 hover:text-red-600 border-red-600 dark:text-red-300 dark:hover:text-red-400 dark:border-red-500 border-1': semiDanger,'px-2.5 py-1.5 text-xs': small,'px-2.5 py-1.5 text-sm': semiSmall,'px-4 py-2 text-sm': large,@@ -39,6 +40,7 @@ Button.propTypes = {secondary: PropTypes.bool,white: PropTypes.bool,danger: PropTypes.bool,+ semiDanger: PropTypes.bool,small: PropTypes.bool,semiSmall: PropTypes.bool,regular: PropTypes.bool,@@ -60,6 +62,7 @@ Button.defaultProps = {regular: false,large: false,danger: false,+ semiDanger: false,giant: false,loading: false,type: 'button',