From 0de22b7e9043f9ff76d93faf9b4e4a1aaf8df8b1 Mon Sep 17 00:00:00 2001
From: naomi <naomi@happycatsin.space>
Date: Sat, 4 Dec 2021 14:42:40 +0000
Subject: [PATCH] removed uuids from configs, and removed some depcreated code
 from update hook

---
 .../core.entity_form_display.oc_actor.client.default.yml     | 1 -
 .../core.entity_form_display.oc_case.enquiry.default.yml     | 1 -
 ..._display.oc_case.pro_bono_immigration_service.default.yml | 1 -
 .../core.entity_view_display.oc_case.enquiry.default.yml     | 1 -
 ..._display.oc_case.pro_bono_immigration_service.default.yml | 1 -
 .../field.field.oc_actor.client.field_general_noes.yml       | 1 -
 .../field.field.oc_actor.volunteer.field_general_noes.yml    | 1 -
 .../optional/field.field.oc_case.enquiry.field_outcome.yml   | 1 -
 .../field.field.oc_case.enquiry.field_subject_of_enquiry.yml | 1 -
 ...ld.oc_case.pro_bono_immigration_service.field_outcome.yml | 1 -
 .../optional/field.storage.oc_actor.field_general_noes.yml   | 1 -
 .../field.storage.oc_case.field_subject_of_enquiry.yml       | 1 -
 .../config/optional/opencase_cases.oc_case_type.enquiry.yml  | 1 -
 ...ncase_cases.oc_case_type.pro_bono_immigration_service.yml | 1 -
 .../config/optional/user.role.opencase_admin.yml             | 1 -
 modules/opencase_entities/opencase_entities.install          | 5 -----
 16 files changed, 20 deletions(-)

diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
index 7d8f361..7d501e0 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
@@ -1,4 +1,3 @@
-uuid: 5715def9-7c66-4fd5-bd33-cbd0d817a8f7
 langcode: en
 status: true
 dependencies:
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.enquiry.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.enquiry.default.yml
index b647493..bf99b53 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.enquiry.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.enquiry.default.yml
@@ -1,4 +1,3 @@
-uuid: 3be6941a-41a5-4f81-a3ac-2f5741061ec4
 langcode: en
 status: true
 dependencies:
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.pro_bono_immigration_service.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.pro_bono_immigration_service.default.yml
index c1ed95a..36df257 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.pro_bono_immigration_service.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.pro_bono_immigration_service.default.yml
@@ -1,4 +1,3 @@
-uuid: 97d85717-c582-4efa-93cc-786cc078f3d5
 langcode: en
 status: true
 dependencies:
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.enquiry.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.enquiry.default.yml
index 4d4de22..e09f8ef 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.enquiry.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.enquiry.default.yml
@@ -1,4 +1,3 @@
-uuid: da67cba0-f1ea-438c-8c96-71fb9d769f5a
 langcode: en
 status: true
 dependencies:
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.pro_bono_immigration_service.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.pro_bono_immigration_service.default.yml
index ae0e550..234c6fa 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.pro_bono_immigration_service.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.pro_bono_immigration_service.default.yml
@@ -1,4 +1,3 @@
-uuid: a559f6f0-cc30-4a13-8882-7a042a965fc7
 langcode: en
 status: true
 dependencies:
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_general_noes.yml b/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_general_noes.yml
index dbd81f0..70e8457 100644
--- a/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_general_noes.yml
+++ b/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_general_noes.yml
@@ -1,4 +1,3 @@
-uuid: 35db2b5a-8ce8-4d8c-930d-195da8c0f895
 langcode: en
 status: true
 dependencies:
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_general_noes.yml b/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_general_noes.yml
index 425aead..72a7f20 100644
--- a/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_general_noes.yml
+++ b/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_general_noes.yml
@@ -1,4 +1,3 @@
-uuid: acfde2f5-ba98-4e83-ba0e-712b23ee4330
 langcode: en
 status: true
 dependencies:
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_outcome.yml b/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_outcome.yml
index 1a435f7..5322b45 100644
--- a/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_outcome.yml
+++ b/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_outcome.yml
@@ -1,4 +1,3 @@
-uuid: 8c80505b-97bb-4668-a24c-9c776b0661ba
 langcode: en
 status: true
 dependencies:
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_subject_of_enquiry.yml b/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_subject_of_enquiry.yml
index bb43104..f18cdea 100644
--- a/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_subject_of_enquiry.yml
+++ b/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_subject_of_enquiry.yml
@@ -1,4 +1,3 @@
-uuid: 58b926b1-a245-4d73-8cca-b93d92b59144
 langcode: en
 status: true
 dependencies:
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_case.pro_bono_immigration_service.field_outcome.yml b/modules/opencase_defaults/config/optional/field.field.oc_case.pro_bono_immigration_service.field_outcome.yml
index a2b8515..ea77576 100644
--- a/modules/opencase_defaults/config/optional/field.field.oc_case.pro_bono_immigration_service.field_outcome.yml
+++ b/modules/opencase_defaults/config/optional/field.field.oc_case.pro_bono_immigration_service.field_outcome.yml
@@ -1,4 +1,3 @@
-uuid: aa34a1ff-3c45-408b-b0ad-f8b9138a4358
 langcode: en
 status: true
 dependencies:
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_general_noes.yml b/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_general_noes.yml
index 4d3186d..34e9e6b 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_general_noes.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_general_noes.yml
@@ -1,4 +1,3 @@
-uuid: cf3b8b2e-1857-42bc-a807-b62b8ff2c458
 langcode: en
 status: true
 dependencies:
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_subject_of_enquiry.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_subject_of_enquiry.yml
index bec5e01..02c4c43 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_subject_of_enquiry.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_subject_of_enquiry.yml
@@ -1,4 +1,3 @@
-uuid: 91abf4d4-f0dd-4465-b801-2d0ce8e5c006
 langcode: en
 status: true
 dependencies:
diff --git a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.enquiry.yml b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.enquiry.yml
index 9c00b54..62f01cb 100644
--- a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.enquiry.yml
+++ b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.enquiry.yml
@@ -1,4 +1,3 @@
-uuid: 9f9d34a2-2d19-4b77-a1a0-8c988ab86a90
 langcode: en
 status: true
 dependencies: {  }
diff --git a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml
index f882d2d..dc27de6 100644
--- a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml
+++ b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml
@@ -1,4 +1,3 @@
-uuid: 0ee88268-bd79-4d17-9520-b1db6f1ad697
 langcode: en
 status: true
 dependencies: {  }
diff --git a/modules/opencase_defaults/config/optional/user.role.opencase_admin.yml b/modules/opencase_defaults/config/optional/user.role.opencase_admin.yml
index 0fee329..837def5 100644
--- a/modules/opencase_defaults/config/optional/user.role.opencase_admin.yml
+++ b/modules/opencase_defaults/config/optional/user.role.opencase_admin.yml
@@ -1,4 +1,3 @@
-uuid: 4b101a8b-ca08-462e-a2c7-acf2d988ec67
 langcode: en
 status: true
 dependencies: {  }
diff --git a/modules/opencase_entities/opencase_entities.install b/modules/opencase_entities/opencase_entities.install
index 78be682..a341cfd 100644
--- a/modules/opencase_entities/opencase_entities.install
+++ b/modules/opencase_entities/opencase_entities.install
@@ -100,14 +100,9 @@ function opencase_entities_update_80198() {
 
 function opencase_entities_update_80197() {
   //check if the table exists first.  If not, then create the entity.
-  if(!db_table_exists('oc_organisation')) {
     \Drupal::entityTypeManager()->clearCachedDefinitions();
     \Drupal::entityDefinitionUpdateManager()
       ->installEntityType(\Drupal::entityTypeManager()->getDefinition('oc_organisation'));
-  }
-  else {
-    return 'Organisation entity already exists';
-  }
 }
 
 function opencase_entities_update_80192(&$sandbox) {