Merge pull request #77 from City-of-Helsinki/release/1.1.0

tuomas777 · web-flow · commit 166bb01e52b4 · 2020-09-03T08:55:33.000+03:00
Release/1.1.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,16 @@
+# Change Log
+
+# 1.1.0
+
+- Hide export buttons
+- Prevent published occurrence editing
+- Enable event participants CHILD_AND_1_OR_2_GUARDIANS choice
+- Make text fields render line breaks
+
+# 1.0.1 - 1.0.3
+
+Configuration changes to enable authentication for production environment.
+
+# 1.0.0
+
+First public release
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kukkuu-admin",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "private": true,
   "dependencies": {
     "@sentry/browser": "^5.20.0",
diff --git a/src/api/generatedTypes/globalTypes.ts b/src/api/generatedTypes/globalTypes.ts
@@ -8,6 +8,7 @@
 //==============================================================
 
 export enum EventParticipantsPerInvite {
+  CHILD_AND_1_OR_2_GUARDIANS = "CHILD_AND_1_OR_2_GUARDIANS",
   CHILD_AND_GUARDIAN = "CHILD_AND_GUARDIAN",
   FAMILY = "FAMILY",
 }
diff --git a/src/common/components/dateTimeTextField/DateTimeTextField.tsx b/src/common/components/dateTimeTextField/DateTimeTextField.tsx
@@ -18,7 +18,7 @@ const BoundedTextField = (props: Props & TextFieldProps) => {
   const translate = useTranslate();
   const classes = useStyles();
 
-  const { label, variant, defaultValue } = props;
+  const { label, variant, defaultValue, disabled } = props;
   const {
     input: { name, onChange },
     meta: { touched, error },
@@ -37,6 +37,7 @@ const BoundedTextField = (props: Props & TextFieldProps) => {
       helperText={touched && translate(error)}
       required={isRequired}
       defaultValue={defaultValue}
+      disabled={disabled}
     />
   );
 };
@@ -83,6 +84,7 @@ const DateTimeTextInput = (props: any) => {
             defaultValue={defaultDate}
             required={props.required}
             variant={props.variant}
+            disabled={props.disabled}
           />
         </Grid>
         <Grid item md={6}>
@@ -93,6 +95,7 @@ const DateTimeTextInput = (props: any) => {
             defaultValue={defaultTime}
             required={props.required}
             variant={props.variant}
+            disabled={props.disabled}
           />
         </Grid>
       </Grid>
diff --git a/src/common/components/longTextField/LongTextField.tsx b/src/common/components/longTextField/LongTextField.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { TextField } from 'react-admin';
+import { makeStyles } from '@material-ui/core/styles';
+
+const useStyles = makeStyles({
+  longTextField: { whiteSpace: 'pre-wrap' },
+});
+
+const LongTextField = (props: any) => {
+  const classes = useStyles();
+  return <TextField className={classes.longTextField} {...props} />;
+};
+
+export default LongTextField;
diff --git a/src/common/translation/en.json b/src/common/translation/en.json
@@ -105,7 +105,10 @@
       "participantsPerInvite": {
         "choices": {
           "CHILD_AND_GUARDIAN": {
-            "label": "Child and guardian"
+            "label": "1 child + 1 adult"
+          },
+          "CHILD_AND_1_OR_2_GUARDIANS": {
+            "label": "1 child + 1–2 adults"
           },
           "FAMILY": {
             "label": "Family"
diff --git a/src/common/translation/fi.json b/src/common/translation/fi.json
@@ -65,7 +65,7 @@
     },
     "fields": {
       "capacityPerOccurrence": {
-        "helperText": "Montako ilmoittautumista tapahtumaesiintymään vastaanotetaan. Huomioithan että todellinen osallistujamäärä on kapasiteetti kerrottuna sillä montako henkilöä kutsua kohti tapahtumana voi osallistua.",
+        "helperText": "Montako ilmoittautumista tapahtumaesiintymään vastaanotetaan. Huomioithan että todellinen osallistujamäärä on kapasiteetti kerrottuna sillä montako henkilöä kutsua kohti tapahtumaan voi osallistua.",
         "label": "Esiintymän kapasiteetti"
       },
       "description": {
@@ -105,7 +105,10 @@
       "participantsPerInvite": {
         "choices": {
           "CHILD_AND_GUARDIAN": {
-            "label": "Lapsi ja huoltaja"
+            "label": "1 lapsi + 1 aikuinen"
+          },
+          "CHILD_AND_1_OR_2_GUARDIANS": {
+            "label": "1 lapsi + 1–2 aikuista"
           },
           "FAMILY": {
             "label": "Perhe"
diff --git a/src/domain/authentication/CHANGELOG.md b/src/domain/authentication/CHANGELOG.md
diff --git a/src/domain/children/ChildList.tsx b/src/domain/children/ChildList.tsx
@@ -25,6 +25,7 @@ const ChildList = (props: any) => {
       <CardHeader title={translate('children.list.title')} />
       <KukkuuList
         bulkActionButtons={false}
+        exporter={false}
         {...props}
         pagination={<Pagination rowsPerPageOptions={[20, 100]} />}
         perPage={20}
diff --git a/src/domain/events/choices.ts b/src/domain/events/choices.ts
@@ -4,6 +4,11 @@ export const participantsPerInviteChoices = [
     name:
       'events.fields.participantsPerInvite.choices.CHILD_AND_GUARDIAN.label',
   },
+  {
+    id: 'CHILD_AND_1_OR_2_GUARDIANS',
+    name:
+      'events.fields.participantsPerInvite.choices.CHILD_AND_1_OR_2_GUARDIANS.label',
+  },
   {
     id: 'FAMILY',
     name: 'events.fields.participantsPerInvite.choices.FAMILY.label',
diff --git a/src/domain/events/detail/EventShow.tsx b/src/domain/events/detail/EventShow.tsx
@@ -35,6 +35,7 @@ import { AdminEvent } from '../types/EventTypes';
 import ViewTitle from '../../../common/components/viewTitle/ViewTitle';
 import KukkuuShow from '../../../common/components/kukkuuShow/KukkuuShow';
 import { PublishedField } from '../fields';
+import LongTextField from '../../../common/components/longTextField/LongTextField';
 
 const styles = createStyles({
   button: {
@@ -153,12 +154,12 @@ const EventShow: FunctionComponent = (props: any) => {
             label={'events.fields.name.label'}
           />
 
-          <TextField
+          <LongTextField
             source={`translations.${language}.shortDescription`}
             label={'events.fields.shortDescription.label'}
           />
 
-          <TextField
+          <LongTextField
             source={`translations.${language}.description`}
             label={'events.fields.description.label'}
           />
diff --git a/src/domain/events/list/EventList.tsx b/src/domain/events/list/EventList.tsx
@@ -23,7 +23,12 @@ const EventList = (props: any) => {
   return (
     <>
       <CardHeader title={translate('events.list.title')} />
-      <KukkuuList bulkActionButtons={false} pagination={false} {...props}>
+      <KukkuuList
+        bulkActionButtons={false}
+        pagination={false}
+        exporter={false}
+        {...props}
+      >
         <Datagrid rowClick="show">
           <TextField
             source={getTranslatedField('name', locale)}
diff --git a/src/domain/occurrences/OccurrenceEdit.tsx b/src/domain/occurrences/OccurrenceEdit.tsx
@@ -33,6 +33,22 @@ const OccurrenceEditToolbar = (props: any) => {
   );
 };
 
+const OccurrenceEditDateTimeTextInput = (props: any) => (
+  <DateTimeTextInput
+    {...props}
+    disabled={Boolean(props.record.event.publishedAt)}
+  />
+);
+
+const OccurrenceEditReferenceInput = (props: any) => {
+  return (
+    <ReferenceInput
+      {...props}
+      disabled={Boolean(props.record.event.publishedAt)}
+    />
+  );
+};
+
 const OccurrenceEdit = (props: any) => {
   const { event_id: eventId } = parse(props.location.search);
   const redirect = eventId ? `/events/${eventId}/show/1` : 'show';
@@ -48,8 +64,8 @@ const OccurrenceEdit = (props: any) => {
           redirect={redirect}
           toolbar={<OccurrenceEditToolbar redirect={redirect} />}
         >
-          <DateTimeTextInput required={true} source="time" />
-          <ReferenceInput
+          <OccurrenceEditDateTimeTextInput required={true} source="time" />
+          <OccurrenceEditReferenceInput
             label="occurrences.fields.venue.label"
             source="venue.id"
             reference="venues"
@@ -60,7 +76,7 @@ const OccurrenceEdit = (props: any) => {
               optionText="translations.FI.name"
               helperText="occurrences.fields.venue.helperText"
             />
-          </ReferenceInput>
+          </OccurrenceEditReferenceInput>
         </SimpleForm>
       </KukkuuEdit>
     </Grid>
diff --git a/src/domain/occurrences/api/OccurrenceApi.ts b/src/domain/occurrences/api/OccurrenceApi.ts
@@ -64,20 +64,12 @@ const addOccurrence: MethodHandler = async (params: MethodHandlerParams) => {
 
 const updateOccurrence: MethodHandler = async (params: MethodHandlerParams) => {
   const { ...localUpdateData } = params.data;
-  const {
-    id,
-    timeField,
-    date,
-    venue,
-    occurrenceLanguage,
-    event,
-  } = localUpdateData;
+  const { id, timeField, date, venue, event } = localUpdateData;
 
   const data = {
     id,
     venueId: venue.id,
     time: normalizeTime(date, timeField),
-    occurrenceLanguage,
     eventId: event.id,
   };
 
diff --git a/src/domain/venues/VenueList.tsx b/src/domain/venues/VenueList.tsx
@@ -16,6 +16,7 @@ const VenueList = (props: any) => {
       <KukkuuList
         bulkActionButtons={false}
         pagination={false}
+        exporter={false}
         aside={<Aside content="venues.list.aside.content" />}
         {...props}
       >
diff --git a/src/domain/venues/VenueShow.tsx b/src/domain/venues/VenueShow.tsx
@@ -5,6 +5,7 @@ import { CardHeader } from '@material-ui/core';
 import LanguageTabs from '../../common/components/languageTab/LanguageTabs';
 import { Language } from '../../api/generatedTypes/globalTypes';
 import KukkuuShow from '../../common/components/kukkuuShow/KukkuuShow';
+import LongTextField from '../../common/components/longTextField/LongTextField';
 
 const VenueTitle = ({
   basePath,
@@ -33,27 +34,27 @@ const VenueShow = (props: any) => {
           source={`${translation}.name`}
           label={translate('venues.fields.name.label')}
         />
-        <TextField
+        <LongTextField
           source={`${translation}.address`}
           label={translate('venues.fields.address.label')}
         />
-        <TextField
+        <LongTextField
           source={`${translation}.description`}
           label={translate('venues.fields.description.label')}
         />
-        <TextField
+        <LongTextField
           source={`${translation}.accessibilityInfo`}
           label={translate('venues.fields.accessibilityInfo.label')}
         />
-        <TextField
+        <LongTextField
           source={`${translation}.arrivalInstructions`}
           label={translate('venues.fields.arrivalInstructions.label')}
         />
-        <TextField
+        <LongTextField
           source={`${translation}.additionalInfo`}
           label={translate('venues.fields.additionalInfo.label')}
         />
-        <TextField
+        <LongTextField
           source={`${translation}.wcAndFacilities`}
           label={translate('venues.fields.wcAndFacilities.label')}
         />

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "kukkuu-admin",`
`3`		`- "version": "1.0.3",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@sentry/browser": "^5.20.0",`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`//==============================================================`
`9`	`9`
`10`	`10`	`export enum EventParticipantsPerInvite {`
	`11`	`+ CHILD_AND_1_OR_2_GUARDIANS = "CHILD_AND_1_OR_2_GUARDIANS",`
`11`	`12`	`CHILD_AND_GUARDIAN = "CHILD_AND_GUARDIAN",`
`12`	`13`	`FAMILY = "FAMILY",`
`13`	`14`	`}`