From 40814c9fb83d046114b1eaf07e3dc6f320514d69 Mon Sep 17 00:00:00 2001 From: "megan.godfrey" Date: Wed, 3 Sep 2025 17:10:27 +0100 Subject: [PATCH 1/5] Update customer facing text to refer to ConcertIM --- data/clusterPacks.yaml | 8 +++---- data/creditPacks.yaml | 18 +++++++------- data/productTypeDefinitions.yaml | 16 ++++++------- flight-store-lib/demo/src/index.html | 2 +- .../checkout/components/MustLoginMessage.js | 4 ++-- flight-store-lib/src/reducers/index.js | 2 +- .../controllers/subscriptions_controller.rb | 14 +++++------ server/config/environments/development.rb | 14 +++++------ server/config/environments/test.rb | 10 ++++---- server/config/initializers/cors.rb | 24 +++++++++---------- 10 files changed, 56 insertions(+), 56 deletions(-) diff --git a/data/clusterPacks.yaml b/data/clusterPacks.yaml index d5804df..5e99c11 100644 --- a/data/clusterPacks.yaml +++ b/data/clusterPacks.yaml @@ -13,12 +13,12 @@ single node. - Operates the [Slurm Workload Manager](https://slurm.schedmd.com/) job scheduler. - - 2 [Alces Flight Center](https://center.alces-flight.com) support credits + - 2 [ConcertIM](https://portal.concertim.com) support credits per month. details: | A cluster comprising an entry-level login node and general-level compute nodes (3.75 GiB, 2 CPUs) provided for familiarization and experimentation - with Alces Flight Compute. By default, the compute estate runs on two + with ConcertIM Compute. By default, the compute estate runs on two general economy nodes (7.5 GiB, 4 CPUs), with an option to select durable nodes instead. Autoscaling is enabled to shut down idle nodes (a minimum of one compute node will be retained at all times). The cluster operates @@ -51,7 +51,7 @@ - Autoscales from a single compute node to four balanced compute nodes (240GiB, 144 CPUs). - Operates the Open Grid Scheduler (SGE) job Scheduler. - - 5 [Alces Flight Center](https://center.alces-flight.com) support credits + - 5 [ConcertIM](https://portal.concertim.com) support credits per month. details: | A cluster comprising a medium-sized login node and balanced compute nodes @@ -78,7 +78,7 @@ - Autoscales from a single GPU node to two GPU nodes (976 GiB, 64 CPUs, 16 GPUs). - Operates the Open Grid Scheduler (SGE) job Scheduler. - - 10 [Alces Flight Center](https://center.alces-flight.com) support + - 10 [ConcertIM](https://portal.concertim.com) support credits per month. details: | A cluster comprising a medium-sized login node and GPU compute nodes (488 diff --git a/data/creditPacks.yaml b/data/creditPacks.yaml index 2aa5ddc..41b12d5 100644 --- a/data/creditPacks.yaml +++ b/data/creditPacks.yaml @@ -17,7 +17,7 @@ # Used as the product name on the checkout form and email. It should # probably match the entry in `stripe.description`. - name: Pack of 5 Alces Flight Center service credits + name: Pack of 5 ConcertIM service credits # The type of product. This must match the filename. type: creditPacks @@ -40,15 +40,15 @@ # features: # - tick: true # text: | - # Allocate to your Flight Center site managed through - # [Alces Flight Center](https://center.alces-flight.com) + # Allocate to your ConcertIM site managed through + # [ConcertIM](https://portal.concertim.com) # - tick: false # text: | # ~Includes rainbows and kittens~ # Optional markdown for the product card. # details: | - # The Bronze Alces Flight Center credit pack allows you to... + # The Bronze ConcertIM credit pack allows you to... # Optional. If learnMore is given, the product card will display a "Learn # more" link. Clicking it will display a modal containing this markdown. @@ -68,7 +68,7 @@ # Used as the description by Stripe. It should probably match the entry # in `name`. - description: Pack of 5 Alces Flight Center service credits + description: Pack of 5 ConcertIM service credits # The type of Stripe payment to make. Either `charge` or `subscription`. type: charge @@ -93,7 +93,7 @@ emphasise: true # backgroundColor: var(--teal) backgroundColor: '#20c997' - name: Pack of 10 Alces Flight Center service credits + name: Pack of 10 ConcertIM service credits type: creditPacks identifier: 10-service-credit-pack cost: @@ -104,7 +104,7 @@ stripe: amount: 235000 currency: gbp - description: Pack of 10 Alces Flight Center service credits + description: Pack of 10 ConcertIM service credits type: charge action: identifier: deposit_credits @@ -120,7 +120,7 @@ emphasise: false # backgroundColor: var(--info) backgroundColor: '#3498DB' - name: Pack of 15 Alces Flight Center service credits + name: Pack of 15 ConcertIM service credits type: creditPacks identifier: 15-service-credit-pack cost: @@ -131,7 +131,7 @@ stripe: amount: 350000 currency: gbp - description: Pack of 15 Alces Flight Center service credits + description: Pack of 15 ConcertIM service credits type: charge action: identifier: deposit_credits diff --git a/data/productTypeDefinitions.yaml b/data/productTypeDefinitions.yaml index cfc24b8..b2fd2f4 100644 --- a/data/productTypeDefinitions.yaml +++ b/data/productTypeDefinitions.yaml @@ -1,16 +1,16 @@ - type: clusterPacks name: Cluster packs title: HPC cluster pack - subtitle: Fully managed Alces Flight HPC cluster with Flight Center support + subtitle: Fully managed ConcertIM HPC cluster with ConcertIM support description: | - An Alces Flight HPC cluster built by our experienced engineering team in + An ConcertIM HPC cluster built by our experienced engineering team in a Virtual Private Cluster (VPC) environment for security, with SSH and graphical-desktop connectivity for users. Data management tools for POSIX and S3 object storage are also included to help users transfer files and manage storage resources. - The cluster will be fully managed by Alces using the [Alces Flight - Center](https://center.alces-flight.com) service. Where you will be able + The cluster will be fully managed by Alces using the + [ConcertIM](https://portal.concertim.com) service. Where you will be able to view the dozens of daily checks our engineering team will perform to ensure the health of your cluster request support and advice and access the comprehensive support logs for your cluster. @@ -19,15 +19,15 @@ title: Choose a cluster pack. overview: | Ready to get going? Choose a cluster pack, enter your credit card - details and request your fully managed Alces Flight HPC cluster. + details and request your fully managed ConcertIM HPC cluster. - type: creditPacks name: Support credits - title: Flight Center support credits - subtitle: Support credits for use with Alces Flight Center + title: ConcertIM support credits + subtitle: Support credits for use with ConcertIM description: | The support credits can be allocated to any of your HPC clusters managed - through [Alces Flight Center](https://center.alces-flight.com). You will + through [ConcertIM](https://portal.concertim.com). You will be able to view the dozens of daily checks our engineering team will perform to ensure the health of your cluster request support and advice and access the comprehensive support logs for your cluster. diff --git a/flight-store-lib/demo/src/index.html b/flight-store-lib/demo/src/index.html index 4e2b40d..eeda36e 100644 --- a/flight-store-lib/demo/src/index.html +++ b/flight-store-lib/demo/src/index.html @@ -15,7 +15,7 @@ Reactware/flight-account-menu are loaded --> diff --git a/flight-store-lib/src/checkout/components/MustLoginMessage.js b/flight-store-lib/src/checkout/components/MustLoginMessage.js index 837e813..3b5e884 100644 --- a/flight-store-lib/src/checkout/components/MustLoginMessage.js +++ b/flight-store-lib/src/checkout/components/MustLoginMessage.js @@ -8,8 +8,8 @@ const MustLoginMessage = () => { return (

- You must be signed in to your Alces Flight account in order to purchase - any products from Alces Flight Store. Please{' '} + You must be signed in to your ConcertIM account in order to purchase + any products from ConcertIM Store. Please{' '} { return reducerUtils.withStateResetting({ keepStateSlices: [ 'router' ], // This needs to be consistent with the redux action type used to log a - // user out of Flight SSO. Currently, this has been copied from + // user out of ConcertIM SSO. Currently, this has been copied from // FlightAccountMenu. // XXX Take this as a dependency somehow. Preferably without adding a // dependency on FlightAccountMenu. diff --git a/server/app/controllers/subscriptions_controller.rb b/server/app/controllers/subscriptions_controller.rb index b591574..9d380d7 100644 --- a/server/app/controllers/subscriptions_controller.rb +++ b/server/app/controllers/subscriptions_controller.rb @@ -26,18 +26,18 @@ def find_stripe_product(alces_product) def find_stripe_plan(product) plans = Stripe::Plan.list( active: true, - product: product.id, + product: product.id ) plans.data.first end def subscribe(customer, plan) Stripe::Subscription.create( - :customer => customer.id, - :items => [ + customer: customer.id, + items: [ { - :plan => plan.id, - }, + plan: plan.id + } ] ) end @@ -48,7 +48,7 @@ def stripe_customer email: current_user.email, source: params[:token], metadata: { - flight_id: current_user.flight_id, + flight_id: current_user.flight_id } ).tap do |customer| current_user.stripe_id = customer.id @@ -64,7 +64,7 @@ def stripe_customer # # Solution: # - # Have the UI check if the flight account is associated with a stripe + # Have the UI check if the ConcertIM account is associated with a stripe # customer and if that customer has any cards. If so, ask user to # select one of their existing cards. If not, use the current UI. # diff --git a/server/config/environments/development.rb b/server/config/environments/development.rb index a50dbed..4f7bb17 100644 --- a/server/config/environments/development.rb +++ b/server/config/environments/development.rb @@ -14,12 +14,12 @@ # Enable/disable caching. By default caching is disabled. # Run rails dev:cache to toggle caching. - if Rails.root.join('tmp', 'caching-dev.txt').exist? + if Rails.root.join("tmp", "caching-dev.txt").exist? config.action_controller.perform_caching = true config.cache_store = :memory_store config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{2.days.to_i}" + "Cache-Control" => "public, max-age=#{2.days.to_i}" } else config.action_controller.perform_caching = false @@ -42,9 +42,9 @@ config.active_record.verbose_query_logs = true if ENV["RAILS_LOG_TO_STDOUT"].present? - logger = ActiveSupport::Logger.new(STDOUT) + logger = ActiveSupport::Logger.new(STDOUT) # logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) + config.logger = ActiveSupport::TaggedLogging.new(logger) end # Raises error for missing translations @@ -54,10 +54,10 @@ # routes, locales, etc. This feature depends on the listen gem. config.file_watcher = ActiveSupport::EventedFileUpdateChecker - config.sso_cookie_name = ENV.fetch('SSO_COOKIE_NAME', 'flight_sso_dev') + config.sso_cookie_name = ENV.fetch("SSO_COOKIE_NAME", "concertim_dev") config.store = { - products_url_prefix: ENV.fetch('PRODUCTS_URL_PREFIX', 'https://alces-flight.s3.amazonaws.com/FlightStore/development-products/'), - vat_rate: ENV.fetch('VAT_RATE', 20), + products_url_prefix: ENV.fetch("PRODUCTS_URL_PREFIX", "https://alces-flight.s3.amazonaws.com/FlightStore/development-products/"), + vat_rate: ENV.fetch("VAT_RATE", 20) } end diff --git a/server/config/environments/test.rb b/server/config/environments/test.rb index adf1647..24a0b57 100644 --- a/server/config/environments/test.rb +++ b/server/config/environments/test.rb @@ -15,11 +15,11 @@ # Configure public file server for tests with Cache-Control for performance. config.public_file_server.enabled = true config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + "Cache-Control" => "public, max-age=#{1.hour.to_i}" } # Show full error reports and disable caching. - config.consider_all_requests_local = true + config.consider_all_requests_local = true config.action_controller.perform_caching = false # Raise exceptions instead of rendering exception templates. @@ -41,10 +41,10 @@ # Raises error for missing translations # config.action_view.raise_on_missing_translations = true - config.sso_cookie_name = ENV.fetch('SSO_COOKIE_NAME', 'flight_sso_test') + config.sso_cookie_name = ENV.fetch("SSO_COOKIE_NAME", "concertim_test") config.store = { - products_url_prefix: ENV.fetch('PRODUCTS_URL_PREFIX', 'https://alces-flight.s3.amazonaws.com/FlightStore/test-products/'), - vat_rate: ENV.fetch('VAT_RATE', 20), + products_url_prefix: ENV.fetch("PRODUCTS_URL_PREFIX", "https://alces-flight.s3.amazonaws.com/FlightStore/test-products/"), + vat_rate: ENV.fetch("VAT_RATE", 20) } end diff --git a/server/config/initializers/cors.rb b/server/config/initializers/cors.rb index 925f7e6..859cded 100644 --- a/server/config/initializers/cors.rb +++ b/server/config/initializers/cors.rb @@ -5,16 +5,16 @@ # Read more: https://github.com/cyu/rack-cors - Rails.application.config.middleware.insert_before 0, Rack::Cors do - allow do - origins 'https://alces-flight.com', - /^.*\.alces-flight.com$/, - /^.*\.alces-flight.lvh.me(:[0-9]+)?$/, - /^http:\/\/localhost(:[0-9]+)?$/ +Rails.application.config.middleware.insert_before 0, Rack::Cors do + allow do + origins "https://alces-flight.com", + /^.*\.concertim.com$/, + /^.*\.alces-flight.lvh.me(:[0-9]+)?$/, + /^http:\/\/localhost(:[0-9]+)?$/ - resource '*', - headers: :any, - methods: [:get, :post, :put, :patch, :delete, :options, :head], - credentials: true - end - end + resource "*", + headers: :any, + methods: [:get, :post, :put, :patch, :delete, :options, :head], + credentials: true + end +end From cde2c4beab265fbaef5f644637546377d0bdd368 Mon Sep 17 00:00:00 2001 From: megan-godfrey <102584263+megan-godfrey@users.noreply.github.com> Date: Wed, 3 Sep 2025 17:45:53 +0100 Subject: [PATCH 2/5] Fix sso cookie name Co-authored-by: Ben Armston --- server/config/environments/test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/config/environments/test.rb b/server/config/environments/test.rb index 24a0b57..55a5bea 100644 --- a/server/config/environments/test.rb +++ b/server/config/environments/test.rb @@ -41,7 +41,7 @@ # Raises error for missing translations # config.action_view.raise_on_missing_translations = true - config.sso_cookie_name = ENV.fetch("SSO_COOKIE_NAME", "concertim_test") + config.sso_cookie_name = ENV.fetch("SSO_COOKIE_NAME", "concertim_sso_test") config.store = { products_url_prefix: ENV.fetch("PRODUCTS_URL_PREFIX", "https://alces-flight.s3.amazonaws.com/FlightStore/test-products/"), From 69eee74a0e3de7b175077a02fbe2d1ca64a02107 Mon Sep 17 00:00:00 2001 From: megan-godfrey <102584263+megan-godfrey@users.noreply.github.com> Date: Wed, 3 Sep 2025 17:46:13 +0100 Subject: [PATCH 3/5] Fix sso cookie name Co-authored-by: Ben Armston --- server/config/environments/development.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/config/environments/development.rb b/server/config/environments/development.rb index 4f7bb17..f1e795e 100644 --- a/server/config/environments/development.rb +++ b/server/config/environments/development.rb @@ -54,7 +54,7 @@ # routes, locales, etc. This feature depends on the listen gem. config.file_watcher = ActiveSupport::EventedFileUpdateChecker - config.sso_cookie_name = ENV.fetch("SSO_COOKIE_NAME", "concertim_dev") + config.sso_cookie_name = ENV.fetch("SSO_COOKIE_NAME", "concertim_sso_dev") config.store = { products_url_prefix: ENV.fetch("PRODUCTS_URL_PREFIX", "https://alces-flight.s3.amazonaws.com/FlightStore/development-products/"), From 162c95994ad2bfae63976572b11203a179968f4b Mon Sep 17 00:00:00 2001 From: "megan.godfrey" Date: Thu, 4 Sep 2025 16:58:08 +0100 Subject: [PATCH 4/5] Bare minimum cors fix --- server/config/initializers/cors.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/config/initializers/cors.rb b/server/config/initializers/cors.rb index 859cded..4b4f609 100644 --- a/server/config/initializers/cors.rb +++ b/server/config/initializers/cors.rb @@ -9,7 +9,7 @@ allow do origins "https://alces-flight.com", /^.*\.concertim.com$/, - /^.*\.alces-flight.lvh.me(:[0-9]+)?$/, + /^.*\.concertim.lvh.me(:[0-9]+)?$/, /^http:\/\/localhost(:[0-9]+)?$/ resource "*", From dd1232249f89b5b455889eca752498d3fb009349 Mon Sep 17 00:00:00 2001 From: "megan.godfrey" Date: Thu, 4 Sep 2025 17:08:11 +0100 Subject: [PATCH 5/5] Wording fixes --- data/clusterPacks.yaml | 2 +- data/productTypeDefinitions.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/clusterPacks.yaml b/data/clusterPacks.yaml index 5e99c11..d694208 100644 --- a/data/clusterPacks.yaml +++ b/data/clusterPacks.yaml @@ -18,7 +18,7 @@ details: | A cluster comprising an entry-level login node and general-level compute nodes (3.75 GiB, 2 CPUs) provided for familiarization and experimentation - with ConcertIM Compute. By default, the compute estate runs on two + with Alces Flight Compute. By default, the compute estate runs on two general economy nodes (7.5 GiB, 4 CPUs), with an option to select durable nodes instead. Autoscaling is enabled to shut down idle nodes (a minimum of one compute node will be retained at all times). The cluster operates diff --git a/data/productTypeDefinitions.yaml b/data/productTypeDefinitions.yaml index b2fd2f4..bf21508 100644 --- a/data/productTypeDefinitions.yaml +++ b/data/productTypeDefinitions.yaml @@ -3,7 +3,7 @@ title: HPC cluster pack subtitle: Fully managed ConcertIM HPC cluster with ConcertIM support description: | - An ConcertIM HPC cluster built by our experienced engineering team in + A ConcertIM HPC cluster built by our experienced engineering team in a Virtual Private Cluster (VPC) environment for security, with SSH and graphical-desktop connectivity for users. Data management tools for POSIX and S3 object storage are also included to help users transfer files and