diff --git a/src/router/index.js b/src/router/index.js
index 12f2513f701c4814261c1c743918cdef853ed7cd..ec715d966093d22c635dc5211cc3524686bdbaa6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -242,10 +242,8 @@ const routes = [
const router = new VueRouter({
base: process.env.BASE_URL,
routes,
- scrollBehavior(to, from, savedPosition) {
- if (savedPosition) {
- return savedPosition;
- }
+ scrollBehavior(to) {
+ //removed 'savedPosition' as it was a little buggy
if (to.hash) {
return {
selector: to.hash,
diff --git a/src/views/IronBank.vue b/src/views/IronBank.vue
index cbd9780cd1558c306cb96852bc84aca5b8d7b0f7..b2e635bba6881f41e9bf81565c2820f2afd9a2c7 100644
--- a/src/views/IronBank.vue
+++ b/src/views/IronBank.vue
@@ -336,8 +336,7 @@
<v-btn
class="my-3 mx-10"
color="primary"
- href="https://docs.google.com/forms/d/e/1FAIpQLScU88kFi9EPKyyCRFtpqZL1PV1H2Ek85hU6J1zqBkppvfFNlQ/viewform?usp=sf_link"
- target="_blank"
+ href="/#/products/iron-bank/getting-started"
>
Iron Bank Onboarding Request
</v-btn>
diff --git a/src/views/IronBankGettingStarted.vue b/src/views/IronBankGettingStarted.vue
index bd6da7d6b589c4ea416db49379cc17fe4d618671..9de945ddb6a3f51a8ce4d183578f755815dee44a 100644
--- a/src/views/IronBankGettingStarted.vue
+++ b/src/views/IronBankGettingStarted.vue
@@ -133,65 +133,65 @@
<TextField
label="Name of Company (Vendor) or Program Office"
:required="true"
- ref="2045908594"
+ ref="entry.2045908594"
/>
<TextField
label="Primary Point of Contact (POC) Name"
:required="true"
- ref="1435868757"
+ ref="entry.1435868757"
/>
<TextField
label="Primary POC Email"
:required="true"
- ref="817871758"
+ ref="entry.817871758"
/>
<TextField
label="Primary POC Phone Number"
:required="true"
- ref="782795051"
+ ref="entry.782795051"
/>
<!-- <TextField label="Containers to Be Added" :required="true" ref="" /> -->
<RadioGroup
label="Do you have a government sponsor? (or are you the government sponsor?)"
:required="true"
:options="['Yes', 'No']"
- ref="902682645"
+ ref="entry.902682645"
/>
<TextField
label="Government Sponsor Name"
description="Enter N/A if you don’t have one"
:required="true"
- ref="984741465"
+ ref="entry.984741465"
/>
<TextField
label="Government Sponsor Email"
description="Enter N/A if you don’t have one"
:required="true"
- ref="1561024111"
+ ref="entry.1561024111"
/>
<TextField
label="Government Sponsor Phone Number"
description="Enter N/A if you don’t have one"
:required="true"
- ref="410112333"
+ ref="entry.410112333"
/>
<RadioGroup
label="Are you are a Program Officer or Vendor?"
:required="true"
:options="['Program Officer', 'Vendor']"
- ref="1662461324"
+ ref="entry.1662461324"
/>
<TextField
label="What deadlines are you working with?"
description="Please provide dates that you need to have the containers ready by, when you need the container deployed by, or any other relevant program dates. Please let us know of any internal deadlines and/or government program deadlines."
:required="true"
- ref="20509530"
+ ref="entry.20509530"
/>
<DateField
label="What is your deployment timeframe?"
description="When do you need this deployed by?"
:required="true"
- ref="133302117"
+ ref="entry.133302117"
/>
<CheckboxGroup
label="What enviornments are you deploying to?"
@@ -203,7 +203,7 @@
{ label: 'IL-5', checked: false },
{ label: '> IL-5', checked: false },
]"
- ref="1089091150"
+ ref="entry.1089091150"
/>
</v-form>
<div class="text-left pb-6">
@@ -234,40 +234,40 @@
label="1.) Are your containers accessible from a public registry, private registry, or both?"
:required="true"
:options="['Public Registry', 'Private Registry', 'Both']"
- ref="728879173"
+ ref="entry.728879173"
/>
<RadioGroup
label="2.) If your containers are located in a private registry, are you willing to give Platform One's Iron Bank Team access so they can perform a preliminary assessment?"
:required="true"
:options="['Yes', 'No']"
- ref="1781929018"
+ ref="entry.1781929018"
/>
<RadioGroup
label="3.) If asked, would you be willing to perform a SAST scan of your product's source code and provide that to Platform One?"
:required="true"
:options="['Yes', 'No']"
- ref="169492193"
+ ref="entry.169492193"
/>
<RadioGroup
label="4.) Are you okay with your containers being publicly available?"
description="A yes is required to proceed with onboarding into Iron Bank. If no, then the Iron Bank, may not be a good fit due to our current requirements and structure. The containers are going to be published on an IL2 (publicly available) environment. With a yes, you are affirming there is no classified component to your application."
:required="true"
:options="['Yes', 'No']"
- ref="1035596507"
+ ref="entry.1035596507"
/>
<RadioGroup
label="5.) If your application requires a license, do your containers implement a license model to prevent unauthorized usage?"
description="Iron Bank does not currently support any licensing architecture. A vendor will need to implement their own licensing model."
:required="true"
:options="['Yes', 'No']"
- ref="981659030"
+ ref="entry.981659030"
/>
<RadioGroup
label="6.) Are you okay if your security findings are public?"
description="A yes is required to proceed with onboarding into Iron Bank. If no, then the Iron Bank, may not be a good fit due to our current requirements and structure."
:required="true"
:options="['Yes', 'No']"
- ref="578509495"
+ ref="entry.578509495"
/>
<CheckboxGroup
label="7.) Do you agree to the following?"
@@ -295,7 +295,7 @@
checked: false,
},
]"
- ref="1392727240"
+ ref="entry.1392727240"
/>
</v-form>
<div class="text-left pb-6">
@@ -337,27 +337,27 @@
label="8.) Is your application currently containerized?"
:required="true"
:options="['Yes', 'No']"
- ref="2078950956"
+ ref="entry.2078950956"
/>
<RadioGroup
label="9.) Does it run on Linux containers?"
description="For your information we only have support for Linux containers in the Iron Bank pipeline. If the answer is currently a no, you will need to shift your architecture to run on Linux containers in order to pass Iron Bank pipelines."
:required="true"
:options="['Yes', 'No']"
- ref="1588573313"
+ ref="entry.1588573313"
/>
<RadioGroup
label="10.) Can your application build and run in a completely offline/air-gapped environment?"
description="If not, it will need to in order to pass Iron Bank pipelines."
:required="true"
:options="['Yes', 'No']"
- ref="848891346"
+ ref="entry.848891346"
/>
<RadioGroup
label='11.) Can your application include things such as a "yum update" command to ensure ALL the latest updates are applied?'
:required="true"
:options="['Yes', 'No']"
- ref="1116274430"
+ ref="entry.1116274430"
/>
<DropdownField
label="12.) How many Containers are involved?"
@@ -375,34 +375,34 @@
'10',
'10+',
]"
- ref="91622704"
+ ref="entry.91622704"
/>
<TextField
label="13.) What containers need to be added?"
description="If not, it will need to in order to pass Iron Bank pipelines."
:required="true"
- ref="1054914449"
+ ref="entry.1054914449"
/>
<TextField
label="14.) What deployment method is used for your application? Helm, manifests, operator?"
:required="true"
- ref="1988147930"
+ ref="entry.1988147930"
/>
<RadioGroup
label="15.) Are the open-source or init containers already approved on Iron Bank or will you be hardening those as well?"
:required="true"
:options="['Yes', 'No']"
- ref="498262167"
+ ref="entry.498262167"
/>
<TextField
label="16.) List all dependencies of your application requires in order to deploy. Be sure to include any 3rd Party dependencies such as COTs/FOSS, open-source database or init containers?"
:required="true"
- ref="1338964727"
+ ref="entry.1338964727"
/>
<TextField
label="17.) Are there any end of life dependencies your application requires such as MySQL 5.6?"
:required="true"
- ref="1434404600"
+ ref="entry.1434404600"
/>
<RadioGroup
@@ -410,41 +410,41 @@
description="We only have support for Kubernetes containers right now."
:required="true"
:options="['Yes', 'No']"
- ref="304258803"
+ ref="entry.304258803"
/>
<RadioGroup
label="19.) Do the containers currently support chart installation using helm install and helm upgrade?"
:required="true"
:options="['Yes', 'No']"
- ref="1283355477"
+ ref="entry.1283355477"
/>
<RadioGroup
label="20.) Do your Dockerfiles currently include cleanup commands such as 'dnf clean all' and 'rm -rf /var/cache/dnf'?"
:required="true"
:options="['Yes', 'No']"
- ref="1829995196"
+ ref="entry.1829995196"
/>
<TextField
label="21.) Do any of your containers require 'root' user to start? If so, which ones and why?"
:required="true"
- ref="1142734293"
+ ref="entry.1142734293"
/>
<RadioGroup
label="22.) Do any files within your containers include special permissions such as SUID or SGID?"
:required="true"
:options="['Yes', 'No']"
- ref="1842097486"
+ ref="entry.1842097486"
/>
<TextField
- label="23.) Do any of your containers require 'root' user to start? If so, which ones and why?"
+ label="23.) Do you currently use any vulnerability scanners to scan your container images? If so, which ones?"
:required="true"
- ref="2031073810"
+ ref="entry.2031073810"
/>
<RadioGroup
label="24.) Are there any import/export controls regarding your application?"
:required="true"
:options="['Yes', 'No']"
- ref="796192360"
+ ref="entry.796192360"
/>
</v-form>
<div class="text-left pb-6">
@@ -620,7 +620,7 @@
</div>
</Wave>
- <v-dialog v-model="requiredFieldsModal" width="500">
+ <v-dialog v-model="errorModal" width="500">
<v-card>
<v-card-title> </v-card-title>
<v-card-text class="mt-8 mb-4">
@@ -633,7 +633,7 @@
<v-card-actions>
<v-spacer></v-spacer>
- <v-btn color="primary" @click="requiredFieldsModal = false">
+ <v-btn color="primary" @click="errorModal = false">
Close
</v-btn>
</v-card-actions>
@@ -664,8 +664,10 @@ export default {
},
data: function() {
return {
+ initialScrollSet: false,
ibLogo: IBLogo,
- requiredFieldsModal: false,
+ errorModal: false,
+ errorModalMessage: "One or more required fields exist.",
formSectionOneValid: true,
formSectionTwoValid: true,
formSectionThreeValid: true,
@@ -681,50 +683,47 @@ export default {
formData: {},
formPartsIds: {
sectionOne: [
- "2045908594",
- "1435868757",
- "817871758",
- "782795051",
- "902682645",
- "1561024111",
- "410112333",
- "1662461324",
- "20509530",
- "133302117",
- "1089091150",
+ "entry.2045908594",
+ "entry.1435868757",
+ "entry.817871758",
+ "entry.782795051",
+ "entry.902682645",
+ "entry.984741465",
+ "entry.1561024111",
+ "entry.410112333",
+ "entry.1662461324",
+ "entry.20509530",
+ "entry.133302117",
+ "entry.1089091150",
],
sectionTwo: [
- "2045908594",
- "1435868757",
- "817871758",
- "782795051",
- "902682645",
- "1561024111",
- "410112333",
- "1662461324",
- "20509530",
- "133302117",
- "1089091150",
+ "entry.728879173",
+ "entry.1781929018",
+ "entry.169492193",
+ "entry.1035596507",
+ "entry.981659030",
+ "entry.578509495",
+ "entry.1392727240",
],
sectionThree: [
- "2078950956",
- "1588573313",
- "848891346",
- "1116274430",
- "981659030",
- "91622704",
- "1054914449",
- "1988147930",
- "498262167",
- "1338964727",
- "1434404600",
- "304258803",
- "1283355477",
- "1829995196",
- "1142734293",
- "1842097486",
- "2031073810",
- "796192360",
+ "entry.2078950956",
+ "entry.1588573313",
+ "entry.848891346",
+ "entry.1116274430",
+ "entry.981659030",
+ "entry.91622704",
+ "entry.1054914449",
+ "entry.1988147930",
+ "entry.498262167",
+ "entry.1338964727",
+ "entry.1434404600",
+ "entry.304258803",
+ "entry.1283355477",
+ "entry.1829995196",
+ "entry.1142734293",
+ "entry.1842097486",
+ "entry.2031073810",
+ "entry.796192360",
],
sectionFour: [
"entry.874311254",
@@ -735,6 +734,10 @@ export default {
};
},
methods: {
+ displayRequiredFieldsModal() {
+ this.errorModal = true;
+ this.errorModalMessage = "One or more required fields exist.";
+ },
selectTab(tab) {
document.getElementById("form-stepper-section").scrollIntoView();
this.currentTab = tab;
@@ -747,7 +750,7 @@ export default {
if (!validationItems.includes(true)) {
this.selectTab("tab-2");
} else {
- this.requiredFieldsModal = true;
+ this.displayRequiredFieldsModal();
}
},
checkSectionTwo() {
@@ -758,7 +761,7 @@ export default {
if (!validationItems.includes(true)) {
this.selectTab("tab-3");
} else {
- this.requiredFieldsModal = true;
+ this.displayRequiredFieldsModal();
}
},
checkSectionThree() {
@@ -769,7 +772,7 @@ export default {
if (!validationItems.includes(true)) {
this.selectTab("tab-4");
} else {
- this.requiredFieldsModal = true;
+ this.displayRequiredFieldsModal();
}
},
checkSectionFour() {
@@ -782,21 +785,9 @@ export default {
this.submitForm();
this.selectTab("tab-5");
} else {
- this.requiredFieldsModal = true;
+ this.displayRequiredFieldsModal();
}
},
- createDraftResponseSection(section) {
- let sectionData = [];
- section.forEach((id) => {
- const data = this.$refs[id].getData();
- if (Array.isArray(data)) {
- sectionData.push([null, id, data, 0]);
- } else {
- sectionData.push([null, id, [data], 0]);
- }
- });
- return sectionData;
- },
createEntryData(section) {
const sectionData = {};
section.forEach((id) => {
@@ -812,34 +803,30 @@ export default {
sectionThree,
sectionFour,
} = this.formPartsIds;
- const sectionOneData = this.createDraftResponseSection(sectionOne);
- const sectionTwoData = this.createDraftResponseSection(sectionTwo);
- const sectionThreeData = this.createDraftResponseSection(sectionThree);
+ const sectionOneData = this.createEntryData(sectionOne);
+ const sectionTwoData = this.createEntryData(sectionTwo);
+ const sectionThreeData = this.createEntryData(sectionThree);
const sectionFourData = this.createEntryData(sectionFour);
- // currently the first three sections use this, and fourth section uses entry.[id]; possibly incorrect setup? Needs to actually be entry
- const min = 1000000000000000000;
- const max = 9999999999999999999;
- const randomNumber = (
- Math.floor(Math.random() * (max - min + 1)) + min
- ).toString();
- let draftResponse = [
- [...sectionOneData, ...sectionTwoData, ...sectionThreeData],
- null,
- randomNumber,
- ];
+
const body = {
+ ...sectionOneData,
+ ...sectionTwoData,
+ ...sectionThreeData,
...sectionFourData,
- draftResponse,
- fbzx: randomNumber, //not sure what this value is, but it has to match draft response
};
return body;
},
async submitForm() {
this.submittingForm = true;
- await this.doPost();
+ try {
+ await this.doPost();
- this.submittingForm = false;
- this.selectTab("tab-5");
+ this.submittingForm = false;
+ this.selectTab("tab-5");
+ } catch (e) {
+ this.errorModal = true;
+ this.errorModalMessage = "Error occurred during form submission.";
+ }
},
async doPost() {
// this is the `action` attribute of your Google Forms form
@@ -852,6 +839,23 @@ export default {
// google expects each form attr to be encoded
const body = Object.entries(bodyParts)
.map(([key, val]) => {
+ if (key === "entry.133302117") {
+ //google expects date entry to be split
+ const [month, day, year] = val.split("/");
+ return `${key}_year=${encodeURIComponent(
+ year
+ )}&${key}_month=${encodeURIComponent(
+ month
+ )}&${key}_day=${encodeURIComponent(day)}`;
+ } else if (Array.isArray(val)) {
+ let values = [];
+ val.forEach((value) => {
+ if (value) {
+ values.push(`${key}=${encodeURIComponent(value)}`);
+ }
+ });
+ return values.join("&");
+ }
return `${key}=${encodeURIComponent(val)}`;
})
.join("&");