refactor(ui): flatten ui/src/app dir (#13815)

Signed-off-by: Anton Gilgur <[email protected]>

ui/package.json

@@ -6,9 +6,9 @@
         "src"
     ],
     "scripts": {
-        "build": "rm -Rf dist && NODE_ENV=production webpack --mode production --config ./src/app/webpack.config.js",
-        "start": "webpack-dev-server --config ./src/app/webpack.config.js",
-        "lint": "eslint --fix ./src/app && tsc --noEmit",
+        "build": "rm -Rf dist && NODE_ENV=production webpack --mode production",
+        "start": "webpack-dev-server",
+        "lint": "eslint --fix ./src && tsc --noEmit",
         "test": "jest",
         "deduplicate": "yarn-deduplicate -s fewer yarn.lock"
     },

ui/src/app/app-router.tsx → ui/src/app-router.tsx

@@ -8,7 +8,6 @@ import * as React from 'react';
 import {useEffect, useState} from 'react';
 import {Redirect, Route, Router, Switch} from 'react-router';
 
-import {Version} from '../models';
 import apiDocs from './api-docs';
 import clusterWorkflowTemplates from './cluster-workflow-templates';
 import cronWorkflows from './cron-workflows';
@@ -23,6 +22,7 @@ import sensors from './sensors';
 import {uiUrl} from './shared/base';
 import {ChatButton} from './shared/components/chat-button';
 import ErrorBoundary from './shared/components/error-boundary';
+import {Version} from './shared/models';
 import * as nsUtils from './shared/namespaces';
 import {services} from './shared/services';
 import userinfo from './userinfo';

ui/src/app/cluster-workflow-templates/cluster-workflow-template-creator.tsx → ui/src/cluster-workflow-templates/cluster-workflow-template-creator.tsx

@@ -1,12 +1,12 @@
 import * as React from 'react';
 import {useState} from 'react';
 
-import {ClusterWorkflowTemplate} from '../../models';
 import {Button} from '../shared/components/button';
 import {ErrorNotice} from '../shared/components/error-notice';
 import {ExampleManifests} from '../shared/components/example-manifests';
 import {UploadButton} from '../shared/components/upload-button';
 import {exampleClusterWorkflowTemplate} from '../shared/examples';
+import {ClusterWorkflowTemplate} from '../shared/models';
 import {services} from '../shared/services';
 import {ClusterWorkflowTemplateEditor} from './cluster-workflow-template-editor';
 

ui/src/app/cluster-workflow-templates/cluster-workflow-template-details.tsx → ui/src/cluster-workflow-templates/cluster-workflow-template-details.tsx

@@ -5,14 +5,14 @@ import * as React from 'react';
 import {useContext, useEffect, useState} from 'react';
 import {RouteComponentProps} from 'react-router';
 
-import * as models from '../../models';
-import {ClusterWorkflowTemplate, Workflow} from '../../models';
 import {uiUrl} from '../shared/base';
 import {ErrorNotice} from '../shared/components/error-notice';
 import {Loading} from '../shared/components/loading';
 import {ZeroState} from '../shared/components/zero-state';
 import {Context} from '../shared/context';
 import {historyUrl} from '../shared/history';
+import * as models from '../shared/models';
+import {ClusterWorkflowTemplate, Workflow} from '../shared/models';
 import * as nsUtils from '../shared/namespaces';
 import {services} from '../shared/services';
 import {useCollectEvent} from '../shared/use-collect-event';

ui/src/app/cluster-workflow-templates/cluster-workflow-template-editor.tsx → ui/src/cluster-workflow-templates/cluster-workflow-template-editor.tsx

@@ -1,11 +1,11 @@
 import {Tabs} from 'argo-ui/src/components/tabs/tabs';
 import * as React from 'react';
 
-import {WorkflowTemplate} from '../../models';
 import {LabelsAndAnnotationsEditor} from '../shared/components/editors/labels-and-annotations-editor';
 import {MetadataEditor} from '../shared/components/editors/metadata-editor';
 import {WorkflowParametersEditor} from '../shared/components/editors/workflow-parameters-editor';
 import {ObjectEditor} from '../shared/components/object-editor';
+import {WorkflowTemplate} from '../shared/models';
 
 export function ClusterWorkflowTemplateEditor({
     onChange,

ui/src/app/cluster-workflow-templates/cluster-workflow-template-list.tsx → ui/src/cluster-workflow-templates/cluster-workflow-template-list.tsx

@@ -4,7 +4,6 @@ import * as React from 'react';
 import {useContext, useEffect, useState} from 'react';
 import {Link, RouteComponentProps} from 'react-router-dom';
 
-import * as models from '../../models';
 import {uiUrl} from '../shared/base';
 import {ErrorNotice} from '../shared/components/error-notice';
 import {ExampleManifests} from '../shared/components/example-manifests';
@@ -14,6 +13,7 @@ import {Timestamp, TimestampSwitch} from '../shared/components/timestamp';
 import {ZeroState} from '../shared/components/zero-state';
 import {Context} from '../shared/context';
 import {Footnote} from '../shared/footnote';
+import * as models from '../shared/models';
 import {services} from '../shared/services';
 import {useCollectEvent} from '../shared/use-collect-event';
 import {useQueryParams} from '../shared/use-query-params';

ui/src/app/cron-workflows/cron-workflow-creator.tsx → ui/src/cron-workflows/cron-workflow-creator.tsx

@@ -1,12 +1,12 @@
 import * as React from 'react';
 import {useState} from 'react';
 
-import {CronWorkflow} from '../../models';
 import {Button} from '../shared/components/button';
 import {ErrorNotice} from '../shared/components/error-notice';
 import {ExampleManifests} from '../shared/components/example-manifests';
 import {UploadButton} from '../shared/components/upload-button';
 import {exampleCronWorkflow} from '../shared/examples';
+import {CronWorkflow} from '../shared/models';
 import * as nsUtils from '../shared/namespaces';
 import {services} from '../shared/services';
 import {CronWorkflowEditor} from './cron-workflow-editor';

ui/src/app/cron-workflows/cron-workflow-details.tsx → ui/src/cron-workflows/cron-workflow-details.tsx

@@ -5,15 +5,15 @@ import * as React from 'react';
 import {useContext, useEffect, useState} from 'react';
 import {RouteComponentProps} from 'react-router';
 
-import * as models from '../../models';
-import {CronWorkflow, Link, Workflow} from '../../models';
 import {uiUrl} from '../shared/base';
 import {ErrorNotice} from '../shared/components/error-notice';
 import {openLinkWithKey} from '../shared/components/links';
 import {Loading} from '../shared/components/loading';
 import {ZeroState} from '../shared/components/zero-state';
 import {Context} from '../shared/context';
 import {historyUrl} from '../shared/history';
+import * as models from '../shared/models';
+import {CronWorkflow, Link, Workflow} from '../shared/models';
 import {services} from '../shared/services';
 import {useCollectEvent} from '../shared/use-collect-event';
 import {useEditableObject} from '../shared/use-editable-object';

ui/src/app/cron-workflows/cron-workflow-editor.tsx → ui/src/cron-workflows/cron-workflow-editor.tsx

@@ -1,11 +1,11 @@
 import {Tabs} from 'argo-ui/src/components/tabs/tabs';
 import * as React from 'react';
 
-import {CronWorkflow} from '../../models';
 import {LabelsAndAnnotationsEditor} from '../shared/components/editors/labels-and-annotations-editor';
 import {MetadataEditor} from '../shared/components/editors/metadata-editor';
 import {WorkflowParametersEditor} from '../shared/components/editors/workflow-parameters-editor';
 import {ObjectEditor} from '../shared/components/object-editor';
+import {CronWorkflow} from '../shared/models';
 import {CronWorkflowSpecEditor} from './cron-workflow-spec-editior';
 import {CronWorkflowStatusViewer} from './cron-workflow-status-viewer';
 

ui/src/app/cron-workflows/cron-workflow-filters.tsx → ui/src/cron-workflows/cron-workflow-filters.tsx

@@ -1,10 +1,10 @@
 import * as React from 'react';
 import {useEffect, useState} from 'react';
 
-import * as models from '../../models';
 import {CheckboxFilter} from '../shared/components/checkbox-filter/checkbox-filter';
 import {NamespaceFilter} from '../shared/components/namespace-filter';
 import {TagsInput} from '../shared/components/tags-input/tags-input';
+import * as models from '../shared/models';
 
 import './cron-workflow-filters.scss';
 

ui/src/app/cron-workflows/cron-workflow-list.tsx → ui/src/cron-workflows/cron-workflow-list.tsx

@@ -5,7 +5,6 @@ import * as React from 'react';
 import {useContext, useEffect, useState} from 'react';
 import {Link, RouteComponentProps} from 'react-router-dom';
 
-import {CronWorkflow, CronWorkflowSpec} from '../../models';
 import {ANNOTATION_DESCRIPTION, ANNOTATION_TITLE} from '../shared/annotations';
 import {uiUrl} from '../shared/base';
 import {ErrorNotice} from '../shared/components/error-notice';
@@ -18,6 +17,7 @@ import {Context} from '../shared/context';
 import {getNextScheduledTime} from '../shared/cron';
 import {Footnote} from '../shared/footnote';
 import {historyUrl} from '../shared/history';
+import {CronWorkflow, CronWorkflowSpec} from '../shared/models';
 import * as nsUtils from '../shared/namespaces';
 import {services} from '../shared/services';
 import {useCollectEvent} from '../shared/use-collect-event';

ui/src/app/cron-workflows/cron-workflow-spec-editior.tsx → ui/src/cron-workflows/cron-workflow-spec-editior.tsx

@@ -2,9 +2,9 @@ import {Checkbox} from 'argo-ui/src/components/checkbox';
 import {Select} from 'argo-ui/src/components/select/select';
 import * as React from 'react';
 
-import {ConcurrencyPolicy, CronWorkflowSpec} from '../../models';
 import {NumberInput} from '../shared/components/number-input';
 import {TextInput} from '../shared/components/text-input';
+import {ConcurrencyPolicy, CronWorkflowSpec} from '../shared/models';
 import {ScheduleValidator} from './schedule-validator';
 
 export function CronWorkflowSpecEditor({onChange, spec}: {spec: CronWorkflowSpec; onChange: (spec: CronWorkflowSpec) => void}) {

ui/src/app/cron-workflows/cron-workflow-status-viewer.tsx → ui/src/cron-workflows/cron-workflow-status-viewer.tsx

@@ -1,9 +1,9 @@
 import * as kubernetes from 'argo-ui/src/models/kubernetes';
 import * as React from 'react';
 
-import {CronWorkflowSpec, CronWorkflowStatus} from '../../models';
 import {Timestamp} from '../shared/components/timestamp';
 import {ConditionsPanel} from '../shared/conditions-panel';
+import {CronWorkflowSpec, CronWorkflowStatus} from '../shared/models';
 import {TIMESTAMP_KEYS} from '../shared/use-timestamp';
 import {WorkflowLink} from '../workflows/components/workflow-link';
 import {PrettySchedule} from './pretty-schedule';

ui/src/app/event-flow/build-graph.ts → ui/src/event-flow/build-graph.ts

@@ -1,7 +1,7 @@
-import {Condition, Workflow} from '../../models';
-import {EventSource, EventSourceType} from '../../models/event-source';
-import {Sensor, TriggerType} from '../../models/sensor';
 import {Graph, Node} from '../shared/components/graph/types';
+import {Condition, Workflow} from '../shared/models';
+import {EventSource, EventSourceType} from '../shared/models/event-source';
+import {Sensor, TriggerType} from '../shared/models/sensor';
 import {icons as phaseIcons} from '../workflows/components/workflow-dag/icons';
 import {icons} from './icons';
 import {ID} from './id';

ui/src/app/event-flow/event-flow-page.tsx → ui/src/event-flow/event-flow-page.tsx

@@ -7,9 +7,6 @@ import {RouteComponentProps} from 'react-router-dom';
 import {Observable} from 'rxjs';
 import {filter, map} from 'rxjs/operators';
 
-import {kubernetes, Workflow} from '../../models';
-import {EventSource} from '../../models/event-source';
-import {Sensor} from '../../models/sensor';
 import {uiUrl} from '../shared/base';
 import {Button} from '../shared/components/button';
 import {ErrorNotice} from '../shared/components/error-notice';
@@ -24,6 +21,9 @@ import {Context} from '../shared/context';
 import {Footnote} from '../shared/footnote';
 import {historyUrl} from '../shared/history';
 import {ListWatch} from '../shared/list-watch';
+import {kubernetes, Workflow} from '../shared/models';
+import {EventSource} from '../shared/models/event-source';
+import {Sensor} from '../shared/models/sensor';
 import * as nsUtils from '../shared/namespaces';
 import {RetryObservable} from '../shared/retry-observable';
 import {services} from '../shared/services';

ui/src/app/event-flow/genres.ts → ui/src/event-flow/genres.ts

@@ -1,5 +1,5 @@
-import {EventSourceTypes} from '../../models/event-source';
-import {TriggerTypes} from '../../models/sensor';
+import {EventSourceTypes} from '../shared/models/event-source';
+import {TriggerTypes} from '../shared/models/sensor';
 
 export const genres = (() => {
     const v: {[label: string]: boolean} = {sensor: true, conditions: true, workflow: true, collapsed: true};

ui/src/app/event-sources/event-source-creator.tsx → ui/src/event-sources/event-source-creator.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import {useState} from 'react';
 
-import {EventSource} from '../../models';
 import {Button} from '../shared/components/button';
 import {ErrorNotice} from '../shared/components/error-notice';
 import {UploadButton} from '../shared/components/upload-button';
 import {exampleEventSource} from '../shared/examples';
+import {EventSource} from '../shared/models';
 import * as nsUtils from '../shared/namespaces';
 import {services} from '../shared/services';
 import {EventSourceEditor} from './event-source-editor';

ui/src/app/event-sources/event-source-details.tsx → ui/src/event-sources/event-source-details.tsx

@@ -6,13 +6,13 @@ import * as React from 'react';
 import {useContext, useEffect, useState} from 'react';
 import {RouteComponentProps} from 'react-router';
 
-import {EventSource} from '../../models';
 import {ID} from '../event-flow/id';
 import {uiUrl} from '../shared/base';
 import {ErrorNotice} from '../shared/components/error-notice';
 import {Loading} from '../shared/components/loading';
 import {Context} from '../shared/context';
 import {historyUrl} from '../shared/history';
+import {EventSource} from '../shared/models';
 import {services} from '../shared/services';
 import {useCollectEvent} from '../shared/use-collect-event';
 import {useEditableObject} from '../shared/use-editable-object';

ui/src/app/event-sources/event-source-editor.tsx → ui/src/event-sources/event-source-editor.tsx

@@ -1,9 +1,9 @@
 import {Tabs} from 'argo-ui/src/components/tabs/tabs';
 import * as React from 'react';
 
-import {EventSource} from '../../models';
 import {MetadataEditor} from '../shared/components/editors/metadata-editor';
 import {ObjectEditor} from '../shared/components/object-editor';
+import {EventSource} from '../shared/models';
 
 export function EventSourceEditor({
     onChange,

ui/src/app/event-sources/event-source-list.tsx → ui/src/event-sources/event-source-list.tsx

@@ -6,7 +6,6 @@ import * as React from 'react';
 import {useContext, useEffect, useState} from 'react';
 import {Link, RouteComponentProps} from 'react-router-dom';
 
-import {EventSource, kubernetes} from '../../models';
 import {ID} from '../event-flow/id';
 import {statusIconClasses} from '../sensors/utils';
 import {uiUrl} from '../shared/base';
@@ -19,6 +18,7 @@ import {ZeroState} from '../shared/components/zero-state';
 import {Context} from '../shared/context';
 import {Footnote} from '../shared/footnote';
 import {historyUrl} from '../shared/history';
+import {EventSource, kubernetes} from '../shared/models';
 import * as nsUtils from '../shared/namespaces';
 import {services} from '../shared/services';
 import {useCollectEvent} from '../shared/use-collect-event';

ui/src/app/event-sources/event-source-log-viewer.tsx → ui/src/event-sources/event-source-log-viewer.tsx

@@ -3,9 +3,9 @@ import {useEffect, useState} from 'react';
 import {Observable} from 'rxjs';
 import {filter, map} from 'rxjs/operators';
 
-import {EventSource} from '../../models';
 import {ErrorNotice} from '../shared/components/error-notice';
 import {Links} from '../shared/components/links';
+import {EventSource} from '../shared/models';
 import {services} from '../shared/services';
 import {FullHeightLogsViewer} from '../workflows/components/workflow-logs-viewer/full-height-logs-viewer';