Simulated Test Database (#984)

* Dynamic Organization Dashboard * Dynamic Organization Dashboard * Sample Org Implementation * removed unnecessary changes * removed unnecessary svgs * removed unnecessary import * added appropriate button style * fixed OrgListCard tests * Fixed OrgList and OrgListCard Tests * Removed Unnecessary 'container' Variable * Added Missing Translations and removed unused variable
PalisadoesFoundation · Nov 15, 2023 · 8519c15 · 8519c15
1 parent 98df95d
commit 8519c15
Show file tree

Hide file tree

Showing 15 changed files with 344 additions and 75 deletions.
diff --git a/public/locales/en.json b/public/locales/en.json
@@ -28,6 +28,16 @@
     "login_to_admin_portal": "Admin Portal Login",
     "OR": "OR"
   },
+  "latestEvents": {
+    "eventCardTitle": "Upcoming Events",
+    "eventCardSeeAll": "See All",
+    "noEvents": "No Upcoming Events"
+  },
+  "latestPosts": {
+    "latestPostsTitle": "Latest Posts",
+    "seeAllLink": "See All",
+    "noPostsCreated": "No Posts Created"
+  },
   "listNavbar": {
     "talawa_portal": "Talawa Admin Portal",
     "roles": "Roles",
@@ -75,6 +85,7 @@
     "searchByName": "Search By Name",
     "organizations": "Organizations",
     "createOrganization": "Create Organization",
+    "createSampleOrganization": "Create Sample Organization",
     "description": "Description",
     "location": "Location",
     "isPublic": "Is Public",
@@ -85,18 +96,22 @@
     "filter": "Filter",
     "cancel": "Cancel",
     "noOrgErrorTitle": "Organizations Not Found",
+    "sampleOrgDuplicate": "Only one sample organization allowed",
     "noOrgErrorDescription": "Please create an organization through dashboard",
     "endOfResults": "End of results",
     "manageFeatures": "Manage Features",
     "manageFeaturesInfo": "Creation Successful ! Please select features that you want to enale for this organization from the plugin store.",
     "goToStore": "Go to Plugin Store",
     "enableEverything": "Enable Everything",
-    "noResultsFoundFor": "No results found for "
+    "noResultsFoundFor": "No results found for",
+    "OR": "OR",
+    "sampleOrgSuccess": "Sample Organization Successfully Created"
   },
   "orgListCard": {
     "admins": "Admins",
     "members": "Members",
-    "manage": "Manage"
+    "manage": "Manage",
+    "sampleOrganization": "Sample Organization"
   },
   "paginationList": {
     "rowsPerPage": "rows per page",
@@ -404,6 +419,7 @@
   },
   "deleteOrg": {
     "deleteOrganization": "Delete Organization",
+    "deleteSampleOrganization": "Delete Sample Organization",
     "deleteMsg": "Do you want to delete this organization?",
     "cancel": "Cancel",
     "confirmDelete": "Confirm Delete",

diff --git a/public/locales/fr.json b/public/locales/fr.json
@@ -28,6 +28,11 @@
     "login_to_admin_portal": "Connexion à l'administration du portail",
     "OR": "OU"
   },
+  "latestEvents": {
+    "eventCardTitle": "Événements à venir",
+    "eventCardSeeAll": "Voir Tout",
+    "noEvents": "Aucun événement à venir"
+  },
   "listNavbar": {
     "talawa_portal": "Portail D'Administrateur Talawa",
     "roles": "Les rôles",
@@ -75,6 +80,7 @@
     "searchByName": "Rechercher par nom",
     "organizations": "Organisations",
     "createOrganization": "Créer une organisation",
+    "createSampleOrganization": "Créer une organisation d'exemple",
     "description": "La description",
     "location": "Emplacement",
     "isPublic": "Est publique",
@@ -86,14 +92,19 @@
     "cancel": "Annuler",
     "endOfResults": "Fin des résultats",
     "noOrgErrorTitle": "Organisations non trouvées",
+    "sampleOrgDuplicate": "Seule une organisation d'exemple est autorisée.",
     "noOrgErrorDescription": "Veuillez créer une organisation via le tableau de bord",
-    "noResultsFoundFor": "Aucun résultat trouvé pour "
+    "noResultsFoundFor": "Aucun résultat trouvé pour ",
+    "OR": "OU",
+    "sampleOrgSuccess": "Organisation d'exemple créée avec succès"
   },
   "orgListCard": {
     "admins": "Administrateurs",
     "members": "Membres",
-    "manage": "Faire en sorte"
+    "manage": "Faire en sorte",
+    "sampleOrganization": "Organisation d'exemple"
   },
+
   "paginationList": {
     "rowsPerPage": "lignes par page",
     "all": "Tout"
@@ -400,6 +411,7 @@
   },
   "deleteOrg": {
     "deleteOrganization": "Supprimer l'organisation",
+    "deleteSampleOrganization": "Supprimer l'organisation d'exemple",
     "deleteMsg": "Voulez-vous supprimer cette organisation ?",
     "cancel": "Annuler",
     "confirmDelete": "Confirmer la suppression",

diff --git a/public/locales/hi.json b/public/locales/hi.json
@@ -28,6 +28,11 @@
     "login_to_admin_portal": "एडमिन पोर्टल लॉगिन",
     "OR": "या"
   },
+  "latestEvents": {
+    "eventCardTitle": "आगामी घटनाएँ",
+    "eventCardSeeAll": "सभी देखें",
+    "noEvents": "कोई आगामी घटनाएँ नहीं"
+  },
   "listNavbar": {
     "talawa_portal": "तलावा प्रशासन पोर्टल",
     "roles": "भूमिकाएँ",
@@ -75,6 +80,7 @@
     "searchByName": "नाम से खोजें",
     "organizations": "संगठन",
     "createOrganization": "संगठन बनाएं",
+    "createSampleOrganization": " सैंपल संगठन बनाएं",
     "description": "विवरण",
     "location": "स्थान",
     "isPublic": "सार्वजनिक है",
@@ -86,13 +92,17 @@
     "cancel": "रद्द करना",
     "endOfResults": "परिणामों का अंत",
     "noOrgErrorTitle": "संगठन नहीं मिला",
+    "sampleOrgDuplicate": "केवल एक नमूना संगठन को अनुमति दी गई",
     "noOrgErrorDescription": "कृपया डैशबोर्ड के माध्यम से एक संगठन बनाएं",
-    "noResultsFoundFor": "के लिए कोई परिणाम नहीं मिला "
+    "noResultsFoundFor": "के लिए कोई परिणाम नहीं मिला ",
+    "OR": "या",
+    "sampleOrgSuccess": "सैंपल संगठन सफलतापूर्वक बनाया गया"
   },
   "orgListCard": {
     "admins": "व्यवस्थापक",
     "members": "सदस्य",
-    "manage": "प्रबंधित करना"
+    "manage": "प्रबंधित करना",
+    "sampleOrganization": "सैंपल संगठन"
   },
   "paginationList": {
     "rowsPerPage": "प्रति पृष्ठ पंक्तियाँ",
@@ -400,6 +410,7 @@
   },
   "deleteOrg": {
     "deleteOrganization": "संगठन हटाएं",
+    "deleteSampleOrganization": "सैंपल संगठन को हटाएं",
     "deleteMsg": "क्या आप इस संगठन को हटाना चाहते हैं?",
     "cancel": "रद्द करना",
     "confirmDelete": "हटाने की पुष्टि करें",

diff --git a/public/locales/sp.json b/public/locales/sp.json
@@ -28,6 +28,11 @@
     "login_to_admin_portal": "Inicio de sesión en el portal de administración",
     "OR": "O"
   },
+  "latestEvents": {
+    "eventCardTitle": "Próximos Eventos",
+    "eventCardSeeAll": "Ver Todos",
+    "noEvents": "No Hay Eventos Próximos"
+  },
   "listNavbar": {
     "talawa_portal": "Portal De Administración Talawa",
     "roles": "Roles",
@@ -75,6 +80,7 @@
     "searchByName": "Buscar por nombre",
     "organizations": "Organizaciones",
     "createOrganization": "Crear organización",
+    "createSampleOrganization": "Crear organización de muestra",
     "description": "Descripción",
     "location": "Ubicación",
     "isPublic": "Es público",
@@ -86,13 +92,17 @@
     "cancel": "Cancelar",
     "endOfResults": "Fin de los resultados",
     "noOrgErrorTitle": "Organizaciones no encontradas",
+    "sampleOrgDuplicate": "Solo se permite una organización de muestra",
     "noOrgErrorDescription": "Por favor, crea una organización a través del panel de control",
-    "noResultsFoundFor": "No se encontraron resultados para "
+    "noResultsFoundFor": "No se encontraron resultados para ",
+    "OR": "O",
+    "sampleOrgSuccess": "Organización de ejemplo creada exitosamente"
   },
   "orgListCard": {
     "admins": "Administradores",
     "members": "Miembros",
-    "manage": "Administrar"
+    "manage": "Administrar",
+    "sampleOrganization": "Organización de muestra"
   },
   "paginationList": {
     "rowsPerPage": "filas por página",
@@ -400,6 +410,7 @@
   },
   "deleteOrg": {
     "deleteOrganization": "Eliminar organización",
+    "deleteSampleOrganization": "Eliminar organización de muestra",
     "deleteMsg": "¿Desea eliminar esta organización?",
     "cancel": "Cancelar",
     "confirmDelete": "Confirmar eliminación",

diff --git a/public/locales/zh.json b/public/locales/zh.json
@@ -28,6 +28,11 @@
     "login_to_admin_portal": " 管理员门户登录 ",
     "OR": "或者"
   },
+  "latestEvents": {
+    "eventCardTitle": "即将举行的活动",
+    "eventCardSeeAll": "查看全部",
+    "noEvents": "暂无即将举行的活动"
+  },
   "listNavbar": {
     "talawa_portal": "塔拉瓦管理門戶",
     "roles": "角色",
@@ -75,6 +80,7 @@
     "searchByName": "按名稱搜索",
     "organizations": "组织",
     "createOrganization": "創建組織",
+    "createSampleOrganization": "创建示范组织",
     "description": "描述",
     "location": "地點",
     "isPublic": "是否公開",
@@ -86,13 +92,17 @@
     "cancel": "取消",
     "endOfResults": "結果結束",
     "noOrgErrorTitle": "找不到组织",
+    "sampleOrgDuplicate": "只允许一个样本组织",
     "noOrgErrorDescription": "请通过仪表板创建一个组织",
-    "noResultsFoundFor": "未找到结果 "
+    "noResultsFoundFor": "未找到结果 ",
+    "OR": "或者",
+    "sampleOrgSuccess": "示例组织成功创建"
   },
   "orgListCard": {
     "admins": "管理員",
     "members": "成員",
-    "manage": "管理"
+    "manage": "管理",
+    "sampleOrganization": "示例组织"
   },
   "paginationList": {
     "rowsPerPage": "每頁行數",
@@ -400,6 +410,7 @@
   },
   "deleteOrg": {
     "deleteOrganization": "删除组织",
+    "deleteSampleOrganization": "删除示范组织",
     "deleteMsg": "您是否要删除此组织？",
     "cancel": "取消",
     "confirmDelete": "确认删除",

diff --git a/src/GraphQl/Mutations/mutations.ts b/src/GraphQl/Mutations/mutations.ts
@@ -654,6 +654,18 @@ export const UPDATE_USER_ROLE_IN_ORG_MUTATION = gql`
   }
 `;
 
+export const CREATE_SAMPLE_ORGANIZATION_MUTATION = gql`
+  mutation {
+    createSampleOrganization
+  }
+`;
+
+export const REMOVE_SAMPLE_ORGANIZATION_MUTATION = gql`
+  mutation {
+    removeSampleOrganization
+  }
+`;
+
 export const CREATE_DIRECT_CHAT = gql`
   mutation createDirectChat($userIds: [ID!]!, $organizationId: ID!) {
     createDirectChat(

diff --git a/src/GraphQl/Queries/Queries.ts b/src/GraphQl/Queries/Queries.ts
@@ -825,3 +825,9 @@ export const DIRECT_CHATS_LIST = gql`
     }
   }
 `;
+
+export const IS_SAMPLE_ORGANIZATION_QUERY = gql`
+  query ($isSampleOrganizationId: ID!) {
+    isSampleOrganization(id: $isSampleOrganizationId)
+  }
+`;
diff --git a/src/assets/svgs/flask.svg b/src/assets/svgs/flask.svg
diff --git a/src/components/DeleteOrg/DeleteOrg.tsx b/src/components/DeleteOrg/DeleteOrg.tsx
@@ -1,9 +1,12 @@
-import { useMutation } from '@apollo/client';
-import { DELETE_ORGANIZATION_MUTATION } from 'GraphQl/Mutations/mutations';
 import React, { useState } from 'react';
 import { Button, Card, Modal } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
+import { useMutation, useQuery } from '@apollo/client';
 import { errorHandler } from 'utils/errorHandler';
+import { toast } from 'react-toastify';
+import { DELETE_ORGANIZATION_MUTATION } from 'GraphQl/Mutations/mutations';
+import { REMOVE_SAMPLE_ORGANIZATION_MUTATION } from 'GraphQl/Mutations/mutations';
+import { IS_SAMPLE_ORGANIZATION_QUERY } from 'GraphQl/Queries/Queries';
 import styles from './DeleteOrg.module.css';
 
 function deleteOrg(): JSX.Element {
@@ -14,22 +17,39 @@ function deleteOrg(): JSX.Element {
   const currentUrl = window.location.href.split('=')[1];
   const canDelete = localStorage.getItem('UserType') === 'SUPERADMIN';
   const toggleDeleteModal = (): void => setShowDeleteModal(!showDeleteModal);
+
   const [del] = useMutation(DELETE_ORGANIZATION_MUTATION);
+  const [removeSampleOrganization] = useMutation(
+    REMOVE_SAMPLE_ORGANIZATION_MUTATION
+  );
+
+  const { data } = useQuery(IS_SAMPLE_ORGANIZATION_QUERY, {
+    variables: {
+      isSampleOrganizationId: currentUrl,
+    },
+  });
 
   const deleteOrg = async (): Promise<void> => {
-    try {
-      const { data } = await del({
-        variables: {
-          id: currentUrl,
-        },
-      });
-      /* istanbul ignore next */
-      if (data) {
+    if (data && data.isSampleOrganization) {
+      removeSampleOrganization()
+        .then(() => {
+          toast.success('Successfully deleted sample Organization');
+        })
+        .catch((error) => {
+          toast.error(error.message);
+        });
+      window.location.replace('/orglist');
+    } else {
+      try {
+        await del({
+          variables: {
+            id: currentUrl,
+          },
+        });
         window.location.replace('/orglist');
+      } catch (error: any) {
+        errorHandler(t, error);
       }
-    } catch (error: any) {
-      /* istanbul ignore next */
-      errorHandler(t, error);
     }
   };
 
@@ -48,7 +68,9 @@ function deleteOrg(): JSX.Element {
               onClick={toggleDeleteModal}
               data-testid="openDeleteModalBtn"
             >
-              {t('deleteOrganization')}
+              {data && data.isSampleOrganization
+                ? t('deleteSampleOrganization')
+                : t('deleteOrganization')}
             </Button>
           </Card.Body>
         </Card>

diff --git a/src/components/OrgListCard/OrgListCard.module.css b/src/components/OrgListCard/OrgListCard.module.css
@@ -77,3 +77,16 @@
     display: block;
   }
 }
+
+.flaskIcon {
+  position: absolute;
+  top: 0;
+  right: 0;
+  margin: 10px 20px 0px 0px;
+}
+
+.manageBtn {
+  display: flex;
+  justify-content: space-around;
+  width: 150px;
+}