Renamed Private Organisation to userRegistrationRequired (PalisadoesF…

…oundation#1384) * Rename isPublic to userRegistrationRequired * Convert Private Orgs to userRegistrationRequired Orgs * Fixes failed test
palisadoes · Jan 13, 2024 · 16de771 · 16de771
1 parent ef2ad96
commit 16de771
Show file tree

Hide file tree

Showing 21 changed files with 83 additions and 68 deletions.
diff --git a/public/locales/en.json b/public/locales/en.json
@@ -128,7 +128,7 @@
     "createSampleOrganization": "Create Sample Organization",
     "description": "Description",
     "location": "Location",
-    "isPublic": "Is Public",
+    "userRegistrationRequired": "User Registration Required",
     "visibleInSearch": "Visible In Search",
     "displayImage": "Display Image",
     "enterName": "Enter Name",
@@ -486,7 +486,7 @@
     "description": "Description",
     "location": "Location",
     "displayImage": "Display Image",
-    "isPublic": "Public",
+    "userRegistrationRequired": "User Registration Required",
     "isVisibleInSearch": "Visible in Search",
     "saveChanges": "Save Changes",
     "enterNameOrganization": "Enter Organization Name",

diff --git a/public/locales/fr.json b/public/locales/fr.json
@@ -127,7 +127,7 @@
     "createSampleOrganization": "Créer une organisation d'exemple",
     "description": "La description",
     "location": "Emplacement",
-    "isPublic": "Est publique",
+    "userRegistrationRequired": "enregistrement requis",
     "visibleInSearch": "Visible dans la recherche",
     "displayImage": "Afficher l'image",
     "enterName": "Entrez le nom",
@@ -484,7 +484,7 @@
     "description": "La description",
     "location": "emplacement",
     "displayImage": "Afficher l'image",
-    "isPublic": "Public",
+    "userRegistrationRequired": "enregistrement requis",
     "isVisibleInSearch": "Visible dans la recherche",
     "saveChanges": "Sauvegarder les modifications",
     "enterNameOrganization": "Entrez le nom de l'organisation",

diff --git a/public/locales/hi.json b/public/locales/hi.json
@@ -127,7 +127,7 @@
     "createSampleOrganization": " सैंपल संगठन बनाएं",
     "description": "विवरण",
     "location": "स्थान",
-    "isPublic": "सार्वजनिक है",
+    "userRegistrationRequired": "उपयोगकर्ता पंजीकरण आवश्यक",
     "visibleInSearch": "खोज में दृश्यमान",
     "displayImage": "प्रदर्शन छवि",
     "enterName": "नाम दर्ज करें",
@@ -483,7 +483,7 @@
     "description": "विवरण",
     "location": "जगह",
     "displayImage": "प्रदर्शन छवि",
-    "isPublic": "सार्वजनिक",
+    "userRegistrationRequired": "उपयोगकर्ता पंजीकरण आवश्यक",
     "isVisibleInSearch": "खोज में दिखाए जा सकते हैं",
     "saveChanges": "परिवर्तनों को सुरक्षित करें",
     "cancel": "रद्द करना",

diff --git a/public/locales/sp.json b/public/locales/sp.json
@@ -127,7 +127,7 @@
     "createSampleOrganization": "Crear organización de muestra",
     "description": "Descripción",
     "location": "Ubicación",
-    "isPublic": "Es público",
+    "userRegistrationRequired": "Registro de usuario requerido",
     "visibleInSearch": "Visible en la búsqueda",
     "displayImage": "Mostrar imagen",
     "enterName": "Ingrese su nombre",
@@ -483,7 +483,7 @@
     "description": "Descripción",
     "location": "ubicación",
     "displayImage": "Mostrar imagen",
-    "isPublic": "Público",
+    "userRegistrationRequired": "Registro de usuario requerido",
     "isVisibleInSearch": "Visible en la búsqueda",
     "saveChanges": "Guardar cambios",
     "cancel": "Cancelar",

diff --git a/public/locales/zh.json b/public/locales/zh.json
@@ -127,7 +127,7 @@
     "createSampleOrganization": "创建示范组织",
     "description": "描述",
     "location": "地點",
-    "isPublic": "是否公開",
+    "isPubluserRegistrationRequiredic": "需要用户注册",
     "visibleInSearch": "在搜索中可見",
     "displayImage": "顯示圖像",
     "enterName": "输入名字",
@@ -483,7 +483,7 @@
     "description": "描述",
     "location": "地點",
     "displayImage": "顯示圖像",
-    "isPublic": "公开",
+    "userRegistrationRequired": "需要用户注册",
     "isVisibleInSearch": "在搜索中可见",
     "saveChanges": "保存更改",
     "cancel": "取消",

diff --git a/schema.graphql b/schema.graphql
@@ -545,7 +545,7 @@ type Organization {
   creator: User!
   description: String!
   image: String
-  isPublic: Boolean!
+  userRegistrationRequired: Boolean!
   location: String
   members: [User]
   membershipRequests: [MembershipRequest]
@@ -566,7 +566,7 @@ type OrganizationInfoNode {
   creator: User!
   description: String!
   image: String
-  isPublic: Boolean!
+  userRegistrationRequired: Boolean!
   name: String!
   visibleInSearch: Boolean!
 }
@@ -576,7 +576,7 @@ input OrganizationInput {
   attendees: String
   description: String!
   image: String
-  isPublic: Boolean!
+  userRegistrationRequired: Boolean!
   location: String
   name: String!
   visibleInSearch: Boolean!
@@ -614,7 +614,7 @@ input OrganizationWhereInput {
   id_not: ID
   id_not_in: [ID!]
   id_starts_with: ID
-  isPublic: Boolean
+  userRegistrationRequired: Boolean
   name: String
   name_contains: String
   name_in: [String!]
@@ -949,7 +949,7 @@ input UpdateEventProjectInput {
 
 input UpdateOrganizationInput {
   description: String
-  isPublic: Boolean
+  userRegistrationRequired: Boolean
   location: String
   name: String
   visibleInSearch: Boolean

diff --git a/src/GraphQl/Mutations/mutations.ts b/src/GraphQl/Mutations/mutations.ts
@@ -50,7 +50,7 @@ export const UPDATE_ORGANIZATION_MUTATION = gql`
     $name: String
     $description: String
     $location: String
-    $isPublic: Boolean
+    $userRegistrationRequired: Boolean
     $visibleInSearch: Boolean
     $file: String
   ) {
@@ -59,7 +59,7 @@ export const UPDATE_ORGANIZATION_MUTATION = gql`
       data: {
         name: $name
         description: $description
-        isPublic: $isPublic
+        userRegistrationRequired: $userRegistrationRequired
         visibleInSearch: $visibleInSearch
         location: $location
       }
@@ -185,7 +185,7 @@ export const CREATE_ORGANIZATION_MUTATION = gql`
     $location: String!
     $name: String!
     $visibleInSearch: Boolean!
-    $isPublic: Boolean!
+    $userRegistrationRequired: Boolean!
     $image: String
   ) {
     createOrganization(
@@ -194,7 +194,7 @@ export const CREATE_ORGANIZATION_MUTATION = gql`
         location: $location
         name: $name
         visibleInSearch: $visibleInSearch
-        isPublic: $isPublic
+        userRegistrationRequired: $userRegistrationRequired
       }
       file: $image
     ) {

diff --git a/src/GraphQl/Queries/Queries.ts b/src/GraphQl/Queries/Queries.ts
@@ -271,7 +271,7 @@ export const ORGANIZATIONS_LIST = gql`
       name
       description
       location
-      isPublic
+      userRegistrationRequired
       visibleInSearch
       members {
         _id
@@ -646,7 +646,7 @@ export const USER_ORGANIZATION_CONNECTION = gql`
       name
       image
       description
-      isPublic
+      userRegistrationRequired
       creator {
         firstName
         lastName

diff --git a/src/components/Advertisements/Advertisements.test.tsx b/src/components/Advertisements/Advertisements.test.tsx
@@ -126,7 +126,7 @@ const ORGANIZATIONS_LIST_MOCK = {
           },
           name: 'name',
           description: 'description',
-          isPublic: true,
+          userRegistrationRequired: true,
 
           visibleInSearch: true,
           location: 'location',

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -89,7 +89,7 @@ const MOCKS = [
             name: 'Test Organization',
             description: 'Testing this organization',
             location: 'Gotham, DC',
-            isPublic: true,
+            userRegistrationRequired: true,
             visibleInSearch: true,
             members: [
               {
@@ -143,7 +143,7 @@ const MOCKS_WITH_IMAGE = [
             name: 'Test Organization',
             description: 'Testing this organization',
             location: 'Gotham, DC',
-            isPublic: true,
+            userRegistrationRequired: true,
             visibleInSearch: true,
             members: [
               {

diff --git a/src/components/OrgUpdate/OrgUpdate.test.tsx b/src/components/OrgUpdate/OrgUpdate.test.tsx
@@ -32,7 +32,7 @@ describe('Testing Organization Update', () => {
     description: 'This is a updated description',
     location: 'This is updated location',
     displayImage: new File(['hello'], 'hello.png', { type: 'image/png' }),
-    isPublic: false,
+    userRegistrationRequired: false,
     isVisible: true,
   };
 
@@ -54,21 +54,22 @@ describe('Testing Organization Update', () => {
     expect(screen.getByText('Description')).toBeInTheDocument();
     expect(screen.getByText('Location')).toBeInTheDocument();
     expect(screen.getByText('Display Image:')).toBeInTheDocument();
-    expect(screen.getByText('Public:')).toBeInTheDocument();
+    expect(screen.getByText(/Registration/)).toBeInTheDocument();
     expect(screen.getByText('Visible in Search:')).toBeInTheDocument();
 
     // Get the input fields, and btns
     const name = screen.getByPlaceholderText(/Enter Organization Name/i);
     const des = screen.getByPlaceholderText(/Description/i);
     const location = screen.getByPlaceholderText(/Location/i);
-    const isPublic = screen.getByPlaceholderText(/Public/i);
+    const userRegistrationRequired =
+      screen.getByPlaceholderText(/Registration/i);
     const isVisible = screen.getByPlaceholderText(/Visible/i);
 
     // Checking if form fields got updated according to the mock data
     expect(name).toHaveValue('Palisadoes');
     expect(des).toHaveValue('Equitable Access to STEM Education Jobs');
     expect(location).toHaveValue('Jamaica');
-    expect(isPublic).toBeChecked();
+    expect(userRegistrationRequired).toBeChecked();
     expect(isVisible).not.toBeChecked();
   });
 
@@ -90,7 +91,8 @@ describe('Testing Organization Update', () => {
     const des = screen.getByPlaceholderText(/Description/i);
     const location = screen.getByPlaceholderText(/Location/i);
     const displayImage = screen.getByPlaceholderText(/Display Image/i);
-    const isPublic = screen.getByPlaceholderText(/Public/i);
+    const userRegistrationRequired =
+      screen.getByPlaceholderText(/Registration/i);
     const isVisible = screen.getByPlaceholderText(/Visible/i);
     const saveChangesBtn = screen.getByText(/Save Changes/i);
 
@@ -104,7 +106,7 @@ describe('Testing Organization Update', () => {
     userEvent.type(des, formData.description);
     userEvent.type(location, formData.location);
     userEvent.upload(displayImage, formData.displayImage);
-    userEvent.click(isPublic);
+    userEvent.click(userRegistrationRequired);
     userEvent.click(isVisible);
 
     await wait();
@@ -115,7 +117,7 @@ describe('Testing Organization Update', () => {
     expect(des).toHaveValue(formData.description);
     expect(location).toHaveValue(formData.location);
     expect(displayImage).toBeTruthy();
-    expect(isPublic).not.toBeChecked();
+    expect(userRegistrationRequired).not.toBeChecked();
     expect(isVisible).toBeChecked();
   });
 
@@ -151,7 +153,8 @@ describe('Testing Organization Update', () => {
     const des = screen.getByPlaceholderText(/Description/i);
     const location = screen.getByPlaceholderText(/Location/i);
     const displayImage = screen.getByPlaceholderText(/Display Image/i);
-    const isPublic = screen.getByPlaceholderText(/Public/i);
+    const userRegistrationRequired =
+      screen.getByPlaceholderText(/Registration/i);
     const isVisible = screen.getByPlaceholderText(/Visible/i);
     const saveChangesBtn = screen.getByText(/Save Changes/i);
 
@@ -165,7 +168,7 @@ describe('Testing Organization Update', () => {
     userEvent.type(des, formData.description);
     userEvent.type(location, formData.location);
     userEvent.upload(displayImage, formData.displayImage);
-    userEvent.click(isPublic);
+    userEvent.click(userRegistrationRequired);
     userEvent.click(isVisible);
 
     await wait();

diff --git a/src/components/OrgUpdate/OrgUpdate.tsx b/src/components/OrgUpdate/OrgUpdate.tsx
@@ -34,7 +34,8 @@ function orgUpdate(props: InterfaceOrgUpdateProps): JSX.Element {
     orgImage: null,
   });
 
-  const [publicchecked, setPublicChecked] = React.useState(false);
+  const [userRegistrationRequiredChecked, setuserRegistrationRequiredChecked] =
+    React.useState(false);
   const [visiblechecked, setVisibleChecked] = React.useState(false);
 
   const [login] = useMutation(UPDATE_ORGANIZATION_MUTATION);
@@ -69,7 +70,9 @@ function orgUpdate(props: InterfaceOrgUpdateProps): JSX.Element {
         orgDescrip: data.organizations[0].description,
         location: data.organizations[0].location,
       });
-      setPublicChecked(data.organizations[0].isPublic);
+      setuserRegistrationRequiredChecked(
+        data.organizations[0].userRegistrationRequired
+      );
       setVisibleChecked(data.organizations[0].visibleInSearch);
     }
     return () => {
@@ -85,7 +88,7 @@ function orgUpdate(props: InterfaceOrgUpdateProps): JSX.Element {
           name: formState.orgName,
           description: formState.orgDescrip,
           location: formState.location,
-          isPublic: publicchecked,
+          userRegistrationRequired: userRegistrationRequiredChecked,
           visibleInSearch: visiblechecked,
           file: formState.orgImage,
         },
@@ -165,11 +168,17 @@ function orgUpdate(props: InterfaceOrgUpdateProps): JSX.Element {
           />
           <Row>
             <Col sm={6} className="d-flex mb-3">
-              <Form.Label className="me-3">{t('isPublic')}:</Form.Label>
+              <Form.Label className="me-3">
+                {t('userRegistrationRequired')}:
+              </Form.Label>
               <Form.Switch
-                placeholder={t('isPublic')}
-                checked={publicchecked}
-                onChange={(): void => setPublicChecked(!publicchecked)}
+                placeholder={t('userRegistrationRequired')}
+                checked={userRegistrationRequiredChecked}
+                onChange={(): void =>
+                  setuserRegistrationRequiredChecked(
+                    !userRegistrationRequiredChecked
+                  )
+                }
               />
             </Col>
             <Col sm={6} className="d-flex mb-3">

diff --git a/src/components/OrgUpdate/OrgUpdateMocks.ts b/src/components/OrgUpdate/OrgUpdateMocks.ts
@@ -16,7 +16,7 @@ export const MOCKS = [
             name: 'Palisadoes',
             description: 'Equitable Access to STEM Education Jobs',
             location: 'Jamaica',
-            isPublic: true,
+            userRegistrationRequired: true,
             visibleInSearch: false,
             creator: {
               firstName: 'John',
@@ -60,7 +60,7 @@ export const MOCKS = [
         description: 'This is an updated test organization',
         location: 'Updated location',
         image: new File(['hello'], 'hello.png', { type: 'image/png' }),
-        isPublic: true,
+        userRegistrationRequired: true,
         visibleInSearch: false,
       },
     },
@@ -71,7 +71,7 @@ export const MOCKS = [
           name: 'Updated Organization',
           description: 'This is an updated test organization',
           location: 'Updated location',
-          isPublic: true,
+          userRegistrationRequired: true,
           visibleInSearch: false,
         },
       },
@@ -104,7 +104,7 @@ export const MOCKS_ERROR_UPDATE_ORGLIST = [
             name: 'Palisadoes',
             description: 'Equitable Access to STEM Education Jobs',
             location: 'Jamaica',
-            isPublic: true,
+            userRegistrationRequired: true,
             visibleInSearch: false,
             creator: {
               firstName: 'John',
@@ -148,7 +148,7 @@ export const MOCKS_ERROR_UPDATE_ORGLIST = [
         description: 'This is an updated test organization',
         location: 'Updated location',
         image: new File(['hello'], 'hello.png', { type: 'image/png' }),
-        isPublic: true,
+        userRegistrationRequired: true,
         visibleInSearch: false,
       },
     },