Chore: remove dashboardsFromStorage (#65058)

public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx

@@ -13,16 +13,14 @@ import { SaveDashboardErrorProxy } from './SaveDashboardErrorProxy';
 import { SaveDashboardAsForm } from './forms/SaveDashboardAsForm';
 import { SaveDashboardForm } from './forms/SaveDashboardForm';
 import { SaveProvisionedDashboardForm } from './forms/SaveProvisionedDashboardForm';
-import { SaveToStorageForm } from './forms/SaveToStorageForm';
 import { SaveDashboardData, SaveDashboardModalProps, SaveDashboardOptions } from './types';
 import { useDashboardSave } from './useDashboardSave';
 
 export const SaveDashboardDrawer = ({ dashboard, onDismiss, onSaveSuccess, isCopy }: SaveDashboardModalProps) => {
   const [options, setOptions] = useState<SaveDashboardOptions>({});
 
-  const isFromStorage = config.featureToggles.dashboardsFromStorage && dashboard.uid?.indexOf('/') > 0;
-  const isProvisioned = dashboard.meta.provisioned && !isFromStorage;
-  const isNew = dashboard.version === 0 && !isFromStorage;
+  const isProvisioned = dashboard.meta.provisioned;
+  const isNew = dashboard.version === 0;
 
   const previous = useAsync(async () => {
     if (isNew) {
@@ -82,22 +80,6 @@ export const SaveDashboardDrawer = ({ dashboard, onDismiss, onSaveSuccess, isCop
       );
     }
 
-    if (isFromStorage) {
-      return (
-        <SaveToStorageForm
-          dashboard={dashboard}
-          saveModel={data}
-          onCancel={onDismiss}
-          onSuccess={onSuccess}
-          onSubmit={onDashboardSave}
-          options={options}
-          onOptionsChange={setOptions}
-          isNew={isNew}
-          isCopy={isCopy}
-        />
-      );
-    }
-
     if (isNew || isCopy) {
       return (
         <SaveDashboardAsForm

public/app/features/dashboard/components/SaveDashboard/forms/SaveToStorageForm.tsx

@@ -1,223 +0,0 @@
-import React, { useMemo, useState } from 'react';
-import { useAsync } from 'react-use';
-
-import { selectors } from '@grafana/e2e-selectors';
-import { Stack } from '@grafana/experimental';
-import { locationService } from '@grafana/runtime';
-import {
-  Button,
-  Checkbox,
-  Field,
-  Form,
-  HorizontalGroup,
-  Input,
-  RadioButtonGroup,
-  Spinner,
-  TextArea,
-} from '@grafana/ui';
-import { getGrafanaStorage } from 'app/features/storage/storage';
-import { ItemOptions, WorkflowID, WriteValueResponse } from 'app/features/storage/types';
-
-import { SaveProps } from './SaveDashboardForm';
-
-interface FormDTO {
-  title?: string;
-  message: string;
-}
-
-interface Props extends SaveProps {
-  isNew?: boolean;
-  isCopy?: boolean;
-}
-
-export function SaveToStorageForm(props: Props) {
-  const { dashboard, saveModel, onSubmit, onCancel, onSuccess, onOptionsChange, isNew, isCopy } = props;
-  const hasTimeChanged = useMemo(() => dashboard.hasTimeChanged(), [dashboard]);
-  const hasVariableChanged = useMemo(() => dashboard.hasVariableValuesChanged(), [dashboard]);
-  const [saving, setSaving] = useState(false);
-  const [response, setResponse] = useState<WriteValueResponse>();
-  const [path, setPath] = useState(dashboard.uid);
-  const [workflow, setWorkflow] = useState(WorkflowID.Save);
-  const saveText = useMemo(() => {
-    switch (workflow) {
-      case WorkflowID.PR:
-        return 'Create PR';
-      case WorkflowID.Push:
-        return 'Push';
-    }
-    console.log('???', workflow);
-    return 'Save';
-  }, [workflow]);
-
-  const item = useAsync(async () => {
-    const opts = await getGrafanaStorage().getOptions(dashboard.uid);
-    setWorkflow(opts.workflows[0]?.value ?? WorkflowID.Save);
-    return opts;
-  }, [dashboard.uid]);
-
-  if (item.error) {
-    return <div>Error loading workflows</div>;
-  }
-
-  if (item.loading || !item.value) {
-    return <Spinner />;
-  }
-
-  if (response) {
-    return (
-      <div>
-        {response.url && (
-          <div>
-            <h2>View pull request</h2>
-            <a href={response.url}>{response.url}</a>
-          </div>
-        )}
-
-        <pre>{JSON.stringify(response)}</pre>
-
-        <HorizontalGroup>
-          <Button variant="secondary" onClick={onCancel}>
-            Close
-          </Button>
-        </HorizontalGroup>
-      </div>
-    );
-  }
-
-  let options = props.options;
-  const workflows = item.value?.workflows ?? [];
-  const canSave = saveModel.hasChanges || isNew || isCopy;
-
-  return (
-    <Form
-      onSubmit={async (data: FormDTO) => {
-        if (!onSubmit) {
-          return;
-        }
-        setSaving(true);
-
-        // Save dashboard without the UID
-        let { uid, ...body } = saveModel.clone;
-        if (isNew || isCopy) {
-          uid = path;
-          if (!uid.endsWith('-dash.json')) {
-            uid += '-dash.json';
-          }
-        }
-        const rsp = await getGrafanaStorage().write(uid, {
-          body,
-          kind: 'dashboard',
-          title: data.title,
-          message: data.message,
-          workflow: workflow,
-        });
-
-        console.log('GOT', rsp);
-        if (rsp.code === 200) {
-          if (options.saveVariables) {
-            dashboard.resetOriginalVariables();
-          }
-          if (options.saveTimerange) {
-            dashboard.resetOriginalTime();
-          }
-
-          if (!rsp.pending) {
-            // should close
-            onSuccess();
-
-            // Need to update the URL
-            if (isNew || isCopy) {
-              locationService.push(`/g/${uid}`);
-            }
-          }
-        } else {
-          setSaving(false);
-        }
-        setResponse(rsp);
-      }}
-    >
-      {({ register, errors }) => (
-        <Stack direction="column" gap={1}>
-          <Stack direction="column" gap={1}>
-            {hasTimeChanged && (
-              <Checkbox
-                checked={!!options.saveTimerange}
-                onChange={() =>
-                  onOptionsChange({
-                    ...options,
-                    saveTimerange: !options.saveTimerange,
-                  })
-                }
-                label="Save current time range as dashboard default"
-                aria-label={selectors.pages.SaveDashboardModal.saveTimerange}
-              />
-            )}
-            {hasVariableChanged && (
-              <Checkbox
-                checked={!!options.saveVariables}
-                onChange={() =>
-                  onOptionsChange({
-                    ...options,
-                    saveVariables: !options.saveVariables,
-                  })
-                }
-                label="Save current variable values as dashboard default"
-                aria-label={selectors.pages.SaveDashboardModal.saveVariables}
-              />
-            )}
-          </Stack>
-
-          {(isNew || isCopy) && (
-            <Field label="Path">
-              <Input
-                value={path ?? ''}
-                required
-                autoFocus
-                placeholder="Full path (todo, help validate)"
-                onChange={(v) => setPath(v.currentTarget.value)}
-              />
-            </Field>
-          )}
-
-          {!isJustSave(item.value) && (
-            <Field label="Workflow">
-              <RadioButtonGroup value={workflow} options={workflows} onChange={setWorkflow} />
-            </Field>
-          )}
-
-          {workflow === WorkflowID.PR && (
-            <Field label="PR Title">
-              <Input {...register('title')} required placeholder="Enter a PR title" autoFocus />
-            </Field>
-          )}
-
-          <Field label="Message">
-            <TextArea {...register('message')} placeholder="Add a note to describe your changes." rows={5} />
-          </Field>
-
-          <HorizontalGroup>
-            <Button variant="secondary" onClick={onCancel} fill="outline">
-              Cancel
-            </Button>
-            <Button
-              type="submit"
-              disabled={!canSave}
-              icon={saving ? 'fa fa-spinner' : undefined}
-              aria-label={selectors.pages.SaveDashboardModal.save}
-            >
-              {saveText}
-            </Button>
-            {!canSave && <div>No changes to save</div>}
-          </HorizontalGroup>
-        </Stack>
-      )}
-    </Form>
-  );
-}
-
-function isJustSave(opts: ItemOptions): boolean {
-  if (opts.workflows.length === 1) {
-    return opts.workflows.find((v) => v.value === WorkflowID.Save) != null;
-  }
-  return false;
-}