CORE-2017: multi-year and future subscriptions

.github/workflows/skaffold-build.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   call-workflow-passing-data:
-    uses: cyverse-de/github-workflows/.github/workflows/skaffold-build.yml@v0.0.7
+    uses: cyverse-de/github-workflows/.github/workflows/skaffold-build.yml@v0.1.9
     with:
       build-prerelease: ${{ contains(github.ref_name, '-rc') }}
     secrets:

public/static/locales/en/subscriptions.json

@@ -52,11 +52,12 @@
     "save": "Save",
     "searchUsers": "Search Users",
     "selectedUser": "Selected User",
-    "subAddonsUpdated": "Add-ons successfully updated.",
     "startDate": "Start Date",
+    "subAddonsUpdated": "Add-ons successfully updated.",
     "submit": "Submit",
     "subscriptionAddonError": "Failed to submit add-on request.",
     "subscriptionDetailsTabLabel": "Subscription Details",
+    "subscriptionPeriods": "Subscription Periods",
     "subscriptionUpdated": "Subscription successfully updated.",
     "true": "True",
     "updateSubAddonError": "Failed to update subscription add-ons.",

src/components/subscriptions/edit/EditSubscription.js

@@ -4,12 +4,13 @@ import { FastField, Field, Form, Formik } from "formik";
 import { mapPropsToValues, formatSubscriptions } from "./formatters";
 
 import DEDialog from "components/utils/DEDialog";
-import { Button, MenuItem } from "@mui/material";
+import { Button, Grid, MenuItem } from "@mui/material";
 
 import FormCheckbox from "components/forms/FormCheckbox";
+import FormNumberField from "components/forms/FormNumberField";
 import FormTextField from "components/forms/FormTextField";
 import { announce } from "components/announcer/CyVerseAnnouncer";
-import { nonEmptyField } from "components/utils/validations";
+import { minValue, nonEmptyField } from "components/utils/validations";
 
 import ErrorTypographyWithDialog from "components/error/ErrorTypographyWithDialog";
 import SubscriptionErrorHandler from "../error/SubscriptionErrorHandler";
@@ -25,6 +26,7 @@ import { useTranslation } from "i18n";
 import ids from "../ids";
 import Usages from "./Usages";
 import { SUBSCRIPTIONS_QUERY_KEY } from "serviceFacades/subscriptions";
+import FormTimestampField from "components/forms/FormTimestampField";
 
 function EditSubscriptionDialog(props) {
     const { open, onClose, parentId, subscription } = props;
@@ -228,6 +230,34 @@ function EditSubscriptionForm(props) {
                 ))}
             </FastField>
 
+            <Field
+                component={FormNumberField}
+                id={buildID(parentId, ids.EDIT_SUB_DLG.PERIODS)}
+                label={t("subscriptionPeriods")}
+                name="periods"
+                validate={(value) => minValue(value, i18nUtil)}
+            />
+
+            <Grid container spacing={1}>
+                <Grid item>
+                    <Field
+                        name="start_date"
+                        component={FormTimestampField}
+                        helperText={t("startDate")}
+                        id={buildID(parentId, ids.EDIT_SUB_DLG.START_DATE)}
+                    />
+                </Grid>
+
+                <Grid item>
+                    <Field
+                        name="end_date"
+                        component={FormTimestampField}
+                        helperText={t("endDate")}
+                        id={buildID(parentId, ids.EDIT_SUB_DLG.END_DATE)}
+                    />
+                </Grid>
+            </Grid>
+
             <Field
                 name="paid"
                 label={t("paid")}

src/components/subscriptions/edit/formatters.js

@@ -1,4 +1,7 @@
+import dateConstants from "components/utils/dateConstants";
+
 import { bytesInGiB, bytesToGiB } from "../utils";
+import { formatDateObject } from "components/utils/DateFormatter";
 
 export function mapPropsToValues(subscription) {
     let values = {
@@ -31,13 +34,21 @@ export function mapPropsToValues(subscription) {
 }
 
 export function formatSubscriptions(values) {
-    const { username, paid, plan_name } = values;
+    const { username, paid, periods, plan_name, start_date, end_date } = values;
 
     const submission = {
         username,
         plan_name,
         paid,
+        periods,
+        start_date: start_date
+            ? formatDateObject(new Date(start_date), dateConstants.ISO_8601)
+            : undefined,
+        end_date: end_date
+            ? formatDateObject(new Date(end_date), dateConstants.ISO_8601)
+            : undefined,
     };
+    console.log(submission);
     return submission;
 }
 

src/components/subscriptions/ids.js

@@ -60,11 +60,14 @@ const ids = {
     },
 
     EDIT_SUB_DLG: {
+        END_DATE: "endDate",
         PAID: "paid",
+        PERIODS: "subscriptionPeriods",
         PLAN_NAME: "planName",
         PLAN_TYPES: "planTypes",
         QUOTAS: "quotas",
         QUOTAS_RESOURCE_TYPE: "quotasResourceType",
+        START_DATE: "startDate",
         USAGES: "usages",
         USAGES_RESOURCE_TYPE: "usagesResourceType",
         USERNAME: "username",