Remove /help route and templates
This commit is contained in:
leigh-mil
parent
0484d9b77f
commit
bdc03fb0a2
@ -10,7 +10,6 @@ UNPROTECTED_ROUTES = [
|
||||
"atst.login_redirect",
|
||||
"atst.logout",
|
||||
"atst.unauthorized",
|
||||
"atst.helpdocs",
|
||||
"static",
|
||||
"atst.about",
|
||||
]
|
||||
|
||||
@ -42,16 +42,6 @@ def root():
|
||||
return render_template("login.html", redirect_url=redirect_url)
|
||||
|
||||
|
||||
@bp.route("/help")
|
||||
@bp.route("/help/<path:doc>")
|
||||
def helpdocs(doc=None):
|
||||
docs = [os.path.splitext(file)[0] for file in os.listdir("templates/help/docs")]
|
||||
if doc:
|
||||
return render_template("help/docs/{}.html".format(doc), docs=docs, doc=doc)
|
||||
else:
|
||||
return render_template("help/index.html", docs=docs, doc=doc)
|
||||
|
||||
|
||||
@bp.route("/home")
|
||||
def home():
|
||||
return render_template("home.html")
|
||||
|
||||
@ -1,137 +0,0 @@
|
||||
{% extends "help/index.html" %}
|
||||
|
||||
{% set subnav = [
|
||||
{"label":"Financial Verification", "href":"#financial-verification"},
|
||||
{"label":"ID/IQ CLINs", "href":"#idiq-clins"},
|
||||
{"label":"JEDI Cloud Applications", "href":"#jedi-cloud-applications"},
|
||||
] %}
|
||||
|
||||
{% block doc_content %}
|
||||
|
||||
<h2 id='financial-verification'>Financial Verification</h2>
|
||||
|
||||
<h3>How to prepare for Financial Verification step?</h3>
|
||||
<p>Once your request is approved, the next step is to create a Task Order (T.O.) associated with the JEDI Cloud ID/IQ. Please contact a Contracting Officer (KO) or Contracting Officer Representative (COR) to help with this step. </p>
|
||||
<p>This may also involve talking to your Financial Manager (FM) to secure funding.</p>
|
||||
<p>Once the Task Order (T.O.) has been created, you will need to provide information related to the task order and funding in AT-AT. This step is referred to as “Financial Verification.”</p>
|
||||
<p><em>We also recommend getting familiar with the <a href="#">JEDI Cloud CLIN structures</a> so that you know which specific services are available under JEDI and categorized for contracting purposes. This will help you and the Contracting Officer create a Task Order.</em></p>
|
||||
|
||||
<h3>Why is this important?</h3>
|
||||
<p>This step allows AT-AT and the CCPO to track and report on cloud infrastructure spending across the Department., It also enables you and your team to see your cloud usage and verify your invoices with your budget.</p>
|
||||
|
||||
<h3>What to prepare for Financial Verification?</h3>
|
||||
<p>You will need to have these details on hand before filling out the next step.</p>
|
||||
|
||||
<div class='fixed-table-wrapper'>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Item you’ll need to provide</th>
|
||||
<th>Format / Example</th>
|
||||
<th>Explanation</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Task Order Number associated with this request*</td>
|
||||
<td><em>Example: <br>1234567899C0001</em></td>
|
||||
<td>
|
||||
<p>Please include the original Task Order number (including the 000X at the end); this field is not requesting any modification numbers.</p>
|
||||
<p>Please note that there may be a lag between the time you have created and approved the task order to the time it is searchable within the electronic.</p>
|
||||
<p>A Contracting Officer will likely be the best source for this number.</p>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Unique Item Identifiers (UII) related to your system(s) if you already have them</td>
|
||||
<td><em>Example: <br>DI 0CVA5786950 OR UN1945326361234786950</em></td>
|
||||
<td>
|
||||
<p>A Unique Investment Identifier is a unique code that helps the Department of Defense track and report on where and how digital assets are stored and where the budget comes from.</p>
|
||||
<p>Not all applications have an existing UII number assigned.</p>
|
||||
<p>This identifier can be found in SNaP-IT.</p>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Program Element (PE) Number related to your request</td>
|
||||
<td><em>Example: <br>0203752A</em></td>
|
||||
<td>Program Element numbers helps the Department of Defense identify which offices' budgets are contributing towards this resource use.</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Program Treasury Code</td>
|
||||
<td><em>Example: <br>1200</em></td>
|
||||
<td>The Treasury Code (or Appropriations Code) is a four digit number that identifies resource types.</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Program BA Code</td>
|
||||
<td><em>Example: <br>02</em></td>
|
||||
<td>The Budget Activity Code (or BA Code) is a two digit number that is the category within each appropriation and fund account used to identify the purposes, applications, or types of activities financed by the appropriation fund.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<p><em>*AT-AT will search your Task Order number in available APIs and find other relevant details about your task order automatically. If we are unable to locate your Task Order, you will be asked to manually enter information such as total contract amount, CLIN amounts, and contracting officer information.</em></p>
|
||||
|
||||
<hr>
|
||||
|
||||
<h2 id='idiq-clins'>ID/IQ CLINs</h2>
|
||||
|
||||
<h3>How are the JEDI ID/IQ CLINs structured?</h3>
|
||||
|
||||
<p>We recommend sharing the following details with your contracting personnel to help accelerate the task order creation process.</p>
|
||||
<p>The JEDI contract vehicle supports the following types of cloud infrastructure services.</p>
|
||||
<p>Your contracting personnel will want to know which services above and contract line item numbers (CLINs) you are interested in procuring and what estimated dollar amounts to use associate. Use the <a href="#">JEDI Cloud Calculator</a> to arrive at a price estimate for each of those.</p>
|
||||
|
||||
<div class='fixed-table-wrapper'>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>JEDI Contract Line Item Numbers (CLINs)</th>
|
||||
<th>Services supported</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>CLIN 0001 - Unclassified IaaS and PaaS Amount</td>
|
||||
<td>
|
||||
<p>This CLIN covers infrastructure as a service (IaaS) features including the basic building blocks of networking features, computers (virtual or on dedicated hardware), and data storage space.</p>
|
||||
<p>It also provides platform as a service (PaaS) features including resource procurement, capacity planning, software maintenance, patching, or any of the other undifferentiated heavy lifting involved in running your application.</p>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>CLIN 0003 - Unclassified Cloud Support Package</td>
|
||||
<td>This CLIN covers the basic customer service support package offered including _______</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>CLIN 1001 - Unclassified IaaS and PaaS Amount OPTION PERIOD 1</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>CLIN 1003 - Unclassified Cloud Support Package OPTION PERIOD 1</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>CLIN 2001 - Unclassified IaaS and PaaS Amount OPTION PERIOD 2</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>CLIN 2003 - Unclassified Cloud Support Package OPTION PERIOD 2</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
||||
<h2 id='jedi-cloud-applications'>JEDI Cloud Applications</h2>
|
||||
|
||||
<h3>How are applications organized in the JEDI Cloud?</h3>
|
||||
|
||||
<h4>Application Structure for JEDI Cloud</h4>
|
||||
|
||||
<p>Separate your portfolio into applications and environments; this allows your team to manage user access to systems more securely and track expenditures for each application.</p>
|
||||
<p>Here’s an example:<br>
|
||||
Application A has a development environment, production environment, and sandbox environment. The cloud resources in the development environment are grouped and accessed separately from the production environment and sandbox environment.</p>
|
||||
|
||||
<img src='{{ url_for("static", filename="img/at-at_faqs_content.svg") }}' alt='AT-AT FAQs Content'>
|
||||
|
||||
{% endblock %}
|
||||
@ -1,48 +0,0 @@
|
||||
{% extends "base_public.html" %}
|
||||
{% from "components/sidenav_item.html" import SidenavItem %}
|
||||
|
||||
{% block title %}Help | JEDI Cloud{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
<div class='global-layout'>
|
||||
<div class='global-navigation'>
|
||||
<div class="sidenav-container">
|
||||
<div class="sidenav">
|
||||
<ul class="sidenav__list sidenav__list--no-header">
|
||||
{{ SidenavItem("JEDI Cloud Help",
|
||||
href = url_for("atst.helpdocs"),
|
||||
active = not doc,
|
||||
)}}
|
||||
{% for doc_item in docs %}
|
||||
{% set active = doc and doc == doc_item %}
|
||||
{{ SidenavItem(doc_item | title,
|
||||
href = url_for("atst.helpdocs", doc=doc_item),
|
||||
active = active,
|
||||
)}}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class='global-panel-container'>
|
||||
<div class='panel'>
|
||||
<div class='panel__heading panel__heading--divider'>
|
||||
<h1>
|
||||
{% if doc %}
|
||||
<div class='h4'>JEDI Cloud Help Documentation</div>
|
||||
<div class='h1'>{{ doc | title }}</div>
|
||||
{% else %}
|
||||
<div class='h1'>JEDI Cloud Help Documentation</span>
|
||||
{% endif %}
|
||||
</h1>
|
||||
</div>
|
||||
<div class='panel__content'>
|
||||
{% block doc_content %}
|
||||
<p>Welcome to the JEDI Cloud help documentation.</p>
|
||||
{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@ -14,7 +14,7 @@
|
||||
{{ Icon('avatar', classes='topbar__link-icon') }}
|
||||
<span class="topbar__link-label">{{ g.current_user.first_name + " " + g.current_user.last_name }}</span>
|
||||
</a>
|
||||
<a href="{{ url_for('atst.helpdocs') }}" class="topbar__link">
|
||||
<a href="#" class="topbar__link">
|
||||
{{ Icon('question', classes='topbar__link-icon') }}
|
||||
<span class="topbar__link-label">Support</span>
|
||||
</a>
|
||||
|
||||
@ -97,25 +97,12 @@ def test_protected_routes_redirect_to_login(client, app):
|
||||
def test_unprotected_routes_set_user_if_logged_in(client, app, user_session):
|
||||
user = UserFactory.create()
|
||||
|
||||
resp = client.get(url_for("atst.helpdocs"))
|
||||
resp = client.get(url_for("atst.about"))
|
||||
assert resp.status_code == 200
|
||||
assert user.full_name not in resp.data.decode()
|
||||
|
||||
user_session(user)
|
||||
resp = client.get(url_for("atst.helpdocs"))
|
||||
assert resp.status_code == 200
|
||||
assert user.full_name in resp.data.decode()
|
||||
|
||||
|
||||
def test_unprotected_routes_set_user_if_logged_in(client, app, user_session):
|
||||
user = UserFactory.create()
|
||||
|
||||
resp = client.get(url_for("atst.helpdocs"))
|
||||
assert resp.status_code == 200
|
||||
assert user.full_name not in resp.data.decode()
|
||||
|
||||
user_session(user)
|
||||
resp = client.get(url_for("atst.helpdocs"))
|
||||
resp = client.get(url_for("atst.about"))
|
||||
assert resp.status_code == 200
|
||||
assert user.full_name in resp.data.decode()
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user