chore: remove svelkit app and upgrade opensearch and remove legacy ia…

…i waffle flag
uktrade · Feb 7, 2025 · ed3b4d2 · ed3b4d2
1 parent 30e91bf
commit ed3b4d2
Show file tree

Hide file tree

Showing 46 changed files with 15 additions and 786 deletions.
diff --git a/Makefile b/Makefile
@@ -113,7 +113,7 @@ PREV_IMAGE_TAG=$$(git rev-parse HEAD~1)
 IMAGE_TAG=$$(git rev-parse HEAD)
 
 tf_build_args=-var "image_tag=$(IMAGE_TAG)"
-DOCKER_SERVICES=$$(docker compose config --services | grep -Ev 'worker|sveltekit-app')
+DOCKER_SERVICES=$$(docker compose config --services | grep -Ev 'worker')
 
 AUTO_APPLY_RESOURCES = module.django-app.aws_ecs_task_definition.aws-ecs-task \
                        module.django-app.aws_ecs_service.aws-ecs-service \

diff --git a/django_app/redbox_app/jinja2.py b/django_app/redbox_app/jinja2.py
@@ -86,7 +86,6 @@ def environment(**options):
             "to_user_timezone": to_user_timezone,
             "environment": settings.ENVIRONMENT.value,
             "security": settings.MAX_SECURITY_CLASSIFICATION.value,
-            "waffle_flag": waffle.flag_is_active,
         }
     )
     env.globals.update(
@@ -98,7 +97,6 @@ def environment(**options):
             "to_user_timezone": to_user_timezone,
             "environment": settings.ENVIRONMENT.value,
             "security": settings.MAX_SECURITY_CLASSIFICATION.value,
-            "waffle_flag": waffle.flag_is_active,
             "google_analytics_tag": settings.GOOGLE_ANALYTICS_TAG,
             "google_analytics_link": settings.GOOGLE_ANALYTICS_LINK,
             "google_analytics_iframe_src": settings.GOOGLE_ANALYTICS_IFRAME_SRC,

diff --git a/django_app/redbox_app/redbox_core/views/info_views.py b/django_app/redbox_app/redbox_core/views/info_views.py
@@ -13,10 +13,7 @@
 def privacy_notice_view(request):
     return render(
         request,
-        "privacy-notice.html",
-        {
-            "waffle_flag": waffle.flag_is_active,
-        },
+        "privacy-notice.html"
     )
 
 
@@ -34,6 +31,5 @@ def accessibility_statement_view(request):
         "accessibility-statement.html",
         {
             "contact_email": settings.CONTACT_EMAIL,
-            "waffle_flag": waffle.flag_is_active,
         },
     )
diff --git a/django_app/redbox_app/templates/accessibility-statement.html b/django_app/redbox_app/templates/accessibility-statement.html
@@ -2,18 +2,11 @@
 
 {% set pageTitle = "Accessibility statement" %}
 
-{% if waffle_flag(request, "uktrade") %}
-  {% set departmental_owner = "Department for Business and Trade" %}
-  {% set zoom_level = "300%" %}
-  {% set review_date_last = "21st June 2024" %}
-  {% set compliance_status = 'This website is fully compliant with the <a href="https://www.w3.org/TR/WCAG22/" class="govuk-link">Web Content Accessibility Guidelines version 2.2</a> AA standard.' %}
-
-{% else %}
-  {% set departmental_owner = "Cabinet Office" %}
-  {% set zoom_level = "400%" %}
-  {% set review_date_last = "12th August 2024" %}
-  {% set compliance_status = 'The website has been tested against the Web Content Accessibility Guidelines (WCAG) 2.2 AA standard. This website is fully compliant with the <a href="https://www.w3.org/TR/WCAG22/" class="govuk-link">Web Content Accessibility Guidelines version 2.2</a> AA standard.' %}
-{% endif %}
+{% set departmental_owner = "Department for Business and Trade" %}
+{% set zoom_level = "300%" %}
+{% set review_date_last = "21st June 2024" %}
+{% set compliance_status = 'This website is fully compliant with the <a href="https://www.w3.org/TR/WCAG22/" class="govuk-link">Web Content Accessibility Guidelines version 2.2</a> AA standard.' %}
+
 
 {% block content %}
 

diff --git a/django_app/redbox_app/templates/base.html b/django_app/redbox_app/templates/base.html
@@ -19,7 +19,7 @@
   <script type="module" src="{{static('js/libs/dompurify.js')}}"></script>
   <script type="module" src="{{static('js/main.js')}}"></script>
 
-  {% if environment | lower == "prod" and waffle_flag(request, 'uktrade') %}
+  {% if environment | lower == "prod" %}
   <!-- Google Tag Manager -->
   <script hash="sha256-T/1K73p+yppfXXw/AfMZXDh5VRDNaoEh3enEGFmZp8M=" nonce="{{ request.csp_nonce }}">
     (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -35,7 +35,7 @@
 
 <body class="govuk-template__body">
 
-  {% if environment | lower == "prod" and waffle_flag(request, 'uktrade') %}
+  {% if environment | lower == "prod" %}
   <!-- Google Tag Manager (noscript) -->
   <noscript><iframe src="{{ google_analytics_iframe_src }}"
   height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>

diff --git a/django_app/redbox_app/templates/homepage.html b/django_app/redbox_app/templates/homepage.html
@@ -8,7 +8,6 @@
     <div class="govuk-width-container">
         <div class="govuk-grid-row">
             <div class="govuk-grid-column-two-thirds">
-                {% if waffle_flag(request, 'uktrade') %}
                     <h1 class="govuk-heading-xl govuk-!-margin-bottom-7">Use Artificial Intelligence (AI) to interact with {{ security }} level documents from your own document set</h1>
                     <p class="govuk-body-l govuk-!-margin-bottom-7">You may summarise documents, ask questions related to one or more documents, and chat directly with the AI to assist you in your work. You can use up to, and including, {{ security }} documents.</p>
                     <div class="rb-banner__links">
@@ -20,25 +19,7 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-7">Use Artificial Intelligence
                             ) }}
                         {% endif %}
                     </div>
-                {% else %}
-                    <h1 class="govuk-heading-xl govuk-!-margin-bottom-7">Ask any question of documents in your Redbox</h1>
-                    <p class="govuk-body-l govuk-!-margin-bottom-7">Use Artificial Intelligence (AI) to get insights from your personal document set. You can use up to, and including, {{ security }} documents.</p>
-                    <div class="rb-banner__links">
-                        {% if not request.user.is_authenticated %}
-                            {{ govukButton(
-                                text="Sign in",
-                                href=url('sign-in'),
-                                classes="govuk-button--secondary govuk-!-margin-bottom-0 rb-banner__button"
-                            ) }}
-                            {% if allow_sign_ups %}
-                                <span class="govuk-body govuk-!-margin-bottom-0">or <a class="govuk-link" href="{{ url('sign-up-page-1') }}">sign up</a> to use Redbox</span>
-                            {% endif %}
-                        {% endif %}
-                    </div>
-                    {% if not request.user.is_authenticated and not allow_sign_ups and not waffle_flag(request, 'uktrade') %}
-                        <p class="govuk-body govuk-!-margin-bottom-0 govuk-!-margin-top-5">We have paused new users signing up to Redbox. Please add your email to the <a href="https://docs.google.com/forms/d/e/1FAIpQLSev6KZ6ASgz54GKINfk18k_Ygo_hZxcuQrS3v5XzWc4DE1gaw/viewform?usp=sharing">waitlist</a>.</p>
-                    {% endif %}
-                {% endif %}
+
 
             </div>
         </div>

diff --git a/django_app/redbox_app/templates/privacy-notice.html b/django_app/redbox_app/templates/privacy-notice.html
@@ -2,15 +2,10 @@
 
 {% set pageTitle = "Privacy notice" %}
 
-{% if waffle_flag(request, "uktrade") %}
-  {% set departmental_owner = "Department for Business and Trade" %}
-  {% set department_address = "Department for Business and Trade, Old Admiralty Building, Admiralty Place, London, SW1A 2DY" %}
-  {% set last_updated = "21st June 2024" %}
-{% else %}
-  {% set departmental_owner = "Cabinet Office" %}
-  {% set department_address = "Cabinet Office, 70 Whitehall, London, SW1A 2AS, or 0207 276 1234, or <a href='mailto:[email protected]' class='govuk-link'>[email protected]</a>" %}
-  {% set last_updated = "16th April 2024" %}
-{% endif %}
+{% set departmental_owner = "Department for Business and Trade" %}
+{% set department_address = "Department for Business and Trade, Old Admiralty Building, Admiralty Place, London, SW1A 2DY" %}
+{% set last_updated = "21st June 2024" %}
+
 
 {% block content %}
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -120,7 +120,7 @@ services:
       start_period: 30s
 
   opensearch:
-    image: opensearchproject/opensearch:2.17.0
+    image: opensearchproject/opensearch:2.18.0
     environment:
       - discovery.type=single-node
       - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m

diff --git a/sveltekit_app/.gitignore b/sveltekit_app/.gitignore
diff --git a/sveltekit_app/.npmrc b/sveltekit_app/.npmrc
diff --git a/sveltekit_app/.prettierrc b/sveltekit_app/.prettierrc
diff --git a/sveltekit_app/Dockerfile b/sveltekit_app/Dockerfile
diff --git a/sveltekit_app/README.md b/sveltekit_app/README.md
diff --git a/sveltekit_app/e2e/demo.test.js b/sveltekit_app/e2e/demo.test.js
diff --git a/sveltekit_app/jsconfig.json b/sveltekit_app/jsconfig.json
diff --git a/sveltekit_app/package.json b/sveltekit_app/package.json
diff --git a/sveltekit_app/playwright.config.js b/sveltekit_app/playwright.config.js
diff --git a/sveltekit_app/src/app.d.ts b/sveltekit_app/src/app.d.ts
diff --git a/sveltekit_app/src/app.html b/sveltekit_app/src/app.html
diff --git a/sveltekit_app/src/lib/components/button.svelte b/sveltekit_app/src/lib/components/button.svelte