From e3042fc5ced749e693ccef81b3f5838c55d5480c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 11 May 2021 15:10:20 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../drawer/cards/first_pipeline_card.vue           | 67 +++++++++++++++++++
 .../drawer/cards/getting_started_card.vue          | 35 ++++++++++
 .../cards/pipeline_config_reference_card.vue       | 75 ++++++++++++++++++++++
 .../drawer/cards/visualize_and_lint_card.vue       | 24 +++++++
 .../components/drawer/pipeline_editor_drawer.vue   | 25 ++++++--
 .../components/drawer/ui/demo_job_pill.vue         | 17 +++++
 .../drawer/ui/pipeline_visual_reference.vue        | 43 +++++++++++++
 app/assets/javascripts/pipeline_editor/index.js    | 14 +++-
 8 files changed, 293 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/javascripts/pipeline_editor/components/drawer/cards/first_pipeline_card.vue
 create mode 100644 app/assets/javascripts/pipeline_editor/components/drawer/cards/getting_started_card.vue
 create mode 100644 app/assets/javascripts/pipeline_editor/components/drawer/cards/pipeline_config_reference_card.vue
 create mode 100644 app/assets/javascripts/pipeline_editor/components/drawer/cards/visualize_and_lint_card.vue
 create mode 100644 app/assets/javascripts/pipeline_editor/components/drawer/ui/demo_job_pill.vue
 create mode 100644 app/assets/javascripts/pipeline_editor/components/drawer/ui/pipeline_visual_reference.vue

(limited to 'app/assets/javascripts/pipeline_editor')

diff --git a/app/assets/javascripts/pipeline_editor/components/drawer/cards/first_pipeline_card.vue b/app/assets/javascripts/pipeline_editor/components/drawer/cards/first_pipeline_card.vue
new file mode 100644
index 00000000000..22c1563350d
--- /dev/null
+++ b/app/assets/javascripts/pipeline_editor/components/drawer/cards/first_pipeline_card.vue
@@ -0,0 +1,67 @@
+<script>
+import { GlCard, GlLink, GlSprintf } from '@gitlab/ui';
+import { s__ } from '~/locale';
+import PipelineVisualReference from '../ui/pipeline_visual_reference.vue';
+
+export default {
+  i18n: {
+    title: s__('PipelineEditorTutorial|🚀 Run your first pipeline'),
+    firstParagraph: s__(
+      'PipelineEditorTutorial|A typical GitLab pipeline consists of three stages: build, test and deploy. Each stage can have one or more jobs.',
+    ),
+    secondParagraph: s__(
+      'PipelineEditorTutorial|In the example below, %{codeStart}build%{codeEnd} and %{codeStart}deploy%{codeEnd} each contain one job, and %{codeStart}test%{codeEnd} contains two jobs. Your scripts run in jobs like these.',
+    ),
+    thirdParagraph: s__(
+      'PipelineEditorTutorial|You can use %{linkStart}CI/CD examples and templates%{linkEnd} to get your first %{codeStart}.gitlab-ci.yml%{codeEnd} configuration file started. Your first pipeline runs when you commit the changes.',
+    ),
+    note: s__(
+      'PipelineEditorTutorial|If you’re using a self-managed GitLab instance, %{linkStart}make sure your instance has runners available.%{linkEnd}',
+    ),
+  },
+  components: {
+    GlCard,
+    GlLink,
+    GlSprintf,
+    PipelineVisualReference,
+  },
+  inject: ['ciExamplesHelpPagePath', 'runnerHelpPagePath'],
+};
+</script>
+<template>
+  <gl-card>
+    <template #default>
+      <h4 class="gl-font-lg gl-mt-0">{{ $options.i18n.title }}</h4>
+      <p class="gl-mb-3">{{ $options.i18n.firstParagraph }}</p>
+      <p class="gl-mb-3">
+        <gl-sprintf :message="$options.i18n.secondParagraph">
+          <template #code="{ content }">
+            <code>{{ content }}</code>
+          </template>
+        </gl-sprintf>
+      </p>
+      <pipeline-visual-reference />
+      <p class="gl-my-3">
+        <gl-sprintf :message="$options.i18n.thirdParagraph">
+          <template #link="{ content }">
+            <gl-link :href="ciExamplesHelpPagePath" target="_blank">
+              {{ content }}
+            </gl-link>
+          </template>
+          <template #code="{ content }">
+            <code>{{ content }}</code>
+          </template>
+        </gl-sprintf>
+      </p>
+      <p class="gl-mb-0">
+        <gl-sprintf :message="$options.i18n.note">
+          <template #link="{ content }">
+            <gl-link :href="runnerHelpPagePath" target="_blank">
+              {{ content }}
+            </gl-link>
+          </template>
+        </gl-sprintf>
+      </p>
+    </template>
+  </gl-card>
+</template>
diff --git a/app/assets/javascripts/pipeline_editor/components/drawer/cards/getting_started_card.vue b/app/assets/javascripts/pipeline_editor/components/drawer/cards/getting_started_card.vue
new file mode 100644
index 00000000000..3da535f5f94
--- /dev/null
+++ b/app/assets/javascripts/pipeline_editor/components/drawer/cards/getting_started_card.vue
@@ -0,0 +1,35 @@
+<script>
+import { GlCard, GlSprintf } from '@gitlab/ui';
+import { s__ } from '~/locale';
+
+export default {
+  i18n: {
+    title: s__('PipelineEditorTutorial|Get started with GitLab CI/CD'),
+    firstParagraph: s__(
+      'PipelineEditorTutorial|GitLab CI/CD can automatically build, test, and deploy your application.',
+    ),
+    secondParagraph: s__(
+      'PipelineEditorTutorial|The pipeline stages and jobs are defined in a %{codeStart}.gitlab-ci.yml%{codeEnd} file. You can edit, visualize and validate the syntax in this file by using the Pipeline Editor.',
+    ),
+  },
+  components: {
+    GlCard,
+    GlSprintf,
+  },
+};
+</script>
+<template>
+  <gl-card>
+    <template #default>
+      <h4 class="gl-font-lg gl-mt-0">{{ $options.i18n.title }}</h4>
+      <p class="gl-mb-3">{{ $options.i18n.firstParagraph }}</p>
+      <p class="gl-mb-0">
+        <gl-sprintf :message="$options.i18n.secondParagraph">
+          <template #code="{ content }">
+            <code>{{ content }}</code>
+          </template>
+        </gl-sprintf>
+      </p>
+    </template>
+  </gl-card>
+</template>
diff --git a/app/assets/javascripts/pipeline_editor/components/drawer/cards/pipeline_config_reference_card.vue b/app/assets/javascripts/pipeline_editor/components/drawer/cards/pipeline_config_reference_card.vue
new file mode 100644
index 00000000000..f714f6411f1
--- /dev/null
+++ b/app/assets/javascripts/pipeline_editor/components/drawer/cards/pipeline_config_reference_card.vue
@@ -0,0 +1,75 @@
+<script>
+import { GlCard, GlLink, GlSprintf } from '@gitlab/ui';
+import { s__ } from '~/locale';
+
+export default {
+  i18n: {
+    title: s__('PipelineEditorTutorial|⚙️ Pipeline configuration reference'),
+    firstParagraph: s__('PipelineEditorTutorial|Resources to help with your CI/CD configuration:'),
+    browseExamples: s__(
+      'PipelineEditorTutorial|Browse %{linkStart}CI/CD examples and templates%{linkEnd}',
+    ),
+    viewSyntaxRef: s__(
+      'PipelineEditorTutorial|View %{linkStart}.gitlab-ci.yml syntax reference%{linkEnd}',
+    ),
+    learnMore: s__(
+      'PipelineEditorTutorial|Learn more about %{linkStart}GitLab CI/CD concepts%{linkEnd}',
+    ),
+    needs: s__(
+      'PipelineEditorTutorial|Make your pipeline more efficient with the %{linkStart}Needs keyword%{linkEnd}',
+    ),
+  },
+  components: {
+    GlCard,
+    GlLink,
+    GlSprintf,
+  },
+  inject: ['ciExamplesHelpPagePath', 'ciHelpPagePath', 'needsHelpPagePath', 'ymlHelpPagePath'],
+};
+</script>
+<template>
+  <gl-card>
+    <template #default>
+      <h4 class="gl-font-lg gl-mt-0">{{ $options.i18n.title }}</h4>
+      <p class="gl-mb-3">{{ $options.i18n.firstParagraph }}</p>
+      <ul>
+        <li>
+          <gl-sprintf :message="$options.i18n.browseExamples">
+            <template #link="{ content }">
+              <gl-link :href="ciExamplesHelpPagePath" target="_blank">
+                {{ content }}
+              </gl-link>
+            </template>
+          </gl-sprintf>
+        </li>
+        <li>
+          <gl-sprintf :message="$options.i18n.viewSyntaxRef">
+            <template #link="{ content }">
+              <gl-link :href="ymlHelpPagePath" target="_blank">
+                {{ content }}
+              </gl-link>
+            </template>
+          </gl-sprintf>
+        </li>
+        <li>
+          <gl-sprintf :message="$options.i18n.learnMore">
+            <template #link="{ content }">
+              <gl-link :href="ciHelpPagePath" target="_blank">
+                {{ content }}
+              </gl-link>
+            </template>
+          </gl-sprintf>
+        </li>
+        <li>
+          <gl-sprintf :message="$options.i18n.needs">
+            <template #link="{ content }">
+              <gl-link :href="needsHelpPagePath" target="_blank">
+                {{ content }}
+              </gl-link>
+            </template>
+          </gl-sprintf>
+        </li>
+      </ul>
+    </template>
+  </gl-card>
+</template>
diff --git a/app/assets/javascripts/pipeline_editor/components/drawer/cards/visualize_and_lint_card.vue b/app/assets/javascripts/pipeline_editor/components/drawer/cards/visualize_and_lint_card.vue
new file mode 100644
index 00000000000..512414f0246
--- /dev/null
+++ b/app/assets/javascripts/pipeline_editor/components/drawer/cards/visualize_and_lint_card.vue
@@ -0,0 +1,24 @@
+<script>
+import { GlCard } from '@gitlab/ui';
+import { s__ } from '~/locale';
+
+export default {
+  i18n: {
+    title: s__('PipelineEditorTutorial|💡 Tip: Visualize and validate your pipeline'),
+    firstParagraph: s__(
+      'PipelineEditorTutorial|Use the Visualize and Lint tabs in the Pipeline Editor to visualize your pipeline and check for any errors or warnings before committing your changes.',
+    ),
+  },
+  components: {
+    GlCard,
+  },
+};
+</script>
+<template>
+  <gl-card>
+    <template #default>
+      <h4 class="gl-font-lg gl-mt-0">{{ $options.i18n.title }}</h4>
+      <p class="gl-mb-0">{{ $options.i18n.firstParagraph }}</p>
+    </template>
+  </gl-card>
+</template>
diff --git a/app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue b/app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue
index ef5be8abf9a..e1f38b4332b 100644
--- a/app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue
+++ b/app/assets/javascripts/pipeline_editor/components/drawer/pipeline_editor_drawer.vue
@@ -1,6 +1,10 @@
 <script>
 import { GlButton, GlIcon } from '@gitlab/ui';
 import { __ } from '~/locale';
+import FirstPipelineCard from './cards/first_pipeline_card.vue';
+import GettingStartedCard from './cards/getting_started_card.vue';
+import PipelineConfigReferenceCard from './cards/pipeline_config_reference_card.vue';
+import VisualizeAndLintCard from './cards/visualize_and_lint_card.vue';
 
 export default {
   width: {
@@ -11,6 +15,10 @@ export default {
     toggleTxt: __('Collapse'),
   },
   components: {
+    FirstPipelineCard,
+    GettingStartedCard,
+    PipelineConfigReferenceCard,
+    VisualizeAndLintCard,
     GlButton,
     GlIcon,
   },
@@ -55,7 +63,7 @@ export default {
 <template>
   <aside
     aria-live="polite"
-    class="gl-fixed gl-right-0 gl-h-full gl-bg-gray-10 gl-transition-medium gl-border-l-solid gl-border-1 gl-border-gray-100"
+    class="gl-fixed gl-right-0 gl-bg-gray-10 gl-shadow-drawer gl-transition-medium gl-border-l-solid gl-border-1 gl-border-gray-100 gl-h-full gl-z-index-9999 gl-overflow-y-auto"
     :style="rootStyle"
   >
     <gl-button
@@ -63,14 +71,19 @@ export default {
       class="gl-w-full gl-h-9 gl-rounded-0! gl-border-none! gl-border-b-solid! gl-border-1! gl-border-gray-100 gl-text-decoration-none! gl-outline-0! gl-display-flex"
       :class="buttonClass"
       :title="__('Toggle sidebar')"
-      data-testid="toggleBtn"
       @click="toggleDrawer"
     >
-      <span v-if="isExpanded" class="gl-text-gray-500 gl-mr-3" data-testid="collapse-text">{{
-        __('Collapse')
-      }}</span>
+      <span v-if="isExpanded" class="gl-text-gray-500 gl-mr-3" data-testid="collapse-text">
+        {{ __('Collapse') }}
+      </span>
       <gl-icon data-testid="toggle-icon" :name="buttonIconName" />
     </gl-button>
-    <div v-if="isExpanded" class="gl-p-5" data-testid="drawer-content"></div>
+    <div v-if="isExpanded" class="gl-h-full gl-p-5" data-testid="drawer-content">
+      <getting-started-card class="gl-mb-4" />
+      <first-pipeline-card class="gl-mb-4" />
+      <visualize-and-lint-card class="gl-mb-4" />
+      <pipeline-config-reference-card />
+      <div class="gl-h-13"></div>
+    </div>
   </aside>
 </template>
diff --git a/app/assets/javascripts/pipeline_editor/components/drawer/ui/demo_job_pill.vue b/app/assets/javascripts/pipeline_editor/components/drawer/ui/demo_job_pill.vue
new file mode 100644
index 00000000000..049504181c4
--- /dev/null
+++ b/app/assets/javascripts/pipeline_editor/components/drawer/ui/demo_job_pill.vue
@@ -0,0 +1,17 @@
+<script>
+export default {
+  props: {
+    jobName: {
+      type: String,
+      required: true,
+    },
+  },
+};
+</script>
+<template>
+  <div
+    class="gl-w-13 gl-h-6 gl-font-sm gl-bg-white gl-inset-border-1-blue-500 gl-text-center gl-text-truncate gl-rounded-pill gl-px-4 gl-py-2 gl-relative gl-z-index-1 gl-transition-duration-slow gl-transition-timing-function-ease"
+  >
+    {{ jobName }}
+  </div>
+</template>
diff --git a/app/assets/javascripts/pipeline_editor/components/drawer/ui/pipeline_visual_reference.vue b/app/assets/javascripts/pipeline_editor/components/drawer/ui/pipeline_visual_reference.vue
new file mode 100644
index 00000000000..1017237365b
--- /dev/null
+++ b/app/assets/javascripts/pipeline_editor/components/drawer/ui/pipeline_visual_reference.vue
@@ -0,0 +1,43 @@
+<script>
+import { s__ } from '~/locale';
+import DemoJobPill from './demo_job_pill.vue';
+
+export default {
+  i18n: {
+    stageNames: {
+      build: s__('StageName|Build'),
+      test: s__('StageName|Test'),
+      deploy: s__('StageName|Deploy'),
+    },
+    jobNames: {
+      build: s__('JobName|build-job'),
+      test_1: s__('JobName|unit-test'),
+      test_2: s__('JobName|lint-test'),
+      deploy: s__('JobName|deploy-app'),
+    },
+  },
+  stageClasses:
+    'gl-bg-blue-50 gl-display-flex gl-flex-direction-column gl-align-items-center gl-p-4 gl-rounded-base',
+  titleClasses: 'gl-text-blue-600 gl-mb-4',
+  components: {
+    DemoJobPill,
+  },
+};
+</script>
+<template>
+  <div class="gl-display-flex gl-justify-content-center">
+    <div :class="$options.stageClasses" class="gl-mr-5">
+      <div :class="$options.titleClasses">{{ $options.i18n.stageNames.build }}</div>
+      <demo-job-pill :job-name="$options.i18n.jobNames.build" />
+    </div>
+    <div :class="$options.stageClasses" class="gl-mr-5">
+      <div :class="$options.titleClasses">{{ $options.i18n.stageNames.test }}</div>
+      <demo-job-pill class="gl-mb-3" :job-name="$options.i18n.jobNames.test_1" />
+      <demo-job-pill :job-name="$options.i18n.jobNames.test_2" />
+    </div>
+    <div :class="$options.stageClasses">
+      <div :class="$options.titleClasses">{{ $options.i18n.stageNames.deploy }}</div>
+      <demo-job-pill :job-name="$options.i18n.jobNames.deploy" />
+    </div>
+  </div>
+</template>
diff --git a/app/assets/javascripts/pipeline_editor/index.js b/app/assets/javascripts/pipeline_editor/index.js
index 9c5681cf74b..361e2b64e0b 100644
--- a/app/assets/javascripts/pipeline_editor/index.js
+++ b/app/assets/javascripts/pipeline_editor/index.js
@@ -30,13 +30,19 @@ export const initPipelineEditor = (selector = '#js-pipeline-editor') => {
     pipelineEtag,
     // Add to provide/inject API for static values
     ciConfigPath,
+    ciExamplesHelpPagePath,
+    ciHelpPagePath,
     defaultBranch,
     emptyStateIllustrationPath,
+    helpPaths,
     lintHelpPagePath,
+    needsHelpPagePath,
     newMergeRequestPath,
+    pipelinePagePath,
     projectFullPath,
     projectPath,
     projectNamespace,
+    runnerHelpPagePath,
     ymlHelpPagePath,
   } = el?.dataset;
 
@@ -80,15 +86,21 @@ export const initPipelineEditor = (selector = '#js-pipeline-editor') => {
     apolloProvider,
     provide: {
       ciConfigPath,
+      ciExamplesHelpPagePath,
+      ciHelpPagePath,
+      configurationPaths,
       defaultBranch,
       emptyStateIllustrationPath,
+      helpPaths,
       lintHelpPagePath,
+      needsHelpPagePath,
       newMergeRequestPath,
+      pipelinePagePath,
       projectFullPath,
       projectPath,
       projectNamespace,
+      runnerHelpPagePath,
       ymlHelpPagePath,
-      configurationPaths,
     },
     render(h) {
       return h(PipelineEditorApp);
-- 
cgit v1.2.3