Restore support for non-composite data view ids

internal/kibana/data_view/models.go

@@ -232,10 +232,16 @@ func convertSourceFilter(item string, meta utils.ListMeta) kbapi.DataViewsSource
 }
 
 func (model dataViewModel) getViewIDAndSpaceID() (viewID string, spaceID string) {
+	viewID = model.ID.ValueString()
+	spaceID = model.SpaceID.ValueString()
+
 	resourceID := model.ID.ValueString()
-	composite, _ := clients.CompositeIdFromStr(resourceID)
-	viewID = composite.ResourceId
-	spaceID = composite.ClusterId
+	maybeCompositeID, _ := clients.CompositeIdFromStr(resourceID)
+	if maybeCompositeID != nil {
+		viewID = maybeCompositeID.ResourceId
+		spaceID = maybeCompositeID.ClusterId
+	}
+
 	return
 }
 

internal/kibana/data_view/models_test.go

@@ -352,3 +352,38 @@ func TestToAPIUpdateModel(t *testing.T) {
 		})
 	}
 }
+
+func Test_dataViewModel_getViewIDAndSpaceID(t *testing.T) {
+	tests := []struct {
+		name            string
+		model           dataViewModel
+		expectedViewID  string
+		expectedSpaceID string
+	}{
+		{
+			name: "gets the view and space id from the composite id if set",
+			model: dataViewModel{
+				ID: types.StringValue("space-id/view-id"),
+			},
+			expectedViewID:  "view-id",
+			expectedSpaceID: "space-id",
+		},
+		{
+			name: "gets the view and space id from the data view if id is not a valid composite id",
+			model: dataViewModel{
+				ID:      types.StringValue("view-id"),
+				SpaceID: types.StringValue("space-id"),
+			},
+			expectedViewID:  "view-id",
+			expectedSpaceID: "space-id",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			viewID, spaceID := tt.model.getViewIDAndSpaceID()
+			require.Equal(t, tt.expectedViewID, viewID)
+			require.Equal(t, tt.expectedSpaceID, spaceID)
+		})
+	}
+}